Lior Vernia has uploaded a new change for review. Change subject: webadmin: Add InfoIcon for external network label meaning ......................................................................
webadmin: Add InfoIcon for external network label meaning The InfoIcon explains that in the context of a Neutron external network, this is what's called "physical network" in Neutron parlance. Change-Id: I6dc6785aabf6b2e0f00356ef534440984c9a7a09 Bug-Url: https://bugzilla.redhat.com/1061193 Signed-off-by: Lior Vernia <[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 3 files changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/26852/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 87a3e6f..05c9490 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 @@ -211,6 +211,9 @@ @DefaultStringValue("Network Label") String networkLabel(); + @DefaultStringValue("For a Neutron external network, this maps to the name of the physical network.") + String networkLabelInfo(); + @DefaultStringValue("Label") String networkLabelNetworksTab(); 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 0137deb..3c53f33 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 @@ -9,16 +9,18 @@ import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; import org.ovirt.engine.ui.common.widget.Align; +import org.ovirt.engine.ui.common.widget.EntityModelWidgetWithInfo; import org.ovirt.engine.ui.common.widget.UiCommandButton; 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.ListModelSuggestBoxOnlyEditor; import org.ovirt.engine.ui.common.widget.editor.generic.IntegerEntityModelTextBoxOnlyEditor; +import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelLabel; import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.editor.generic.EntityModelCheckBoxEditor; import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; -import org.ovirt.engine.ui.common.widget.editor.generic.ListModelSuggestBoxEditor; import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer; import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; import org.ovirt.engine.ui.common.widget.table.column.CheckboxColumn; @@ -117,9 +119,14 @@ @Path(value = "mtu.entity") public IntegerEntityModelTextBoxOnlyEditor mtuEditor; - @UiField @Path(value = "networkLabel.selectedItem") - public ListModelSuggestBoxEditor networkLabel; + public ListModelSuggestBoxOnlyEditor networkLabel; + + @Ignore + public StringEntityModelLabel networkLabelLabel; + + @UiField(provided = true) + public EntityModelWidgetWithInfo<String> networkLabelWithInfo; @UiField(provided = true) @Path(value = "qos.selectedItem") @@ -216,6 +223,10 @@ isVmNetworkEditor = new EntityModelCheckBoxEditor(Align.RIGHT); vlanTagging = new EntityModelCheckBoxEditor(Align.RIGHT); hasMtuEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + networkLabelLabel = new StringEntityModelLabel(); + networkLabel = new ListModelSuggestBoxOnlyEditor(); + networkLabelWithInfo = new EntityModelWidgetWithInfo<String>(networkLabelLabel, networkLabel); + networkLabelWithInfo.setExplanation(templates.italicText(constants.networkLabelInfo())); this.clustersTable = new EntityModelCellTable<ListModel>(SelectionMode.NONE, true); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); initEntityModelCellTable(constants, templates); @@ -236,7 +247,7 @@ exportLabel.setText(constants.exportLabel()); exportEditor.setLabel(constants.exportCheckboxLabel()); externalProviderEditor.setLabel(constants.externalProviderLabel()); - networkLabel.setLabel(constants.networkLabel()); + networkLabelLabel.setText(constants.networkLabel()); commentEditor.setLabel(constants.commentLabel()); isVmNetworkEditor.setLabel(constants.vmNetworkLabel()); vlanTagging.setLabel(constants.enableVlanTagLabel()); @@ -261,8 +272,8 @@ vlanTagging.asCheckBox().addStyleName(style.checkBox()); hasMtuEditor.addContentWidgetStyleName(style.checkBox()); hasMtuEditor.asCheckBox().addStyleName(style.checkBox()); - networkLabel.addLabelStyleName(style.checkBox()); - networkLabel.addLabelStyleName(style.inlineLabel()); + networkLabelLabel.addStyleName(style.checkBox()); + networkLabelLabel.addStyleName(style.inlineLabel()); qosEditor.addLabelStyleName(style.checkBox()); qosEditor.addLabelStyleName(style.inlineLabel()); } 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 c4b9f6a..c37d5a9 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 @@ -111,7 +111,7 @@ <ge:EntityModelCheckBoxEditor ui:field="hasMtuEditor"/> <ge:IntegerEntityModelTextBoxOnlyEditor ui:field="mtuEditor" /> </g:HorizontalPanel> - <ge:ListModelSuggestBoxEditor ui:field="networkLabel" addStyleNames="{style.dependentField} {style.propertyWidth}" /> + <w:EntityModelWidgetWithInfo ui:field="networkLabelWithInfo" addStyleNames="{style.dependentField} {style.propertyWidth}" width="470px" /> <g:HorizontalPanel verticalAlignment="ALIGN_MIDDLE" visible="false"> <e:ListModelListBoxEditor ui:field="qosEditor" addStyleNames="{style.dependentField} {style.propertyWidth}" /> <w:UiCommandButton ui:field="addQosButton" addStyleNames="{style.qosStyle}" /> -- To view, visit http://gerrit.ovirt.org/26852 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dc6785aabf6b2e0f00356ef534440984c9a7a09 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
