From 834dbc9e8184f42fe28a6a62ac410497b82f6784 Mon Sep 17 00:00:00 2001 From: gah6kor Date: Mon, 18 Jul 2016 11:08:23 +0200 Subject: [PATCH] Fixed Css issues --- .../common/AbstractMetadataPopupLayout.java | 158 +++++++++--------- .../ui/common/CustomCommonDialogWindow.java | 5 +- .../hawkbit/customstyles/popup-common.scss | 4 + 3 files changed, 85 insertions(+), 82 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java index bf1bf3765..467475675 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java @@ -67,8 +67,8 @@ import com.vaadin.ui.themes.ValoTheme; * M is the metadata * */ -public abstract class AbstractMetadataPopupLayout extends - CustomComponent { +public abstract class AbstractMetadataPopupLayout + extends CustomComponent { private static final String DELETE_BUTTON = "DELETE_BUTTON"; @@ -102,8 +102,8 @@ public abstract class AbstractMetadataPopupLayout onSave(), event -> onCancel(), null, mainLayout, i18n); - metadataWindow.setId(SPUIComponentIdProvider.METADATA_POPUP_ID); - metadataWindow.setHeight(550, Unit.PIXELS); - metadataWindow.setWidth(800, Unit.PIXELS); - metadataWindow.getMainLayout().setSizeFull(); - metadataWindow.setResizable(true); - metadataWindow.addWindowModeChangeListener(event -> onResize(event)); - ((HorizontalLayout)metadataWindow.getButtonsLayout()).addComponent(discardButton, 1); - setUpDetails(entity.getId(), metaData); - return metadataWindow; - } + public CommonDialogWindow getWindow(final E entity, final M metaData) { + selectedEntity = entity; + final String nameVersion = HawkbitCommonUtil.getFormattedNameVersion(entity.getName(), entity.getVersion()); + metadataWindow = SPUIWindowDecorator.getWindow(getMetadataCaption(nameVersion), null, + SPUIDefinitions.CUSTOM_METADATA_WINDOW, this, event -> onSave(), event -> onCancel(), null, mainLayout, + i18n); + metadataWindow.setId(SPUIComponentIdProvider.METADATA_POPUP_ID); + metadataWindow.setHeight(550, Unit.PIXELS); + metadataWindow.setWidth(800, Unit.PIXELS); + metadataWindow.getMainLayout().setSizeFull(); + metadataWindow.setResizable(true); + metadataWindow.getButtonsLayout().setHeight("45px"); + metadataWindow.addWindowModeChangeListener(event -> onResize(event)); + ((HorizontalLayout) metadataWindow.getButtonsLayout()).addComponent(discardButton, 1); + ((HorizontalLayout) metadataWindow.getButtonsLayout()).setComponentAlignment(discardButton, + Alignment.MIDDLE_RIGHT); + setUpDetails(entity.getId(), metaData); + return metadataWindow; + } public E getSelectedEntity() { return selectedEntity; } - public void setSelectedEntity(E selectedEntity) { + public void setSelectedEntity(final E selectedEntity) { this.selectedEntity = selectedEntity; } @@ -182,7 +186,7 @@ public abstract class AbstractMetadataPopupLayout onKeyChange(event)); @@ -257,42 +261,41 @@ public abstract class AbstractMetadataPopupLayout { + i18n.get("caption.metadata.delete.action.confirmbox"), i18n.get("message.confirm.delete.metadata", key), + i18n.get("button.ok"), i18n.get("button.cancel"), ok -> { if (ok) { deleteMetadata(getSelectedEntity(), key, value); uiNotification.displaySuccess(i18n.get("message.metadata.deleted.successfully", key)); - Object selectedRow = metaDataGrid.getSelectedRow(); + final Object selectedRow = metaDataGrid.getSelectedRow(); metaDataGrid.getContainerDataSource().removeItem(event.getItemId()); // force grid to refresh - metaDataGrid.clearSortOrder(); - if (!metaDataGrid.getContainerDataSource().getItemIds().isEmpty()) { - if (selectedRow != null) { - if (selectedRow.equals(event.getItemId())) { - metaDataGrid.select(metaDataGrid.getContainerDataSource().getIdByIndex(0)); + metaDataGrid.clearSortOrder(); + if (!metaDataGrid.getContainerDataSource().getItemIds().isEmpty()) { + if (selectedRow != null) { + if (selectedRow.equals(event.getItemId())) { + metaDataGrid.select(metaDataGrid.getContainerDataSource().getIdByIndex(0)); + } else { + metaDataGrid.select(selectedRow); + } + } } else { - metaDataGrid.select(selectedRow); + keyTextField.clear(); + valueTextArea.clear(); + metaDataGrid.select(null); + if (hasCreatePermission()) { + keyTextField.setEnabled(true); + valueTextArea.setEnabled(true); + addIcon.setEnabled(false); + } } } - } else { - keyTextField.clear(); - valueTextArea.clear(); - metaDataGrid.select(null); - if (hasCreatePermission()) { - keyTextField.setEnabled(true); - valueTextArea.setEnabled(true); - addIcon.setEnabled(false); - } - } - } - }); + }); UI.getCurrent().addWindow(confirmDialog.getWindow()); confirmDialog.getWindow().bringToFront(); } @@ -320,7 +323,7 @@ public abstract class AbstractMetadataPopupLayout metadataList = getMetadataList(); + final List metadataList = getMetadataList(); for (final M metaData : metadataList) { addItemToGrid(metaData.getKey(), metaData.getValue()); } @@ -350,7 +353,7 @@ public abstract class AbstractMetadataPopupLayout itemsSelected = event.getSelected(); + private void onRowClick(final SelectionEvent event) { + final Set itemsSelected = event.getSelected(); if (!itemsSelected.isEmpty()) { - Object itemSelected = itemsSelected.stream().findFirst().isPresent() ? itemsSelected.stream().findFirst() - .get() : null; + final Object itemSelected = itemsSelected.stream().findFirst().isPresent() + ? itemsSelected.stream().findFirst().get() : null; popualateKeyValue(itemSelected); addIcon.setEnabled(true); } else { @@ -463,8 +466,7 @@ public abstract class AbstractMetadataPopupLayout keyValueDetails = new LinkedHashMap<>(); - for (Object key : metaDataGrid.getContainerDataSource().getItemIds()) { - Item item = metaDataGrid.getContainerDataSource().getItem(key); - String value = (String) item.getItemProperty(VALUE).getValue(); + final Map keyValueDetails = new LinkedHashMap<>(); + for (final Object key : metaDataGrid.getContainerDataSource().getItemIds()) { + final Item item = metaDataGrid.getContainerDataSource().getItem(key); + final String value = (String) item.getItemProperty(VALUE).getValue(); keyValueDetails.put((String) key, value); } metaDataGrid.getContainerDataSource().removeAllItems(); - for (Entry entry : keyValueDetails.entrySet()) { + for (final Entry entry : keyValueDetails.entrySet()) { addItemToGrid(entry.getKey(), entry.getValue()); } } private Button createDiscardButton() { - Button discardButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON, + final Button discardButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON, i18n.get("button.discard"), "", "", true, FontAwesome.UNDO, SPUIButtonStyleBorderWithIcon.class); discardButton.setSizeUndefined(); discardButton.addStyleName("default-color"); @@ -544,10 +546,8 @@ public abstract class AbstractMetadataPopupLayout