Kanagaraj M has uploaded a new change for review. Change subject: webadmin: Chaning cluster general tab layout ......................................................................
webadmin: Chaning cluster general tab layout Color explanation labels for Policy is moved down to provide more space for Cluster general form. The policy panel will be hidden if the cluster doesn't support virt. Change-Id: Ifbe1f41a58511a5fc0ee38ddc1964af4258893d3 Signed-off-by: Kanagaraj M <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.ui.xml 3 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/12506/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java index f62599a..3433204 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java @@ -13,10 +13,10 @@ import org.ovirt.engine.ui.common.widget.uicommon.AbstractModelBoundFormWidget; import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterGeneralModel; +import org.ovirt.engine.ui.webadmin.ApplicationConstants; import com.google.gwt.core.client.GWT; import com.google.gwt.editor.client.SimpleBeanEditorDriver; -import org.ovirt.engine.ui.webadmin.ApplicationConstants; public class ClusterGeneralModelForm extends AbstractModelBoundFormWidget<ClusterGeneralModel> { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java index 4434706..dae15b5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.java @@ -27,9 +27,9 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.AbsolutePanel; +import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTMLPanel; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; @@ -51,12 +51,15 @@ // to find the icon for alert messages: private final ApplicationResources resources; + @UiField + DockLayoutPanel dockLayoutPanel; + @UiField(provided = true) @Ignore ClusterGeneralModelForm form; @UiField - HorizontalPanel policyPanel; + FlowPanel policyPanel; @UiField(provided = true) Slider leftSlider; @@ -211,6 +214,13 @@ } policyPanel.setVisible(selectedItem.supportsVirtService()); + if (!selectedItem.supportsVirtService()) { + dockLayoutPanel.setWidgetSize(policyPanel, 0); + } + else { + dockLayoutPanel.setWidgetSize(policyPanel, 370); + } + form.update(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.ui.xml index 37af0c7..34bf5e7 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterGeneralView.ui.xml @@ -72,11 +72,11 @@ border-right: 1px solid #c0c0c0; } </ui:style> - <g:DockLayoutPanel height="100%"> - <g:west size="570"> - <g:FlowPanel addStyleNames="{style.leftPanel}"> + <g:DockLayoutPanel ui:field="dockLayoutPanel" height="100%"> + <g:west size="370"> + <g:FlowPanel ui:field="policyPanel" addStyleNames="{style.leftPanel}"> <g:HorizontalPanel spacing="5"> - <g:HorizontalPanel ui:field="policyPanel" addStyleNames="{style.marginLeft}"> + <g:VerticalPanel addStyleNames="{style.marginLeft}"> <g:FlowPanel width="400px"> <w:UiCommandButton ui:field="editPolicyButton" addStyleNames="{style.button}"/> <g:HorizontalPanel> @@ -104,7 +104,7 @@ <g:Label ui:field="minServiceLevelLabel"/> </g:HorizontalPanel> </g:FlowPanel> - </g:HorizontalPanel> + </g:VerticalPanel> </g:HorizontalPanel> </g:FlowPanel> </g:west> -- To view, visit http://gerrit.ovirt.org/12506 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbe1f41a58511a5fc0ee38ddc1964af4258893d3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
