lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Correct colour of cance/save button in CommonDialogWindow

Browse Source 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-07-14 14:28:23 +02:00
parent 84e5361a82
commit 1ff13a39df
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
View File

@@ -413,7 +413,6 @@ public class CommonDialogWindow extends Window implements Serializable {
cancelButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON, "Cancel", "", "", true, cancelButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON, "Cancel", "", "", true,
FontAwesome.TIMES, SPUIButtonStyleBorderWithIcon.class); FontAwesome.TIMES, SPUIButtonStyleBorderWithIcon.class);
cancelButton.setSizeUndefined(); cancelButton.setSizeUndefined();
cancelButton.addStyleName("default-color");
if (cancelButtonClickListener != null) { if (cancelButtonClickListener != null) {
cancelButton.addClickListener(cancelButtonClickListener); cancelButton.addClickListener(cancelButtonClickListener);
} }
@@ -427,7 +426,6 @@ public class CommonDialogWindow extends Window implements Serializable {
saveButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SAVE_BUTTON, "Save", "", "", true, saveButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SAVE_BUTTON, "Save", "", "", true,
FontAwesome.SAVE, SPUIButtonStyleBorderWithIcon.class); FontAwesome.SAVE, SPUIButtonStyleBorderWithIcon.class);
saveButton.setSizeUndefined(); saveButton.setSizeUndefined();
saveButton.addStyleName("default-color");
saveButton.addClickListener(saveButtonClickListener); saveButton.addClickListener(saveButtonClickListener);
saveButton.setEnabled(false); saveButton.setEnabled(false);
buttonsLayout.addComponent(saveButton); buttonsLayout.addComponent(saveButton);

7
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleBorderWithIcon.java
View File

@@ -8,6 +8,8 @@
*/ */
package org.eclipse.hawkbit.ui.decorators; package org.eclipse.hawkbit.ui.decorators;
import org.apache.commons.lang3.StringUtils;
import com.vaadin.server.Resource; import com.vaadin.server.Resource;
import com.vaadin.ui.Button; import com.vaadin.ui.Button;
import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.themes.ValoTheme;
@@ -29,6 +31,7 @@ public class SPUIButtonStyleBorderWithIcon implements SPUIButtonDecorator {
setButtonIcon(icon); setButtonIcon(icon);
button.addStyleName(ValoTheme.LABEL_SMALL); button.addStyleName(ValoTheme.LABEL_SMALL);
button.addStyleName(ValoTheme.BUTTON_BORDERLESS_COLORED);
button.setSizeFull(); button.setSizeFull();
return button; return button;
@@ -36,14 +39,12 @@ public class SPUIButtonStyleBorderWithIcon implements SPUIButtonDecorator {
private void setButtonStyle(final String style, final boolean setStyle) { private void setButtonStyle(final String style, final boolean setStyle) {
if (style == null) { if (StringUtils.isEmpty(style)) {
return; return;
} }
if (setStyle) { if (setStyle) {
button.setStyleName(style); button.setStyleName(style);
} else {
button.addStyleName(style);
} }
} }