Daniel Erez has uploaded a new change for review. Change subject: webadmin: VM dialog - organize resource allocation section ......................................................................
webadmin: VM dialog - organize resource allocation section VM dialog -> Resource Allocation: To improve tab display, added 'Disks Allocation' section which contains disks related widgets: - Disks table. - VirtIO-SCSI checkbox. Screenshot: http://i.imgur.com/J5TypMQ.jpg Change-Id: Ic16354dcfc7cc50a8e1969b54e0ca32722e54e8f Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml 2 files changed, 23 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/28080/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 91d79e8..9a5601a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -632,6 +632,9 @@ protected FlowPanel disksAllocationPanel; @UiField + protected FlowPanel disksPanel; + + @UiField @Ignore @WithElementId("provisioning") public ListModelListBoxEditor provisioningEditor; @@ -669,10 +672,6 @@ @UiField(provided = true) @Ignore public InfoIcon isVirtioScsiEnabledInfoIcon; - - @UiField - @Ignore - Label disksAllocationLabel; @UiField(provided = true) @Ignore @@ -1363,8 +1362,7 @@ boolean isDisksAvailable = object.getIsDisksAvailable(); changeApplicationLevelVisibility(disksAllocationPanel, isDisksAvailable); - changeApplicationLevelVisibility(storageAllocationPanel, isProvisioningAvailable || isDisksAvailable || - object.getIsVirtioScsiEnabled().getIsAvailable()); + changeApplicationLevelVisibility(storageAllocationPanel, isProvisioningAvailable); } }); @@ -1521,11 +1519,13 @@ } else if ("IsDisksAvailable".equals(propName)) { //$NON-NLS-1$ boolean isDisksAvailable = vm.getIsDisksAvailable(); - changeApplicationLevelVisibility(disksAllocationPanel, isDisksAvailable); + changeApplicationLevelVisibility(disksPanel, isDisksAvailable); boolean isProvisioningAvailable = vm.getProvisioning().getIsAvailable(); - changeApplicationLevelVisibility(storageAllocationPanel, isProvisioningAvailable - || isDisksAvailable || vm.getIsVirtioScsiEnabled().getIsAvailable()); + changeApplicationLevelVisibility(storageAllocationPanel, isProvisioningAvailable); + + changeApplicationLevelVisibility(disksAllocationPanel, isDisksAvailable || + vm.getIsVirtioScsiEnabled().getIsAvailable()); if (isDisksAvailable) { // Update warning message by disks status diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml index 4c47a01..4fd253d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml @@ -112,15 +112,10 @@ width: 100%; } - .disksAllocation { - padding-left: 5px; - padding-top: 10px; - } - - .disksAllocationPanel { + .disksPanel { width: 490px; - padding-top: 5px; - padding-bottom: 10px; + margin: 10px 0; + display: inline-table; } .textBox { @@ -645,17 +640,19 @@ <ge:EntityModelRadioButtonEditor ui:field="provisioningCloneEditor"/> </g:VerticalPanel> </g:HorizontalPanel> - <g:FlowPanel ui:field="disksAllocationPanel"> - <g:Label ui:field="disksAllocationLabel" text="{constants.disksAllocation}" addStyleNames="{style.disksAllocation}" visible="false" /> - <g:VerticalPanel> - <s:DisksAllocationView ui:field="disksAllocationView" listHeight="170px" listWidth="490px" showVolumeType="true" addStyleNames="{style.disksAllocationPanel}" /> - </g:VerticalPanel> + </g:FlowPanel> + <g:FlowPanel ui:field="disksAllocationPanel" addStyleNames="{style.sectionPanelTight}"> + <g:HorizontalPanel> + <g:Label addStyleNames="{style.sectionLabel}" text="{constants.disksAllocation}" /> + </g:HorizontalPanel> + <g:HorizontalPanel addStyleNames="{style.floatLeft}"> + <ge:EntityModelDetachableWidget ui:field="isVirtioScsiEnabledWithDetachable" addStyleNames="{style.checkbox}" /> + <d:InfoIcon ui:field="isVirtioScsiEnabledInfoIcon" addStyleNames="{style.infoIcon}" visible="false"/> + </g:HorizontalPanel> + <g:FlowPanel ui:field="disksPanel"> + <s:DisksAllocationView ui:field="disksAllocationView" listHeight="170px" listWidth="490px" showVolumeType="true" addStyleNames="{style.disksPanel}" /> </g:FlowPanel> </g:FlowPanel> - <g:HorizontalPanel addStyleNames="{style.floatLeft}"> - <ge:EntityModelDetachableWidget ui:field="isVirtioScsiEnabledWithDetachable" addStyleNames="{style.checkbox}" /> - <d:InfoIcon ui:field="isVirtioScsiEnabledInfoIcon" addStyleNames="{style.infoIcon}" visible="false"/> - </g:HorizontalPanel> </g:FlowPanel> </t:content> </t:DialogTab> -- To view, visit http://gerrit.ovirt.org/28080 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic16354dcfc7cc50a8e1969b54e0ca32722e54e8f 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
