From e96ec947314395bfec49238b5d309f2db31b119e Mon Sep 17 00:00:00 2001 From: Thomas Low Date: Wed, 30 Oct 2024 16:13:23 +0000 Subject: [PATCH 1/6] Scroll to recently added metadata row in metadata editor. --- .../WEB-INF/resources/js/metadata_table.js | 32 +++++++++++++++++++ .../metadataEditor/dialogs/addMetadata.xhtml | 3 +- .../metadataEditor/logicalMetadata.xhtml | 2 +- .../includes/metadataTreeTable.xhtml | 7 ++-- .../main/webapp/pages/metadataEditor.xhtml | 1 + 5 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js b/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js new file mode 100644 index 00000000000..8fbbb41b3b4 --- /dev/null +++ b/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js @@ -0,0 +1,32 @@ +/** + * (c) Kitodo. Key to digital objects e. V. + * + * This file is part of the Kitodo project. + * + * It is licensed under GNU General Public License version 3 or later. + * + * For the full copyright and license information, please read the + * GPL3-License.txt file that was distributed with this source code. + */ + +var metadataTable = {}; + +metadataTable.addedMetadataRowKey = "root"; + +metadataTable.rememberMetadataGroup = function(event) { + let rowKey = $(document.getElementById(event.source)).closest("tr").data("rk"); + metadataTable.addedMetadataRowKey = typeof rowKey !== 'undefined' ? rowKey : "root"; +} + +metadataTable.scrollToAddedMetadataRow = function() { + let parentRowKey = metadataTable.addedMetadataRowKey; + let metadataID = PF('metadataTypeSelection').getSelectedValue(); + let label = $("div[id$='metadataTable'] tr[data-prk='" + parentRowKey + "'] label[data-metadataid='" + metadataID + "']"); + let last_row = label.last().closest("tr"); + + if (last_row.length === 1) { + last_row.css("background-color", "#ffe"); + last_row.get(0).scrollIntoView(); + last_row.find("input:enabled:visible,textarea:enabled:visible").first().focus(); + } +} \ No newline at end of file diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMetadata.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMetadata.xhtml index 954b26b285c..73a37810ccb 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMetadata.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMetadata.xhtml @@ -31,6 +31,7 @@ styleClass="dialogFieldWrapper">
@@ -42,7 +43,7 @@ + oncomplete="PF('addMetadataDialog').show();metadataTable.rememberMetadataGroup(this);"> diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataTreeTable.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataTreeTable.xhtml index 2a28ccb1d41..ed37fe04079 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataTreeTable.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataTreeTable.xhtml @@ -15,7 +15,8 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core" - xmlns:p="http://primefaces.org/ui"> + xmlns:p="http://primefaces.org/ui" + xmlns:a="http://xmlns.jcp.org/jsf/passthrough"> diff --git a/Kitodo/src/main/webapp/pages/metadataEditor.xhtml b/Kitodo/src/main/webapp/pages/metadataEditor.xhtml index d7a9615f7f0..4398990bfb5 100644 --- a/Kitodo/src/main/webapp/pages/metadataEditor.xhtml +++ b/Kitodo/src/main/webapp/pages/metadataEditor.xhtml @@ -288,6 +288,7 @@ + PrimeFaces.widget.VerticalTree.prototype.bindKeyEvents = function () { // Prevent PrimeFaces' default keyboard event handling for VerticalTrees. From 8a393378d9f9b49a2358045c7e00ecabb827586c Mon Sep 17 00:00:00 2001 From: Thomas Low Date: Fri, 1 Nov 2024 12:21:55 +0000 Subject: [PATCH 2/6] Refactor Javascript for focusing metadata row. Apply the same feature to the create process page. Add selenium test. --- .../webapp/WEB-INF/resources/css/kitodo.css | 5 ++ .../WEB-INF/resources/js/metadata_table.js | 87 +++++++++++++++---- .../metadataEditor/dialogs/addMetadata.xhtml | 2 +- .../metadataEditor/logicalMetadata.xhtml | 2 +- .../includes/metadataTreeTable.xhtml | 2 +- .../processFromTemplate/dataEdit.xhtml | 2 +- .../dialogs/addMetadata.xhtml | 3 +- .../webapp/pages/processFromTemplate.xhtml | 1 + .../java/org/kitodo/selenium/MetadataST.java | 59 +++++++++++++ 9 files changed, 141 insertions(+), 22 deletions(-) diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css index 0af10140564..4a6912faa72 100644 --- a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css +++ b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css @@ -3043,6 +3043,11 @@ Column content overflow: hidden; } +#metadataAccordion\:metadata\:metadataTable_data tr.focusedRow, +div[id$='metadataTable'].ui-treetable tr.focusedRow { + background-color: #ffe; +} + #imagePreviewForm { -webkit-touch-callout: none; /* iOS Safari */ -webkit-user-select: none; /* Safari */ diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js b/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js index 8fbbb41b3b4..2630b95338c 100644 --- a/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js +++ b/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js @@ -9,24 +9,77 @@ * GPL3-License.txt file that was distributed with this source code. */ -var metadataTable = {}; +/** + * This class allows to focus the most recently added metadata row of a metadata table. + * + * It requires each row to be annotated with a data attribute containing its metadata type. + * When adding a new metadata row, the last row of the same metadata type is focused. + */ +class FocusMetadataRow { -metadataTable.addedMetadataRowKey = "root"; + /** + * Contains the row key (rk data attribute) of the metadata group whose add button (+) + * was last clicked by the user. + */ + #lastSelectedRowKey; -metadataTable.rememberMetadataGroup = function(event) { - let rowKey = $(document.getElementById(event.source)).closest("tr").data("rk"); - metadataTable.addedMetadataRowKey = typeof rowKey !== 'undefined' ? rowKey : "root"; -} + constructor() { + this.#lastSelectedRowKey = "root"; + } + + /** + * Retrieves the recently added metadata type (e.g. TitleDocMain or LABEL) from the + * "addMetadata" dialog. Requires "widgetVar" declaration on PrimeFaces element. + */ + #getSelectedMetadataType() { + return PF('metadataTypeSelection').getSelectedValue(); + } + + /** + * Remove all highlights. + */ + #removeHighlights() { + $("div[id$='metadataTable'] tr.focusedRow").removeClass("focusedRow"); + } + + /** + * Remembers the metadata group whose add button (+) was clicked by the user. + * Is used to determine which metadata row needs to be focused if there are multiple + * groups with the same metadata type (e.g. ContributingPerson). + * + * @param {String} rowId the id of the metadata row whose add button (+) was clicked by the user + */ + remember(rowId) { + this.#removeHighlights(); + // extract data attribute "rk" (row key?), which references the current row (tree node) + let rowKey = $(document.getElementById(rowId)).closest("tr").data("rk"); + // remember the current row key if available + this.#lastSelectedRowKey = typeof rowKey !== 'undefined' ? rowKey : "root"; + } + + /** + * Focus the row that was added by a user. + */ + focus() { + this.#removeHighlights(); -metadataTable.scrollToAddedMetadataRow = function() { - let parentRowKey = metadataTable.addedMetadataRowKey; - let metadataID = PF('metadataTypeSelection').getSelectedValue(); - let label = $("div[id$='metadataTable'] tr[data-prk='" + parentRowKey + "'] label[data-metadataid='" + metadataID + "']"); - let last_row = label.last().closest("tr"); - - if (last_row.length === 1) { - last_row.css("background-color", "#ffe"); - last_row.get(0).scrollIntoView(); - last_row.find("input:enabled:visible,textarea:enabled:visible").first().focus(); + // find last metadata row matching currently selected metadata type + let row = $( + "div[id$='metadataTable'] " + // metadata table selector + "tr[data-prk='" + this.#lastSelectedRowKey + "'] " + // remembered metadata group + "label[data-metadataid='" + this.#getSelectedMetadataType() + "']" // selected metadata type + ).last().closest("tr"); + + // if found, focus row + if (row.length === 1) { + row.addClass("focusedRow"); + row.get(0).scrollIntoView(); + row.find("input:enabled:visible,textarea:enabled:visible").first().focus(); + } } -} \ No newline at end of file + +} + +// register class with global metadataTabel namespace +var metadataTable = metadataTable || {}; +metadataTable.focusMetadataRow = new FocusMetadataRow(); \ No newline at end of file diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMetadata.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMetadata.xhtml index 73a37810ccb..988ddd8b01c 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMetadata.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/addMetadata.xhtml @@ -43,7 +43,7 @@ + oncomplete="PF('addMetadataDialog').show();metadataTable.focusMetadataRow.remember(this.source);"> diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataTreeTable.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataTreeTable.xhtml index ed37fe04079..19ed607f80a 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataTreeTable.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataTreeTable.xhtml @@ -201,7 +201,7 @@ icon="fa fa-plus" styleClass="secondary" update="addMetadataDialog" - oncomplete="PF('addMetadataDialog').show();metadataTable.rememberMetadataGroup(this);"/> + oncomplete="PF('addMetadataDialog').show();metadataTable.focusMetadataRow.remember(this.source);"/> diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dataEdit.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dataEdit.xhtml index b0015ef9639..5f27134438e 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dataEdit.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dataEdit.xhtml @@ -164,7 +164,7 @@ update="addMetadataDialog" disabled="#{not CreateProcessForm.addMetadataDialog.metadataAddableToStructureElement()}" action="#{CreateProcessForm.addMetadataDialog.prepareAddableMetadataForStructure()}" - oncomplete="PF('addMetadataDialog').show();"> + oncomplete="PF('addMetadataDialog').show();metadataTable.focusMetadataRow.remember(this.source);">
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/addMetadata.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/addMetadata.xhtml index 2216c5df01a..0365bf7ca32 100644 --- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/addMetadata.xhtml +++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/addMetadata.xhtml @@ -31,6 +31,7 @@ styleClass="dialogFieldWrapper">
@@ -43,7 +44,7 @@ action="#{CreateProcessForm.processMetadata.addMetadataEntry}" process="addMetadataDialog" update="editForm:processFromTemplateTabView:metadataTable editForm:processFromTemplateTabView:addMetadataButtonWrapper" - oncomplete="PF('addMetadataDialog').hide();" + oncomplete="PF('addMetadataDialog').hide();metadataTable.focusMetadataRow.focus();" value="#{msgs.apply}" styleClass="primary right"/> + diff --git a/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java b/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java index 031fc461cb4..121635da44c 100644 --- a/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java +++ b/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java @@ -353,6 +353,65 @@ public void showPhysicalPageNumberBelowThumbnailTest() throws Exception { assertFalse(Browser.getDriver().findElements(By.cssSelector(".thumbnail-banner")).isEmpty()); } + /** + * Tests that a metadata row of the metadata table is highlighted as soon as a user adds a new + * row via the add metadata dialog. + */ + @Test + public void focusRecentlyAddedMetadataRowTest() throws Exception { + login("kowal"); + + // open the metadata editor + Pages.getProcessesPage().goTo().editMetadata(MockDatabase.MEDIA_RENAMING_TEST_PROCESS_TITLE); + + // wait until metadata table is shown + await().ignoreExceptions().pollDelay(100, TimeUnit.MILLISECONDS).atMost(5, TimeUnit.SECONDS).until( + () -> Browser.getDriver().findElement(By.id("metadataAccordion:metadata:metadataTable")).isDisplayed() + ); + + // verify no metadata row is focused yet + assertTrue(Browser.getDriver().findElements( + By.cssSelector("#metadataAccordion\\:metadata\\:metadataTable tr.focusedRow")).isEmpty() + ); + + // click on add metadata button + Browser.getDriver().findElement(By.id("metadataAccordion:metadata:addMetadataButton")).click(); + + // wait until dialog is visible + await().ignoreExceptions().pollDelay(100, TimeUnit.MILLISECONDS).atMost(5, TimeUnit.SECONDS).until( + () -> Browser.getDriver().findElement(By.id("addMetadataDialog")).isDisplayed() + ); + + // open select menu + Browser.getDriver().findElement(By.id("addMetadataForm:metadataTypeSelection")).click(); + + // wait until selection menu list is visible + await().ignoreExceptions().pollDelay(100, TimeUnit.MILLISECONDS).atMost(5, TimeUnit.SECONDS).until( + () -> Browser.getDriver().findElement(By.id("addMetadataForm:metadataTypeSelection_items")).isDisplayed() + ); + + // select Person as new metadata row + Browser.getDriver().findElement(By.cssSelector( + "#addMetadataForm\\:metadataTypeSelection_items li[data-label='Person'].ui-selectonemenu-item" + )).click(); + + // confirm dialog + Browser.getDriver().findElement(By.id("addMetadataForm:apply")).click(); + await().ignoreExceptions().pollDelay(100, TimeUnit.MILLISECONDS).atMost(5, TimeUnit.SECONDS).until( + () -> !Browser.getDriver().findElement(By.id("addMetadataDialog")).isDisplayed() + ); + + // verify metadata row with name "Person" is selected + assertEquals("Person:", Browser.getDriver().findElement( + By.cssSelector("#metadataAccordion\\:metadata\\:metadataTable tr.focusedRow label") + ).getText()); + + // verify accordion was scrolled down + assertTrue(0 < (Long)Browser.getDriver().executeScript( + "return document.getElementById('metadataAccordion:metadata:metadataTable').scrollTop;" + )); + } + /** * Close metadata editor and logout after every test. * @throws Exception when page navigation fails From 317cebabe72466332a916f733efd6d3e591d7290 Mon Sep 17 00:00:00 2001 From: Thomas Low Date: Fri, 1 Nov 2024 13:49:22 +0000 Subject: [PATCH 3/6] Fix metadata editor seleninum tests due to conflict between tests. --- Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java b/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java index 121635da44c..494e1e315cc 100644 --- a/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java +++ b/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java @@ -206,6 +206,11 @@ public void showPaginationByDefaultTest() throws Exception { Pages.getUserEditPage().setPaginationToShowByDefault(); Pages.getProcessesPage().goTo().editMetadata(MockDatabase.MEDIA_RENAMING_TEST_PROCESS_TITLE); assertTrue(Pages.getMetadataEditorPage().isPaginationPanelVisible()); + // disable pagination again to prevent conflicts with other tests (when interacting with metadata table) + Pages.getMetadataEditorPage().closeEditor(); + Pages.getUserEditPage().setPaginationToShowByDefault(); + Pages.getProcessesPage().goTo().editMetadata(MockDatabase.MEDIA_RENAMING_TEST_PROCESS_TITLE); + assertFalse(Pages.getMetadataEditorPage().isPaginationPanelVisible()); } /** @@ -397,6 +402,8 @@ public void focusRecentlyAddedMetadataRowTest() throws Exception { // confirm dialog Browser.getDriver().findElement(By.id("addMetadataForm:apply")).click(); + + // wait until dialog disappears await().ignoreExceptions().pollDelay(100, TimeUnit.MILLISECONDS).atMost(5, TimeUnit.SECONDS).until( () -> !Browser.getDriver().findElement(By.id("addMetadataDialog")).isDisplayed() ); From 6518eb37fec84670b2043b78b40a764ed20ab3f1 Mon Sep 17 00:00:00 2001 From: Thomas Low Date: Tue, 5 Nov 2024 12:11:09 +0000 Subject: [PATCH 4/6] Fix MetadataST selenium test due to position change of add metadata button. --- Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java b/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java index a6ad6e16c5d..03ed89e5662 100644 --- a/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java +++ b/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java @@ -430,7 +430,7 @@ public void focusRecentlyAddedMetadataRowTest() throws Exception { ); // click on add metadata button - Browser.getDriver().findElement(By.id("metadataAccordion:metadata:addMetadataButton")).click(); + Browser.getDriver().findElement(By.id("metadataAccordion:addMetadataButton")).click(); // wait until dialog is visible await().ignoreExceptions().pollDelay(100, TimeUnit.MILLISECONDS).atMost(5, TimeUnit.SECONDS).until( From 9762eefab3457bd915a8ec299cc74946d9eb847a Mon Sep 17 00:00:00 2001 From: Thomas Low Date: Fri, 15 Nov 2024 12:23:41 +0000 Subject: [PATCH 5/6] Include pull request review feedback. --- Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js | 4 ++-- Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java | 4 ++-- .../org/kitodo/selenium/testframework/pages/UserEditPage.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js b/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js index 2630b95338c..62b4ff4c945 100644 --- a/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js +++ b/Kitodo/src/main/webapp/WEB-INF/resources/js/metadata_table.js @@ -80,6 +80,6 @@ class FocusMetadataRow { } -// register class with global metadataTabel namespace +// register class with global metadataTable namespace var metadataTable = metadataTable || {}; -metadataTable.focusMetadataRow = new FocusMetadataRow(); \ No newline at end of file +metadataTable.focusMetadataRow = new FocusMetadataRow(); diff --git a/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java b/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java index b9531db6e1b..365b7ac53b5 100644 --- a/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java +++ b/Kitodo/src/test/java/org/kitodo/selenium/MetadataST.java @@ -215,12 +215,12 @@ public void showPaginationByDefaultTest() throws Exception { Pages.getProcessesPage().goTo().editMetadata(MockDatabase.MEDIA_RENAMING_TEST_PROCESS_TITLE); assertFalse(Pages.getMetadataEditorPage().isPaginationPanelVisible()); Pages.getMetadataEditorPage().closeEditor(); - Pages.getUserEditPage().setPaginationToShowByDefault(); + Pages.getUserEditPage().togglePaginationToShowByDefault(); Pages.getProcessesPage().goTo().editMetadata(MockDatabase.MEDIA_RENAMING_TEST_PROCESS_TITLE); assertTrue(Pages.getMetadataEditorPage().isPaginationPanelVisible()); // disable pagination again to prevent conflicts with other tests (when interacting with metadata table) Pages.getMetadataEditorPage().closeEditor(); - Pages.getUserEditPage().setPaginationToShowByDefault(); + Pages.getUserEditPage().togglePaginationToShowByDefault(); Pages.getProcessesPage().goTo().editMetadata(MockDatabase.MEDIA_RENAMING_TEST_PROCESS_TITLE); assertFalse(Pages.getMetadataEditorPage().isPaginationPanelVisible()); } diff --git a/Kitodo/src/test/java/org/kitodo/selenium/testframework/pages/UserEditPage.java b/Kitodo/src/test/java/org/kitodo/selenium/testframework/pages/UserEditPage.java index 6966b1fb403..b25471b19eb 100644 --- a/Kitodo/src/test/java/org/kitodo/selenium/testframework/pages/UserEditPage.java +++ b/Kitodo/src/test/java/org/kitodo/selenium/testframework/pages/UserEditPage.java @@ -196,7 +196,7 @@ public void changeUserSettings() throws Exception { /** * Set pagination panel to show by default in metadata editor. */ - public void setPaginationToShowByDefault() throws Exception { + public void togglePaginationToShowByDefault() throws Exception { openUserConfig(); switchToTabByIndex(TabIndex.USER_METADATA_EDITOR_SETTINGS.getIndex()); WebElement switchCheckBox = showPaginationByDefaultSwitch.findElement(By.className("ui-chkbox-box")); From bf9c3f0ac894e5e1ef701cfb3199aef8ccd43517 Mon Sep 17 00:00:00 2001 From: Thomas Low Date: Fri, 15 Nov 2024 12:57:04 +0000 Subject: [PATCH 6/6] Add css color variable and use slightly darker blue for highlight. --- Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css | 2 +- .../src/main/webapp/WEB-INF/resources/css/pattern-library.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css index 9b0fa4ef70d..f946f5cda64 100644 --- a/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css +++ b/Kitodo/src/main/webapp/WEB-INF/resources/css/kitodo.css @@ -3167,7 +3167,7 @@ Column content #metadataAccordion\:metadata\:metadataTable_data tr.focusedRow, div[id$='metadataTable'].ui-treetable tr.focusedRow { - background-color: #ffe; + background-color: var(--trans-blue-highlight); } #imagePreviewForm { diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/css/pattern-library.css b/Kitodo/src/main/webapp/WEB-INF/resources/css/pattern-library.css index 05c69589095..93fcb720613 100644 --- a/Kitodo/src/main/webapp/WEB-INF/resources/css/pattern-library.css +++ b/Kitodo/src/main/webapp/WEB-INF/resources/css/pattern-library.css @@ -25,6 +25,7 @@ --medium-gray: #999; --orange: #f94a15; --trans-blue: #f2fbff; + --trans-blue-highlight: #dbecf6; --pure-white: #fff; --error-background: #f2dede;