Daniel Erez has uploaded a new change for review. Change subject: webadmin: enable resizing of storage dialogs (#846327) ......................................................................
webadmin: enable resizing of storage dialogs (#846327) https://bugzilla.redhat.com/846327 * Enabled resizing support on Storage and Disk dialogs. * Made the required adjustments and tweaks in Storage and Disk views for proper resizing. Change-Id: I7413550422d7e67acb7b8ac94ba59bb8d5c68c1f Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/FcpStorageView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageLunToTargetList.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskPopupView.java 9 files changed, 52 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/7555/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java index bca64ec..7f65125 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java @@ -574,7 +574,7 @@ fcpStorageModel.getPropertyChangedEvent().addListener(progressEventHandler); fcpStorageModel.setIsGrouppedByTarget(false); fcpStorageModel.setIgnoreGrayedOut(true); - fcpStorageView = new FcpStorageView(false, 266); + fcpStorageView = new FcpStorageView(false, 266, 242); fcpStorageView.edit(fcpStorageModel); // Set 'StorageModel' items diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/FcpStorageView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/FcpStorageView.java index ddd6782..9525071 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/FcpStorageView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/FcpStorageView.java @@ -13,16 +13,19 @@ Label errorMessage; SanStorageLunToTargetList sanStorageLunToTargetList; - static final double panelHeight = 365; + + double panelHeight = 365; + double listHeight = 340; public FcpStorageView(boolean multiSelection) { - this(multiSelection, panelHeight); + super(multiSelection); } - public FcpStorageView(boolean multiSelection, double panelHeight) { + public FcpStorageView(boolean multiSelection, double panelHeight, double listHeight) { super(multiSelection); - contentPanel.getElement().getStyle().setHeight(panelHeight, Unit.PX); + this.panelHeight = panelHeight; + this.listHeight = listHeight; } @Override @@ -31,8 +34,9 @@ sanStorageLunToTargetList = new SanStorageLunToTargetList(object, true, multiSelection); sanStorageLunToTargetList.activateItemsUpdate(); - // Set tree style - sanStorageLunToTargetList.setTreeContainerStyleName(style.treePanel()); + // Update style + sanStorageLunToTargetList.setTreeContainerHeight(listHeight); + contentPanel.getElement().getStyle().setHeight(panelHeight, Unit.PX); // Add view widget to panel listPanel.add(sanStorageLunToTargetList); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageLunToTargetList.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageLunToTargetList.java index 2199903..a965440 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageLunToTargetList.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageLunToTargetList.java @@ -20,6 +20,7 @@ import com.google.gwt.cell.client.CheckboxCell; import com.google.gwt.cell.client.ValueUpdater; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Style.TableLayout; import com.google.gwt.user.cellview.client.CellTable.Resources; import com.google.gwt.user.cellview.client.Header; import com.google.gwt.user.cellview.client.TextColumn; @@ -73,6 +74,14 @@ return ""; //$NON-NLS-1$ } }, "", "20px"); //$NON-NLS-1$ //$NON-NLS-2$ + + // Add last blank column + table.addColumn(new TextColumn<LunModel>() { + @Override + public String getValue(LunModel model) { + return ""; //$NON-NLS-1$ + } + }, "", "22px"); //$NON-NLS-1$ //$NON-NLS-2$ // Add blank item list table.setRowData(new ArrayList<EntityModel>()); @@ -178,6 +187,9 @@ // Create tree item HorizontalPanel panel = new HorizontalPanel(); panel.add(table); + panel.setWidth("100%"); //$NON-NLS-1$ + panel.getElement().getStyle().setTableLayout(TableLayout.FIXED); + TreeItem item = new TreeItem(panel); // Display LUNs as grayed-out if needed @@ -195,7 +207,7 @@ public String getRawValue(LunModel model) { return model.getLunId(); } - }, constants.lunIdSanStorage(), "135px"); //$NON-NLS-1$ + }, constants.lunIdSanStorage()); table.addColumn(new LunTextColumn() { @Override @@ -223,21 +235,21 @@ public String getRawValue(LunModel model) { return model.getVendorId(); } - }, constants.vendorIdSanStorage(), "80px"); //$NON-NLS-1$ + }, constants.vendorIdSanStorage(), "100px"); //$NON-NLS-1$ table.addColumn(new LunTextColumn() { @Override public String getRawValue(LunModel model) { return model.getProductId(); } - }, constants.productIdSanStorage(), "80px"); //$NON-NLS-1$ + }, constants.productIdSanStorage(), "100px"); //$NON-NLS-1$ table.addColumn(new LunTextColumn() { @Override public String getRawValue(LunModel model) { return model.getSerial(); } - }, constants.serialSanStorage()); + }, constants.serialSanStorage(), "120px"); //$NON-NLS-1$ } @SuppressWarnings("unchecked") @@ -280,6 +292,7 @@ table.setRowData(items == null ? new ArrayList<SanTargetModel>() : items); table.edit(leafModel); + table.setWidth("100%", true); //$NON-NLS-1$ ScrollPanel panel = new ScrollPanel(); panel.add(table); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java index d0e63cf..e3ad40f 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java @@ -19,6 +19,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.dom.client.Style.TableLayout; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.cellview.client.CellTable.Resources; @@ -78,7 +79,7 @@ public String getValue(SanTargetModel model) { return model.getName(); } - }, constants.targetNameSanStorage()); + }, constants.targetNameSanStorage(), ""); //$NON-NLS-1$ table.addColumn(new ScrollableTextColumn<SanTargetModel>() { @Override @@ -96,13 +97,19 @@ table.setWidth("100%", true); //$NON-NLS-1$ - // Add last blank column + // Add last blank columns table.addColumn(new TextColumn<SanTargetModel>() { @Override public String getValue(SanTargetModel model) { return ""; //$NON-NLS-1$ } - }, constants.empty(), "80px"); //$NON-NLS-1$ + }, constants.empty(), "60px"); //$NON-NLS-1$ + table.addColumn(new TextColumn<SanTargetModel>() { + @Override + public String getValue(SanTargetModel model) { + return ""; //$NON-NLS-1$ + } + }, constants.empty(), "17px"); //$NON-NLS-1$ // Add blank item list table.setRowData(new ArrayList<EntityModel>()); @@ -123,7 +130,7 @@ loginButton.getCommand().Execute(); } }); - loginButton.setWidth("55px"); //$NON-NLS-1$ + loginButton.setWidth("52px"); //$NON-NLS-1$ panel.add(loginButton); panel.setCellWidth(loginButton, "60px"); //$NON-NLS-1$ @@ -148,13 +155,14 @@ protected TreeItem createRootNode(SanTargetModel rootModel) { HorizontalPanel panel = new HorizontalPanel(); - additemToRootNodePanel(panel, new TextBoxLabel(), rootModel.getName(), "310px", TextAlignment.LEFT); //$NON-NLS-1$ - additemToRootNodePanel(panel, new TextBoxLabel(), rootModel.getAddress(), "80px", TextAlignment.CENTER); //$NON-NLS-1$ - additemToRootNodePanel(panel, new TextBoxLabel(), rootModel.getPort(), "45px", TextAlignment.CENTER); //$NON-NLS-1$ + additemToRootNodePanel(panel, new TextBoxLabel(), rootModel.getName(), "", TextAlignment.LEFT); //$NON-NLS-1$ + additemToRootNodePanel(panel, new TextBoxLabel(), rootModel.getAddress(), "95px", TextAlignment.LEFT); //$NON-NLS-1$ + additemToRootNodePanel(panel, new TextBoxLabel(), rootModel.getPort(), "60px", TextAlignment.LEFT); //$NON-NLS-1$ addLoginButton(panel, rootModel); panel.setSpacing(1); panel.setWidth("100%"); //$NON-NLS-1$ + panel.getElement().getStyle().setTableLayout(TableLayout.FIXED); return new TreeItem(panel); } @@ -216,21 +224,21 @@ public String getRawValue(LunModel model) { return model.getVendorId(); } - }, constants.vendorIdSanStorage()); + }, constants.vendorIdSanStorage(), "100px"); //$NON-NLS-1$ table.addColumn(new LunTextColumn() { @Override public String getRawValue(LunModel model) { return model.getProductId(); } - }, constants.productIdSanStorage()); + }, constants.productIdSanStorage(), "100px"); //$NON-NLS-1$ table.addColumn(new LunTextColumn() { @Override public String getRawValue(LunModel model) { return model.getSerial(); } - }, constants.serialSanStorage(), "90px"); //$NON-NLS-1$ + }, constants.serialSanStorage(), "120px"); //$NON-NLS-1$ table.setRowData(items == null ? new ArrayList<LunModel>() : items); table.edit(leafModel); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskPopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskPopupView.java index 7458c57..9139254 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskPopupView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskPopupView.java @@ -22,6 +22,7 @@ public VmDiskPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants) { super(eventBus, resources, new VmDiskPopupWidget(constants, resources, false), "725px", "615px"); //$NON-NLS-1$ //$NON-NLS-2$ ViewIdHandler.idHandler.generateAndSetIds(this); + asWidget().enableResizeSupport(true); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.ui.xml index f09fab3..36ef3af 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/LocalStorageView.ui.xml @@ -11,11 +11,11 @@ } .localPathEditor { - width: 100%; + width: 650px; } .localPathContentWidget { - width: 585px; + width: 540px; } .errorMessageLabel { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java index c9eaac3..932e4d4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java @@ -94,6 +94,7 @@ initListBoxEditors(); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); ViewIdHandler.idHandler.generateAndSetIds(this); + asWidget().enableResizeSupport(true); localize(constants); addStyles(); Driver.driver.initialize(this); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml index a147159..b5482bb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml @@ -71,7 +71,7 @@ </ui:style> - <d:SimpleDialogPanel width="710px" height="625px"> + <d:SimpleDialogPanel width="750px" height="625px"> <d:content> <g:FlowPanel addStyleNames="{style.content}"> <e:EntityModelTextBoxEditor ui:field="nameEditor" addStyleNames="{style.nameEditor}"/> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskPopupView.java index 18ac093..657d07d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskPopupView.java @@ -22,6 +22,7 @@ public VmDiskPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants) { super(eventBus, resources, new VmDiskPopupWidget(constants, resources, true), "725px", "615px"); //$NON-NLS-1$ //$NON-NLS-2$ ViewIdHandler.idHandler.generateAndSetIds(this); + asWidget().enableResizeSupport(true); } @Override -- To view, visit http://gerrit.ovirt.org/7555 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7413550422d7e67acb7b8ac94ba59bb8d5c68c1f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
