Alona Kaplan has uploaded a new change for review. Change subject: webadmin: spliting add/edit network popup to tabs ......................................................................
webadmin: spliting add/edit network popup to tabs Change-Id: If5fdadb371bd06ffb7534707fd1dc1d14ad3ebae Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditDataCenterNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java 6 files changed, 84 insertions(+), 39 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/16067/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 32070c1..1bbee45 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -1024,6 +1024,15 @@ // Network @DefaultStringValue("General") + String generalTabNetworkPopup(); + + @DefaultStringValue("Provider") + String providerTabNetworkPopup(); + + @DefaultStringValue("Cluster") + String clusterTabNetworkPopup(); + + @DefaultStringValue("General") String networkGeneralSubTabLabel(); @DefaultStringValue("Clusters") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java index 36ce2d0..dcf88c1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java @@ -8,6 +8,7 @@ import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; import org.ovirt.engine.ui.common.widget.Align; import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; +import org.ovirt.engine.ui.common.widget.dialog.tab.DialogTab; import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable.SelectionMode; import org.ovirt.engine.ui.common.widget.editor.EntityModelCheckBoxEditor; @@ -117,6 +118,18 @@ @Path(value = "networkLabel.entity") public EntityModelTextBoxEditor networkLabel; + @UiField + @Ignore + public DialogTab generalTab; + + @UiField + @Ignore + public DialogTab providerTab; + + @UiField + @Ignore + public DialogTab clusterTab; + @Inject public AbstractNetworkPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) { @@ -146,6 +159,10 @@ } protected void localize(ApplicationConstants constants) { + generalTab.setLabel(constants.generalTabNetworkPopup()); + providerTab.setLabel(constants.providerTabNetworkPopup()); + clusterTab.setLabel(constants.clusterTabNetworkPopup()); + dataCenterEditor.setLabel(constants.networkPopupDataCenterLabel()); assignLabel.setText(constants.networkPopupAssignLabel()); nameEditor.setLabel(constants.nameLabel()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml index 630bde3..6ca26fe 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.ui.xml @@ -2,7 +2,8 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent";> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog" - xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor" xmlns:we="urn:import:org.ovirt.engine.ui.webadmin.widget.editor"> + xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor" xmlns:we="urn:import:org.ovirt.engine.ui.webadmin.widget.editor" + xmlns:t="urn:import:org.ovirt.engine.ui.common.widget.dialog.tab"> <ui:with field='constants' type='org.ovirt.engine.ui.webadmin.ApplicationConstants' /> @@ -45,48 +46,63 @@ width: 100%; } - .externalProviderPanel { - background-color: #D3D3D3; - } - </ui:style> - <d:SimpleDialogPanel ui:field="mainPanel" width="435px" height="520px"> + <d:SimpleDialogPanel ui:field="mainPanel" width="670px" height="520px"> <d:content> - <g:VerticalPanel> - <g:FlowPanel> - <g:Label ui:field="mainLabel" addStyleNames="{style.mainLabel}" /> - <g:HTMLPanel addStyleNames="{style.indent}"> - <g:HTML ui:field="messageLabel" addStyleNames="{style.message}"/> - <e:ListModelListBoxEditor ui:field="dataCenterEditor"/> - <e:EntityModelTextBoxEditor ui:field="nameEditor" /> - <e:EntityModelTextBoxEditor ui:field="descriptionEditor" /> - <g:FlowPanel addStyleNames="{style.externalProviderPanel}"> - <e:ListModelListBoxEditor ui:field="externalProviderEditor"/> - <e:EntityModelTextBoxEditor ui:field="networkLabel" /> - </g:FlowPanel> - <g:HorizontalPanel> - <e:EntityModelCheckBoxEditor ui:field="vlanTagging"/> - <e:EntityModelTextBoxOnlyEditor ui:field="vlanTag" /> - </g:HorizontalPanel> - <e:EntityModelCheckBoxEditor ui:field="isVmNetworkEditor" /> - <g:HorizontalPanel> - <e:EntityModelCheckBoxEditor ui:field="hasMtuEditor"/> - <e:EntityModelTextBoxOnlyEditor ui:field="mtuEditor" /> - </g:HorizontalPanel> - </g:HTMLPanel> - </g:FlowPanel> - <g:VerticalPanel ui:field="attachPanel"> - <g:Label ui:field="assignLabel" addStyleNames="{style.mainLabel}"/> - <g:HTMLPanel addStyleNames="{style.indent}"> - <g:ScrollPanel height="160px" width="100%"> - <e:EntityModelCellTable ui:field="clustersTable" /> - </g:ScrollPanel> - </g:HTMLPanel> - <e:EntityModelCheckBoxEditor ui:field="publicUseEditor"/> - </g:VerticalPanel> - </g:VerticalPanel> + <t:DialogTabPanel ui:field="tabPanel" height="100%"> + <t:tab> + <t:DialogTab ui:field="generalTab"> + <t:content> + <g:FlowPanel> + <g:Label ui:field="mainLabel" addStyleNames="{style.mainLabel}" /> + <g:HTMLPanel addStyleNames="{style.indent}"> + <g:HTML ui:field="messageLabel" addStyleNames="{style.message}"/> + <e:ListModelListBoxEditor ui:field="dataCenterEditor"/> + <e:EntityModelTextBoxEditor ui:field="nameEditor" /> + <e:EntityModelTextBoxEditor ui:field="descriptionEditor" /> + <g:HorizontalPanel> + <e:EntityModelCheckBoxEditor ui:field="vlanTagging"/> + <e:EntityModelTextBoxOnlyEditor ui:field="vlanTag" /> + </g:HorizontalPanel> + <e:EntityModelCheckBoxEditor ui:field="isVmNetworkEditor" /> + <g:HorizontalPanel> + <e:EntityModelCheckBoxEditor ui:field="hasMtuEditor"/> + <e:EntityModelTextBoxOnlyEditor ui:field="mtuEditor" /> + </g:HorizontalPanel> + </g:HTMLPanel> + + </g:FlowPanel> + </t:content> + </t:DialogTab> + </t:tab> + <t:tab> + <t:DialogTab ui:field="providerTab"> + <t:content> + <g:FlowPanel> + <e:ListModelListBoxEditor ui:field="externalProviderEditor"/> + <e:EntityModelTextBoxEditor ui:field="networkLabel" /> + </g:FlowPanel> + </t:content> + </t:DialogTab> + </t:tab> + <t:tab> + <t:DialogTab ui:field="clusterTab"> + <t:content> + <g:VerticalPanel ui:field="attachPanel"> + <g:Label ui:field="assignLabel" addStyleNames="{style.mainLabel}"/> + <g:HTMLPanel addStyleNames="{style.indent}"> + <g:ScrollPanel height="160px" width="100%"> + <e:EntityModelCellTable ui:field="clustersTable" /> + </g:ScrollPanel> + </g:HTMLPanel> + </g:VerticalPanel> + </t:content> + </t:DialogTab> + </t:tab> + </t:DialogTabPanel> </d:content> </d:SimpleDialogPanel> + </ui:UiBinder> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java index 1237ff2..dd7ecf8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java @@ -37,6 +37,7 @@ dataCenterEditor.setVisible(false); externalProviderEditor.setVisible(false); networkLabel.setVisible(false); + providerTab.setVisible(false); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditDataCenterNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditDataCenterNetworkPopupView.java index 63b1318..a6f0d66 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditDataCenterNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditDataCenterNetworkPopupView.java @@ -23,5 +23,6 @@ super.updateVisibility(); dataCenterEditor.setVisible(false); externalProviderEditor.setVisible(false); + providerTab.setVisible(false); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java index f40a2b9..e6adc19 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/NewDataCenterNetworkPopupView.java @@ -24,5 +24,6 @@ dataCenterEditor.setVisible(false); externalProviderEditor.setVisible(false); networkLabel.setVisible(false); + providerTab.setVisible(false); } } -- To view, visit http://gerrit.ovirt.org/16067 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5fdadb371bd06ffb7534707fd1dc1d14ad3ebae Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
