From 1ff13a39df35ea197f3340982f6851f6e330aa75 Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Thu, 14 Jul 2016 14:28:23 +0200 Subject: [PATCH 1/5] Correct colour of cance/save button in CommonDialogWindow Signed-off-by: Melanie Retter --- .../org/eclipse/hawkbit/ui/common/CommonDialogWindow.java | 2 -- .../ui/decorators/SPUIButtonStyleBorderWithIcon.java | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java index a6b05e0a5..63d1b2ea0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java @@ -413,7 +413,6 @@ public class CommonDialogWindow extends Window implements Serializable { cancelButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON, "Cancel", "", "", true, FontAwesome.TIMES, SPUIButtonStyleBorderWithIcon.class); cancelButton.setSizeUndefined(); - cancelButton.addStyleName("default-color"); if (cancelButtonClickListener != null) { cancelButton.addClickListener(cancelButtonClickListener); } @@ -427,7 +426,6 @@ public class CommonDialogWindow extends Window implements Serializable { saveButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SAVE_BUTTON, "Save", "", "", true, FontAwesome.SAVE, SPUIButtonStyleBorderWithIcon.class); saveButton.setSizeUndefined(); - saveButton.addStyleName("default-color"); saveButton.addClickListener(saveButtonClickListener); saveButton.setEnabled(false); buttonsLayout.addComponent(saveButton); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleBorderWithIcon.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleBorderWithIcon.java index 17aece6a7..ae5a72dbc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleBorderWithIcon.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleBorderWithIcon.java @@ -8,6 +8,8 @@ */ package org.eclipse.hawkbit.ui.decorators; +import org.apache.commons.lang3.StringUtils; + import com.vaadin.server.Resource; import com.vaadin.ui.Button; import com.vaadin.ui.themes.ValoTheme; @@ -29,6 +31,7 @@ public class SPUIButtonStyleBorderWithIcon implements SPUIButtonDecorator { setButtonIcon(icon); button.addStyleName(ValoTheme.LABEL_SMALL); + button.addStyleName(ValoTheme.BUTTON_BORDERLESS_COLORED); button.setSizeFull(); return button; @@ -36,14 +39,12 @@ public class SPUIButtonStyleBorderWithIcon implements SPUIButtonDecorator { private void setButtonStyle(final String style, final boolean setStyle) { - if (style == null) { + if (StringUtils.isEmpty(style)) { return; } if (setStyle) { button.setStyleName(style); - } else { - button.addStyleName(style); } } From d87aaf21418230dc1e01c91ac49aeeb769b83815 Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Thu, 14 Jul 2016 14:48:50 +0200 Subject: [PATCH 2/5] Delete css style for default-color Signed-off-by: Melanie Retter --- .../resources/VAADIN/themes/hawkbit/customstyles/common.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss index 802dd5a70..ecacdcd67 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss @@ -293,8 +293,4 @@ padding-bottom: 12px !important; } - .v-button-default-color { - color: #551f62; - } - } From ef76488a53c562f92f24fa46430b8c066dd3f535 Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Fri, 15 Jul 2016 12:37:28 +0200 Subject: [PATCH 3/5] Changed class name, and refactored the style logic (set / add style) Signed-off-by: Melanie Retter --- .../hawkbit/ui/common/CommonDialogWindow.java | 6 ++--- ...a => SPUIButtonStyleNoBorderWithIcon.java} | 25 +++++++++++++++---- 2 files changed, 23 insertions(+), 8 deletions(-) rename hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/{SPUIButtonStyleBorderWithIcon.java => SPUIButtonStyleNoBorderWithIcon.java} (68%) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java index 63d1b2ea0..8e71e7adb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java @@ -25,7 +25,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.hawkbit.ui.artifacts.smtable.SoftwareModuleAddUpdateWindow; import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; -import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleBorderWithIcon; +import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleNoBorderWithIcon; import org.eclipse.hawkbit.ui.layouts.AbstractCreateUpdateTagLayout; import org.eclipse.hawkbit.ui.management.targettable.TargetAddUpdateWindowLayout; import org.eclipse.hawkbit.ui.utils.I18N; @@ -411,7 +411,7 @@ public class CommonDialogWindow extends Window implements Serializable { private void createCancelButton() { cancelButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON, "Cancel", "", "", true, - FontAwesome.TIMES, SPUIButtonStyleBorderWithIcon.class); + FontAwesome.TIMES, SPUIButtonStyleNoBorderWithIcon.class); cancelButton.setSizeUndefined(); if (cancelButtonClickListener != null) { cancelButton.addClickListener(cancelButtonClickListener); @@ -424,7 +424,7 @@ public class CommonDialogWindow extends Window implements Serializable { private void createSaveButton() { saveButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SAVE_BUTTON, "Save", "", "", true, - FontAwesome.SAVE, SPUIButtonStyleBorderWithIcon.class); + FontAwesome.SAVE, SPUIButtonStyleNoBorderWithIcon.class); saveButton.setSizeUndefined(); saveButton.addClickListener(saveButtonClickListener); saveButton.setEnabled(false); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleBorderWithIcon.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java similarity index 68% rename from hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleBorderWithIcon.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java index ae5a72dbc..ac56be594 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleBorderWithIcon.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java @@ -15,10 +15,9 @@ import com.vaadin.ui.Button; import com.vaadin.ui.themes.ValoTheme; /** - * Button with icon decorator. - * + * Decorator class for a borderless Button with icon. */ -public class SPUIButtonStyleBorderWithIcon implements SPUIButtonDecorator { +public class SPUIButtonStyleNoBorderWithIcon implements SPUIButtonDecorator { private Button button; @@ -27,16 +26,30 @@ public class SPUIButtonStyleBorderWithIcon implements SPUIButtonDecorator { this.button = button; + button.addStyleName(ValoTheme.LABEL_SMALL); + button.addStyleName(ValoTheme.BUTTON_BORDERLESS_COLORED); + setButtonStyle(style, setStyle); setButtonIcon(icon); - button.addStyleName(ValoTheme.LABEL_SMALL); - button.addStyleName(ValoTheme.BUTTON_BORDERLESS_COLORED); button.setSizeFull(); + setButtonStyle(style, setStyle); + return button; } + /** + * It is possible to add or set a new style to the button. If a new style is + * set the other styles (LABEL_SMALL and BUTTON_BORDERLESS_COLORED) will be + * overwritten + * + * @param style + * styleName + * @param setStyle + * boolean: Trigger if the style should be added or replace the + * other styles + */ private void setButtonStyle(final String style, final boolean setStyle) { if (StringUtils.isEmpty(style)) { @@ -45,6 +58,8 @@ public class SPUIButtonStyleBorderWithIcon implements SPUIButtonDecorator { if (setStyle) { button.setStyleName(style); + } else { + button.addStyleName(style); } } From 9890a1d018f0728d395430a0570220f91ccfc6f3 Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Fri, 15 Jul 2016 17:39:51 +0200 Subject: [PATCH 4/5] Insert space between buttons and window bottom Signed-off-by: Melanie Retter --- .../java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java | 3 +-- .../VAADIN/themes/hawkbit/customstyles/popup-common.scss | 1 + .../VAADIN/themes/hawkbit/customstyles/popup-window.scss | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java index 8e71e7adb..3108455dd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java @@ -378,11 +378,10 @@ public class CommonDialogWindow extends Window implements Serializable { buttonsLayout = new HorizontalLayout(); buttonsLayout.setSizeFull(); buttonsLayout.setSpacing(true); + buttonsLayout.addStyleName("actionButtonsMargin"); createSaveButton(); - createCancelButton(); - buttonsLayout.addStyleName("actionButtonsMargin"); addHelpLink(); diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss index b8e6b1755..297524544 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss @@ -56,4 +56,5 @@ .marginTop { margin-top: 20px !important; } + } diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss index 0a00f463c..f4869665c 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss @@ -164,5 +164,6 @@ .actionButtonsMargin { margin-top: 30px; + margin-bottom: 10px; } } From 40f58e4b3a94a450710d8a8ab3af27a4fce7d99d Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Fri, 15 Jul 2016 17:46:54 +0200 Subject: [PATCH 5/5] Refactor methodname and method call order Signed-off-by: Melanie Retter --- .../SPUIButtonStyleNoBorderWithIcon.java | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java index ac56be594..d7048bde4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java @@ -15,7 +15,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.themes.ValoTheme; /** - * Decorator class for a borderless Button with icon. + * Decorator class for a borderless Button with an icon. */ public class SPUIButtonStyleNoBorderWithIcon implements SPUIButtonDecorator { @@ -25,38 +25,25 @@ public class SPUIButtonStyleNoBorderWithIcon implements SPUIButtonDecorator { public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) { this.button = button; + button.setSizeFull(); button.addStyleName(ValoTheme.LABEL_SMALL); button.addStyleName(ValoTheme.BUTTON_BORDERLESS_COLORED); + setOrAddButtonStyle(style, setStyle); - setButtonStyle(style, setStyle); setButtonIcon(icon); - button.setSizeFull(); - - setButtonStyle(style, setStyle); - return button; } - /** - * It is possible to add or set a new style to the button. If a new style is - * set the other styles (LABEL_SMALL and BUTTON_BORDERLESS_COLORED) will be - * overwritten - * - * @param style - * styleName - * @param setStyle - * boolean: Trigger if the style should be added or replace the - * other styles - */ - private void setButtonStyle(final String style, final boolean setStyle) { + private void setOrAddButtonStyle(final String style, final boolean setStyle) { if (StringUtils.isEmpty(style)) { return; } if (setStyle) { + // overwrite all other styles button.setStyleName(style); } else { button.addStyleName(style);