From 76c3c96075a61f7e4f8341477a6baf50ca92804f Mon Sep 17 00:00:00 2001 From: "Marcel Mager (INST-IOT/ESB)" Date: Tue, 13 Sep 2016 16:19:53 +0200 Subject: [PATCH] Fix UI according to review feedback: - change color of overdue filter box - reduce width of filters section back to 150px - fix alignment of status boxes Signed-off-by: Marcel Mager (INST-IOT/ESB) --- .../ui/management/targettag/FilterByStatusLayout.java | 3 ++- .../org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java | 8 ++++---- .../VAADIN/themes/hawkbit/customstyles/filter-status.scss | 4 +++- .../themes/hawkbit/customstyles/hawkbitvariables.scss | 1 + hawkbit-ui/src/main/resources/messages.properties | 2 +- hawkbit-ui/src/main/resources/messages_de.properties | 2 +- hawkbit-ui/src/main/resources/messages_en.properties | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java index b393e1ff1..f32e7e8bd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java @@ -107,7 +107,7 @@ public class FilterByStatusLayout extends VerticalLayout implements Button.Click buttonLayout.addComponent(registered); buttonLayout.setComponentAlignment(registered, Alignment.MIDDLE_CENTER); addComponent(buttonLayout); - setComponentAlignment(buttonLayout, Alignment.MIDDLE_CENTER); + setComponentAlignment(buttonLayout, Alignment.MIDDLE_LEFT); final HorizontalLayout overdueLayout = new HorizontalLayout(); final Label overdueLabel = new LabelBuilder().name(i18n.get("label.filter.by.overdue")).buildLabel(); @@ -117,6 +117,7 @@ public class FilterByStatusLayout extends VerticalLayout implements Button.Click overdueLayout.addComponent(overdueLabel); overdueLayout.setComponentAlignment(overdueLabel, Alignment.MIDDLE_LEFT); addComponent(overdueLayout); + setComponentAlignment(overdueLayout, Alignment.MIDDLE_LEFT); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java index 3a85bc791..78f1ce8ee 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java @@ -205,12 +205,12 @@ public final class SPUIDefinitions { * Filter by status key. */ public static final String FILTER_BY_STATUS = "FilterByStatus"; - + /** * Filter by overdue state key. */ public static final String FILTER_BY_OVERDUE_STATE = "FilterByOverdueState"; - + /** * Filter by tag key. */ @@ -413,7 +413,7 @@ public final class SPUIDefinitions { /** * Filter by type layout width. */ - public static final float FILTER_BY_TYPE_WIDTH = 190.0F; + public static final float FILTER_BY_TYPE_WIDTH = 150.0F; /** * Confirmation jukebox type. @@ -506,7 +506,7 @@ public final class SPUIDefinitions { /** * Get the locales - * + * * @return the availableLocales */ public static Set getAvailableLocales() { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-status.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-status.scss index d1ae21f62..8cf27ab74 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-status.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-status.scss @@ -14,8 +14,10 @@ $in-sync-color: $signal-green-color; $pending-color: $signal-yellow-color; $error-color: $signal-red-color; - $overdue-color: $signal-black-color; $registered-color: $signal-light-blue-color; + + //Overdue filter button color + $overdue-color: $signal-dark-blue-color; //Filter by status buttons group alignment .target-status-filters { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss index a3a6dc381..96e6d9132 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss @@ -105,6 +105,7 @@ $status-unknown-color: #d5d5d5; $signal-green-color: #6eb553; $signal-yellow-color: #ff0; $signal-light-blue-color: #3085cb; +$signal-dark-blue-color: #26547a; $signal-red-color: #f00; $signal-black-color: #000; $signal-orange-color: #ffa500; diff --git a/hawkbit-ui/src/main/resources/messages.properties b/hawkbit-ui/src/main/resources/messages.properties index c067d27f5..487665dcb 100644 --- a/hawkbit-ui/src/main/resources/messages.properties +++ b/hawkbit-ui/src/main/resources/messages.properties @@ -158,7 +158,7 @@ label.target.id = Controller Id : label.target.ip = Controller IP : label.target.security.token = Security token : label.filter.by.status = Filter by Status -label.filter.by.overdue = Filter by Overdue State +label.filter.by.overdue = Filter by Overdue label.target.controller.attrs = Controller attributes label.target.lastpolldate = Last poll : label.no.tag.assigned = NO TAG diff --git a/hawkbit-ui/src/main/resources/messages_de.properties b/hawkbit-ui/src/main/resources/messages_de.properties index fca470698..b77ed427b 100644 --- a/hawkbit-ui/src/main/resources/messages_de.properties +++ b/hawkbit-ui/src/main/resources/messages_de.properties @@ -157,7 +157,7 @@ label.target.id = Controller Id : label.target.ip = Controller IP : label.target.security.token = Security token : label.filter.by.status = Filter by Status -label.filter.by.overdue = Filter by Overdue State +label.filter.by.overdue = Filter by Overdue label.target.controller.attrs = Controller attributes label.target.lastpolldate = Last poll : label.no.tag.assigned = NO TAG diff --git a/hawkbit-ui/src/main/resources/messages_en.properties b/hawkbit-ui/src/main/resources/messages_en.properties index dceb658df..f6089364a 100644 --- a/hawkbit-ui/src/main/resources/messages_en.properties +++ b/hawkbit-ui/src/main/resources/messages_en.properties @@ -157,7 +157,7 @@ label.target.id = Controller Id : label.target.ip = Controller IP : label.target.security.token = Security token : label.filter.by.status = Filter by Status -label.filter.by.overdue = Filter by Overdue State +label.filter.by.overdue = Filter by Overdue label.target.controller.attrs = Controller attributes label.target.lastpolldate = Last poll : label.no.tag.assigned = NO TAG