Lior Vernia has uploaded a new change for review. Change subject: webadmin: Remove advanced parameters from vNIC dialog ......................................................................
webadmin: Remove advanced parameters from vNIC dialog Since the port mirroring checkbox moved to the vNIC profile dialog, the advanced parameters section in the vNIC dialog only includes plug/unplug at the moment, rendering it quite unnecessary. Also rearranged some of the widget declarations so hitting tab will move between them in a more logical order. Change-Id: Idc9e865f9f8c2fe371d3a33703ea1a8172fea8aa Bug-Url: https://bugzilla.redhat.com/1011999 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.ui.xml 2 files changed, 40 insertions(+), 54 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/20570/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.java index af12aec..401b088 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.java @@ -7,7 +7,6 @@ import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.widget.Align; -import org.ovirt.engine.ui.common.widget.dialog.AdvancedParametersExpander; import org.ovirt.engine.ui.common.widget.editor.EntityModelCheckBoxEditor; import org.ovirt.engine.ui.common.widget.editor.EntityModelRadioButtonEditor; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor; @@ -32,7 +31,6 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Panel; public class NetworkInterfacePopupWidget extends AbstractModelBoundPopupWidget<VmInterfaceModel> { @@ -77,19 +75,20 @@ @WithElementId("nicType") ListModelListBoxEditor<Object> nicTypeEditor; + @UiField + protected HorizontalPanel linkStateSelectionPanel; + + @UiField + @Path(value = "linked.entity") + public ListModelListBoxEditor<Object> linkStateEditor; + @UiField(provided = true) - @Path("enableMac.entity") - @WithElementId("enableManualMac") - EntityModelCheckBoxEditor enableManualMacCheckbox; + @Path(value = "linked_IsSelected.entity") + public EntityModelRadioButtonEditor linkedEditor; - @UiField - @Path("MAC.entity") - @WithElementId("mac") - EntityModelTextBoxEditor MACEditor; - - @UiField - @Ignore - Label macExample; + @UiField(provided = true) + @Path(value = "unlinked_IsSelected.entity") + public EntityModelRadioButtonEditor unlinkedEditor; @UiField protected HorizontalPanel cardStatusSelectionPanel; @@ -106,39 +105,29 @@ @Path(value = "unplugged_IsSelected.entity") public EntityModelRadioButtonEditor unpluggedEditor; - @UiField - protected HorizontalPanel linkStateSelectionPanel; + @UiField(provided = true) + @Path("enableMac.entity") + @WithElementId("enableManualMac") + EntityModelCheckBoxEditor enableManualMacCheckbox; @UiField - @Path(value = "linked.entity") - public ListModelListBoxEditor<Object> linkStateEditor; + @Path("MAC.entity") + @WithElementId("mac") + EntityModelTextBoxEditor MACEditor; - @UiField(provided = true) - @Path(value = "linked_IsSelected.entity") - public EntityModelRadioButtonEditor linkedEditor; - - @UiField(provided = true) - @Path(value = "unlinked_IsSelected.entity") - public EntityModelRadioButtonEditor unlinkedEditor; + @UiField + @Ignore + Label macExample; public final static CommonApplicationMessages messages = GWT.create(CommonApplicationMessages.class); public final static CommonApplicationTemplates templates = GWT.create(CommonApplicationTemplates.class); public final static CommonApplicationResources resources = GWT.create(CommonApplicationResources.class); - - @UiField - @Ignore - public AdvancedParametersExpander expander; - - @UiField - @Ignore - public Panel expanderContent; private final Driver driver = GWT.create(Driver.class); public NetworkInterfacePopupWidget(EventBus eventBus, CommonApplicationConstants constants) { initManualWidgets(); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); - expander.initWithContent(expanderContent.getElement()); localize(constants); applyStyles(); ViewIdHandler.idHandler.generateAndSetIds(this); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.ui.xml index 71e6da1..bff10da 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/networkinterface/NetworkInterfacePopupWidget.ui.xml @@ -73,16 +73,25 @@ <g:FlowPanel> <e:EntityModelTextBoxEditor ui:field="nameEditor" /> <p:ProfileEditor ui:field="profileEditor" /> - <g:HorizontalPanel ui:field="linkStateSelectionPanel" width="100%"> - <e:ListModelListBoxEditor ui:field="linkStateEditor" /> - <g:SimplePanel addStyleNames="{style.contentWidget}"> - <g:HorizontalPanel> - <e:EntityModelRadioButtonEditor ui:field="linkedEditor"/> - <e:EntityModelRadioButtonEditor ui:field="unlinkedEditor"/> - </g:HorizontalPanel> - </g:SimplePanel> - </g:HorizontalPanel> <e:ListModelListBoxEditor ui:field="nicTypeEditor" /> + <g:HorizontalPanel ui:field="linkStateSelectionPanel" width="100%"> + <e:ListModelListBoxEditor ui:field="linkStateEditor" /> + <g:SimplePanel addStyleNames="{style.contentWidget}"> + <g:HorizontalPanel> + <e:EntityModelRadioButtonEditor ui:field="linkedEditor"/> + <e:EntityModelRadioButtonEditor ui:field="unlinkedEditor"/> + </g:HorizontalPanel> + </g:SimplePanel> + </g:HorizontalPanel> + <g:HorizontalPanel ui:field="cardStatusSelectionPanel" width="100%"> + <e:ListModelListBoxEditor ui:field="cardStatusEditor" /> + <g:SimplePanel addStyleNames="{style.contentWidget}"> + <g:HorizontalPanel> + <e:EntityModelRadioButtonEditor ui:field="pluggedEditor"/> + <e:EntityModelRadioButtonEditor ui:field="unpluggedEditor"/> + </g:HorizontalPanel> + </g:SimplePanel> + </g:HorizontalPanel> <g:HorizontalPanel width="100%"> <e:EntityModelCheckBoxEditor ui:field="enableManualMacCheckbox" /> <e:EntityModelTextBoxEditor ui:field="MACEditor" /> @@ -90,17 +99,5 @@ <g:SimplePanel addStyleNames="{style.macExamplePanel}"> <g:Label ui:field="macExample" addStyleNames="{style.macExample}" text="{constants.exampleInterfacePopup} 00:14:4a:23:67:55" /> </g:SimplePanel> - <d:AdvancedParametersExpander ui:field="expander" addStyleNames="{style.expander}"/> - <g:FlowPanel ui:field="expanderContent" addStyleNames="{style.expandedPanel}"> - <g:HorizontalPanel ui:field="cardStatusSelectionPanel" width="100%"> - <e:ListModelListBoxEditor ui:field="cardStatusEditor" /> - <g:SimplePanel addStyleNames="{style.contentWidget}"> - <g:HorizontalPanel> - <e:EntityModelRadioButtonEditor ui:field="pluggedEditor"/> - <e:EntityModelRadioButtonEditor ui:field="unpluggedEditor"/> - </g:HorizontalPanel> - </g:SimplePanel> - </g:HorizontalPanel> - </g:FlowPanel> </g:FlowPanel> </ui:UiBinder> -- To view, visit http://gerrit.ovirt.org/20570 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc9e865f9f8c2fe371d3a33703ea1a8172fea8aa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
