Alexander Wels has uploaded a new change for review. Change subject: webadmin: Update host general layout. ......................................................................
webadmin: Update host general layout. - Update the new/edit host general panel layout to use patternfly grids for the layout instead of the hodge podge div/tables that were there before. - Converted the controls to be patternfly as well. - Update the ListModelTypeAheadListBox to be patternfly aware. Change-Id: I132100fa06802901c16ab1dead1432c94d5dc347 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1124878 Signed-off-by: Alexander Wels <aw...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseEntityModelCheckboxEditor.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBoxEditor.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml 7 files changed, 236 insertions(+), 143 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/40886/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java index 2fbb0cc..d3542c3 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java @@ -3,6 +3,7 @@ import java.util.List; import org.gwtbootstrap3.client.ui.FormLabel; +import org.gwtbootstrap3.client.ui.constants.ColumnSize; import org.gwtbootstrap3.client.ui.constants.Styles; import org.ovirt.engine.ui.common.css.OvirtCss; import org.ovirt.engine.ui.common.idhandler.HasElementId; @@ -170,6 +171,14 @@ } } + public void setLabelColSize(ColumnSize size) { + addLabelStyleName(size.getCssName()); + } + + public void setWidgetColSize(ColumnSize size) { + addContentWidgetContainerStyleName(size.getCssName()); + } + /** * Render widget more responsive, by firing {@link ValueChangeEvent} on each {@link KeyDownEvent}. */ diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseEntityModelCheckboxEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseEntityModelCheckboxEditor.java index 8629485..9581795 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseEntityModelCheckboxEditor.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseEntityModelCheckboxEditor.java @@ -74,6 +74,7 @@ getCheckboxWidgetLabel().getStyle().setTop(-3, Unit.PX); // checkboxes don't use form-control getContentWidgetElement().removeClassName(Styles.FORM_CONTROL); + removeContentWidgetStyleName(Styles.FORM_CONTROL); } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.java index 8a31eee..4e667ef 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.List; +import org.gwtbootstrap3.client.ui.constants.Styles; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.gin.AssetProvider; import org.ovirt.engine.ui.common.widget.editor.ListModelTypeAheadListBoxEditor.SuggestBoxRenderer; @@ -49,6 +50,13 @@ */ public class ListModelTypeAheadListBox<T> extends BaseListModelSuggestBox<T> { + private static final String LMTALB_LISTBOX_PFLY_FIX = "lmtalb_listbox_pfly_fix"; //$NON-NLS-1$ + private static final String LMTALB_WRAPPER_LISTBOX_PFLY_FIX = "lmtalb_suggestboxWrapper_pfly_fix"; //$NON-NLS-1$ + private static final String LMTALB_SUGGESTBOX_PFLY_FIX = "lmtalb_suggestbox_pfly_fix"; //$NON-NLS-1$ + private static final String PATTERNFLY_IMAGE_HEIGHT = "23px"; //$NON-NLS-1$ + + private final static CommonApplicationConstants constants = AssetProvider.getConstants(); + @UiField(provided = true) SuggestBox suggestBox; @@ -79,13 +87,17 @@ String enabledMainPanel(); String disabledMainPanel(); + + String suggestBoxStyle_legacy(); + + String suggestBoxWrapperStyle_legacy(); + + String maxWidth(); } - interface ViewUiBinder extends UiBinder<FlowPanel, ListModelTypeAheadListBox> { + interface ViewUiBinder extends UiBinder<FlowPanel, ListModelTypeAheadListBox<?>> { ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class); } - - private final static CommonApplicationConstants constants = AssetProvider.getConstants(); public ListModelTypeAheadListBox(SuggestBoxRenderer<T> renderer, boolean autoAddToValidValues, SuggestionMatcher suggestionMatcher) { @@ -99,11 +111,24 @@ setAutoHideEnabled(false); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); - mainPanel.getElement().addClassName("lmtalb_listbox_pfly_fix"); //$NON-NLS-1$ + mainPanel.getElement().addClassName(LMTALB_LISTBOX_PFLY_FIX); registerListeners(); } + public void setUsePatternFly(final boolean usePatternFly) { + if (usePatternFly) { + mainPanel.removeStyleName(LMTALB_LISTBOX_PFLY_FIX); + mainPanel.removeStyleName(Styles.FORM_CONTROL); + mainPanel.addStyleName(style.maxWidth()); + suggestBox.removeStyleName(style.suggestBoxStyle_legacy()); + suggestBox.removeStyleName(LMTALB_SUGGESTBOX_PFLY_FIX); + suggestBox.getParent().removeStyleName(LMTALB_WRAPPER_LISTBOX_PFLY_FIX); + suggestBox.getParent().removeStyleName(style.suggestBoxWrapperStyle_legacy()); + dropDownImage.setHeight(PATTERNFLY_IMAGE_HEIGHT); + } + } + private void registerListeners() { SuggestBoxFocusHandler handlers = new SuggestBoxFocusHandler(); suggestBox.getValueBox().addBlurHandler(handlers); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.ui.xml index dc4c29b..e9f56dc8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBox.ui.xml @@ -7,14 +7,19 @@ <ui:style type="org.ovirt.engine.ui.common.widget.editor.ListModelTypeAheadListBox.Style"> .mainStyle,.enabledMainPanel,.disabledMainPanel { display: inline-block; - height: 17px; border: 1px solid black; vertical-align: middle; } + .maxWidth { + width: 100%; + } + .suggestBoxStyle { border-width: 0px; - width: 100%; + } + + .suggestBoxStyle_legacy { vertical-align: top; height: 15px; padding-left: 4px; @@ -28,8 +33,11 @@ vertical-align: top; } - .suggestBoxWrapperStyle { + .suggestBoxWrapperStyle_legacy { height: 17px; + } + + .suggestBoxWrapperStyle { margin-right: 15px; } @@ -47,8 +55,8 @@ <g:Image ui:field="dropDownImage" addStyleNames="{style.dropDownStyle}" resource='{resources.comboBoxDropDownIcon}' /> </g:FlowPanel> - <g:FlowPanel addStyleNames="{style.suggestBoxWrapperStyle} lmtalb_suggestboxWrapper_pfly_fix"> - <g:SuggestBox addStyleNames="{style.suggestBoxStyle} lmtalb_suggestbox_pfly_fix gwt-ListBox" ui:field="suggestBox" /> + <g:FlowPanel addStyleNames="{style.suggestBoxWrapperStyle} {style.suggestBoxWrapperStyle_legacy} lmtalb_suggestboxWrapper_pfly_fix"> + <g:SuggestBox addStyleNames="{style.suggestBoxStyle} {style.maxWidth} {style.suggestBoxStyle_legacy} lmtalb_suggestbox_pfly_fix gwt-ListBox" ui:field="suggestBox" /> </g:FlowPanel> </g:FlowPanel> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBoxEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBoxEditor.java index 71a8258..a9b30e2 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBoxEditor.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelTypeAheadListBoxEditor.java @@ -53,6 +53,11 @@ return editor; } + public void setUsePatternFly(final boolean usePatternFly) { + super.setUsePatternFly(usePatternFly); + getContentWidget().setUsePatternFly(usePatternFly); + } + /** * A renderer for the suggest box. Receives an instance of the EntityModel and returns two kinds of the rendering. */ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java index 9a70f9a..b5185e3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java @@ -2,6 +2,8 @@ import java.util.List; +import org.gwtbootstrap3.client.ui.Column; +import org.gwtbootstrap3.client.ui.Row; import org.ovirt.engine.core.common.action.VdsOperationActionParameters.AuthenticationMethod; import org.ovirt.engine.core.common.businessentities.ExternalEntityBase; import org.ovirt.engine.core.common.businessentities.ExternalHostGroup; @@ -73,7 +75,6 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ListBox; @@ -161,6 +162,12 @@ @WithElementId("providers") ListModelListBoxEditor<Provider> providersEditor; + @UiField + Row searchProviderRow; + + @UiField + Row discoveredHostsRow; + @UiField(provided = true) @Path(value = "externalDiscoveredHosts.selectedItem") @WithElementId("externalDiscoveredHosts") @@ -196,12 +203,12 @@ @WithElementId("publicKey") StringEntityModelTextAreaLabelEditor publicKeyEditor; - @UiField + @UiField(provided = true) @Path(value = "overrideIpTables.entity") @WithElementId("overrideIpTables") EntityModelCheckBoxEditor overrideIpTablesEditor; - @UiField + @UiField(provided = true) @Path(value = "protocol.entity") @WithElementId("protocol") EntityModelCheckBoxEditor protocolEditor; @@ -386,22 +393,22 @@ @UiField @Path(value = "pkSection.entity") @WithElementId("pkSection") - HorizontalPanel pkSection; + Row pkSection; @UiField @Path(value = "passwordSection.entity") @WithElementId("passwordSection") - HorizontalPanel passwordSection; + Row passwordSection; @UiField @Path(value = "provisionedHostSection.entity") @WithElementId - HorizontalPanel provisionedHostSection; + Column provisionedHostSection; @UiField @Path(value = "discoveredHostSection.entity") @WithElementId - HorizontalPanel discoveredHostSection; + Column discoveredHostSection; @UiField(provided = true) @Ignore @@ -426,6 +433,10 @@ @UiField @Ignore Label authLabel; + + @UiField + @Ignore + Label rootPasswordLabel; @UiField @Ignore @@ -475,12 +486,6 @@ @Ignore FlowPanel expanderContent; - @UiField - FlowPanel searchProviderPanel; - - @UiField - FlowPanel discoveredHostsPanel; - private final Driver driver = GWT.create(Driver.class); private final static ApplicationTemplates templates = AssetProvider.getTemplates(); @@ -495,12 +500,19 @@ initEditors(); initInfoIcon(); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); + hideEditorLabels(); initExpander(); ViewIdHandler.idHandler.generateAndSetIds(this); localize(); addStyles(); driver.initialize(this); applyModeCustomizations(); + } + + private void hideEditorLabels() { + providersEditor.hideLabel(); + passwordEditor.hideLabel(); + publicKeyEditor.hideLabel(); } private void initInfoIcon() { @@ -515,14 +527,10 @@ } private void addStyles() { - overrideIpTablesEditor.addContentWidgetContainerStyleName(style.overrideIpStyle()); - protocolEditor.addContentWidgetContainerStyleName(style.protocolStyle()); externalHostProviderEnabledEditor.addContentWidgetContainerStyleName(style.externalHostProviderEnabledEditorContent()); providerSearchFilterEditor.addContentWidgetContainerStyleName(style.searchFilter()); - providerSearchFilterEditor.setStyleName(style.searchFilterLabel()); providerSearchFilterEditor.setLabelStyleName(style.emptyEditor()); providerSearchFilterLabel.addContentWidgetContainerStyleName(style.emptyEditor()); - providerSearchFilterLabel.setStyleName(style.searchFilterLabel()); fetchSshFingerprint.addContentWidgetContainerStyleName(style.fingerprintEditor()); expanderContent.setStyleName(style.expanderContent()); publicKeyEditor.setCustomStyle(style.pkStyle()); @@ -554,6 +562,8 @@ // Check boxes pmEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT); externalHostProviderEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + overrideIpTablesEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + protocolEditor = new EntityModelCheckBoxEditor(Align.RIGHT); rbPassword = new RadioButton("1"); //$NON-NLS-1$ rbPublicKey = new RadioButton("1"); //$NON-NLS-1$ @@ -597,6 +607,7 @@ hostAddressEditor.setLabel(constants.hostPopupHostAddressLabel()); authSshPortEditor.setLabel(constants.hostPopupPortLabel()); authLabel.setText(constants.hostPopupAuthLabel()); + rootPasswordLabel.setText(constants.hostPopupAuthLabelForExternalHost()); rbPassword.setText(constants.hostPopupPasswordLabel()); rbPublicKey.setText(constants.hostPopupPublicKeyLable()); rbProvisionedHost.setText(constants.provisionedHostsLabel()); @@ -676,7 +687,6 @@ } @Override - @SuppressWarnings("unchecked") public void edit(final HostModel object) { driver.edit(object); setTabIndexes(0); @@ -902,13 +912,13 @@ private void showDiscoveredHostsWidgets(boolean enabled) { usualFormToDiscover(enabled); showExternalDiscoveredHost(enabled); - showExternalProvisionedHosts(!enabled); + setHostProviderVisibility(!enabled); } private void showProvisionedHostsWidgets(boolean enabled) { usualFormToDiscover(!enabled); showExternalDiscoveredHost(!enabled); - showExternalProvisionedHosts(enabled); + setHostProviderVisibility(enabled); } private void hideProviderWidgets(final HostModel object) { @@ -916,7 +926,7 @@ rbDiscoveredHost.setValue(false); usualFormToDiscover(false); showExternalDiscoveredHost(false); - showExternalProvisionedHosts(false); + setHostProviderVisibility(false); object.getIsDiscoveredHosts().setEntity(null); } @@ -928,7 +938,7 @@ discoveredHostSection.setVisible(false); providersEditor.setVisible(false); showExternalDiscoveredHost(false); - showExternalProvisionedHosts(false); + setHostProviderVisibility(false); } private void displayPassPkWindow(boolean isPasswordVisible) { @@ -952,17 +962,16 @@ } private void showExternalDiscoveredHost(boolean enabled) { - discoveredHostsPanel.setVisible(enabled); - } - private void showExternalProvisionedHosts(boolean enabled) { - searchProviderPanel.setVisible(enabled); + discoveredHostsRow.setVisible(enabled); } private void usualFormToDiscover(boolean isDiscovered) { if (isDiscovered) { - authLabel.setText(constants.hostPopupAuthLabelForExternalHost()); + authLabel.setVisible(false); + rootPasswordLabel.setVisible(true); } else { - authLabel.setText(constants.hostPopupAuthLabel()); + rootPasswordLabel.setVisible(false); + authLabel.setVisible(true); displayPassPkWindow(true); } rbPublicKey.setVisible(!isDiscovered); @@ -1089,15 +1098,9 @@ String radioButton(); - String overrideIpStyle(); - - String protocolStyle(); - String checkBox(); String searchFilter(); - - String searchFilterLabel(); String emptyEditor(); @@ -1144,7 +1147,7 @@ @Override public void setHostProviderVisibility(boolean visible) { - searchProviderPanel.setVisible(visible); + searchProviderRow.setVisible(visible); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml index 5bf16bc..87e8eb5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml @@ -7,17 +7,17 @@ xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor" xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic" xmlns:w="urn:import:org.ovirt.engine.ui.common.widget" - xmlns:p="urn:import:org.ovirt.engine.ui.webadmin.widget.provider"> + xmlns:p="urn:import:org.ovirt.engine.ui.webadmin.widget.provider" + xmlns:b="urn:import:org.gwtbootstrap3.client.ui"> <ui:with field='constants' type='org.ovirt.engine.ui.common.CommonApplicationConstants'/> <ui:style type="org.ovirt.engine.ui.webadmin.section.main.view.popup.host.HostPopupView.Style"> .generalTabTopDecorator { background-color: #D3D3D3; - margin-bottom: 8px; - margin-top: 4px; - margin-right: 3px; - padding-top: 6px; - padding-bottom: 6px; + } + + .topElement { + padding-top: 15px; } .powerManagementTabInputDecorator { @@ -29,15 +29,6 @@ margin: 10px 5px; } - .filterLabel { - padding: 0 5px; - padding-top: 10px; - } - - .filterIcon { - display: inline-block; - } - .headerLabel { font-weight: bold; margin-top: 10px; @@ -47,6 +38,10 @@ .headerAuthLabel { font-weight: bold; margin-top: 10px; + } + + .rootPasswordLabel { + line-height: 5px; } .headerFp { @@ -71,9 +66,17 @@ font-style: italic; } + .icon { + display: inline-block; + } + .sourceLabel { font-size: 13px; padding: 0 5px; + } + + .container { + width: 100%; } .testPanel { @@ -120,18 +123,14 @@ margin-left: 30px; } - .overrideIpStyle { - width: 200px; - } - - .protocolStyle { - width: 200px; - } - .consoleAddressStyle { line-height: 30px; - padding: 0 5px; - padding-bottom: 35px; + padding: 0 5px; + padding-bottom: 35px; + } + + .floatLeft { + float: left; } .consoleAddressWithHelp { @@ -163,14 +162,18 @@ } .searchButton { - padding-bottom: 5px; - display: inline-block; + float: right; + top: -40px; + position: relative; + line-height: 30px; } .searchFilter { - width: 202px; - display: inline-block; - padding-left: 0px; + width: 99%; + } + + .searchFilterHelpIcon { + margin-top: 2px; } .searchPanel { @@ -179,12 +182,8 @@ line-height: 30px; padding-bottom: 0; padding-top: 0; - width: 232px; + width: 100%; height: 30px; - } - - .searchFilterLabel { - display: inline-block; } .emptyEditor { @@ -257,71 +256,114 @@ <t:tab> <t:DialogTab ui:field="generalTab"> <t:content> - <g:FlowPanel> - <g:FlowPanel addStyleNames="{style.generalTabTopDecorator}"> - <e:ListModelListBoxEditor ui:field="dataCenterEditor"/> - <e:ListModelListBoxEditor ui:field="clusterEditor"/> - <g:HorizontalPanel width="100%"> - <ge:EntityModelCheckBoxEditor ui:field="externalHostProviderEnabledEditor" addStyleNames="{style.externalHostProviderEnabledEditor}"/> - <e:ListModelListBoxEditor ui:field="providersEditor"/> - </g:HorizontalPanel> - <g:FlowPanel> - <g:HorizontalPanel ui:field="discoveredHostSection" addStyleNames="{style.radioButtonProvider}"> - <g:RadioButton ui:field="rbDiscoveredHost" /> - <d:InfoIcon ui:field="discoveredHostInfoIcon" addStyleNames="{style.filterIcon}"/> - </g:HorizontalPanel> - <g:HorizontalPanel ui:field="provisionedHostSection" addStyleNames="{style.radioButtonProvider}"> - <g:RadioButton ui:field="rbProvisionedHost" /> - <d:InfoIcon ui:field="provisionedHostInfoIcon" addStyleNames="{style.filterIcon}"/> - </g:HorizontalPanel> - </g:FlowPanel> - <g:FlowPanel ui:field="searchProviderPanel" width="100%"> - <e:ListModelListBoxEditor ui:field="externalHostNameEditor"/> - <g:FlowPanel addStyleNames="{style.filterIcon}"> - <ge:StringEntityModelTextBoxEditor ui:field="providerSearchFilterLabel"/> - <d:InfoIcon ui:field="providerSearchInfoIcon" addStyleNames="{style.filterIcon}"/> - </g:FlowPanel> - <g:FlowPanel addStyleNames="{style.searchPanel}"> - <g:HorizontalPanel verticalAlignment="middle"> - <ge:StringEntityModelTextBoxEditor ui:field="providerSearchFilterEditor"/> - <g:Image ui:field="updateHostsButton"/> - </g:HorizontalPanel> - </g:FlowPanel> - </g:FlowPanel> - <g:FlowPanel ui:field="discoveredHostsPanel"> - <e:ListModelTypeAheadListBoxEditor ui:field="externalDiscoveredHostsEditor"/> - <e:ListModelTypeAheadListBoxEditor ui:field="externalHostGroupsEditor"/> - <e:ListModelTypeAheadListBoxEditor ui:field="externalComputeResourceEditor"/> - </g:FlowPanel> - </g:FlowPanel> - <g:FlowPanel> - <ge:StringEntityModelTextBoxEditor ui:field="nameEditor"/> - <ge:StringEntityModelTextBoxEditor ui:field="commentEditor"/> - <ge:StringEntityModelTextBoxEditor ui:field="hostAddressEditor" /> - <ge:IntegerEntityModelTextBoxEditor ui:field="authSshPortEditor"/> - <g:VerticalPanel addStyleNames="{style.content}"> + <b:Container addStyleNames="{style.container}"> + <b:Row addStyleNames="{style.generalTabTopDecorator} {style.topElement}"> + <e:ListModelListBoxEditor ui:field="dataCenterEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7"/> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <e:ListModelListBoxEditor ui:field="clusterEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7"/> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <b:Column size="LG_5"> + <ge:EntityModelCheckBoxEditor ui:field="externalHostProviderEnabledEditor" addStyleNames="{style.externalHostProviderEnabledEditor}" usePatternFly="true"/> + </b:Column> + <b:Column size="LG_7"> + <e:ListModelListBoxEditor ui:field="providersEditor" usePatternFly="true"/> + </b:Column> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <b:Column size="LG_11" offset="LG_1" ui:field="discoveredHostSection" > + <g:RadioButton ui:field="rbDiscoveredHost" /> + <d:InfoIcon ui:field="discoveredHostInfoIcon" addStyleNames="{style.icon}" /> + </b:Column> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <b:Column size="LG_11" offset="LG_1" ui:field="provisionedHostSection" > + <g:RadioButton ui:field="rbProvisionedHost" /> + <d:InfoIcon ui:field="provisionedHostInfoIcon" addStyleNames="{style.icon}" /> + </b:Column> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}" ui:field="searchProviderRow"> + <b:Column size="LG_12"> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <e:ListModelListBoxEditor ui:field="externalHostNameEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7"/> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <b:Column size="LG_5"> + <ge:StringEntityModelTextBoxEditor ui:field="providerSearchFilterLabel" addStyleNames="{style.floatLeft}"/> + <d:InfoIcon ui:field="providerSearchInfoIcon" addStyleNames="{style.icon} {style.floatLeft} {style.searchFilterHelpIcon}" /> + </b:Column> + <b:Column size="LG_7"> + <g:FlowPanel addStyleNames="{style.searchPanel}"> + <ge:StringEntityModelTextBoxEditor ui:field="providerSearchFilterEditor" usePatternFly="true"/> + <g:Image ui:field="updateHostsButton" addStyleNames="{style.icon} {style.searchButton}" /> + </g:FlowPanel> + </b:Column> + </b:Row> + </b:Column> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}" ui:field="discoveredHostsRow"> + <b:Column size="LG_12"> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <e:ListModelTypeAheadListBoxEditor ui:field="externalDiscoveredHostsEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7" /> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <e:ListModelTypeAheadListBoxEditor ui:field="externalHostGroupsEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7" /> + </b:Row> + <b:Row addStyleNames="{style.generalTabTopDecorator}"> + <e:ListModelTypeAheadListBoxEditor ui:field="externalComputeResourceEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7" /> + </b:Row> + </b:Column> + </b:Row> + <b:Row addStyleNames="{style.topElement}"> + <ge:StringEntityModelTextBoxEditor ui:field="nameEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7"/> + </b:Row> + <b:Row> + <ge:StringEntityModelTextBoxEditor ui:field="commentEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7"/> + </b:Row> + <b:Row> + <ge:StringEntityModelTextBoxEditor ui:field="hostAddressEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7"/> + </b:Row> + <b:Row> + <ge:IntegerEntityModelTextBoxEditor ui:field="authSshPortEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7"/> + </b:Row> + <b:Row> + <b:Column size="LG_12"> <g:Label ui:field="authLabel" addStyleNames="{style.headerAuthLabel}"/> - <ge:StringEntityModelTextBoxEditor ui:field="userNameEditor"/> - <g:HorizontalPanel ui:field="passwordSection" width="100%" verticalAlignment="middle" addStyleNames="hpv_radio_pfly_fix"> - <g:RadioButton ui:field="rbPassword" /> - <ge:StringEntityModelPasswordBoxEditor ui:field="passwordEditor"/> - </g:HorizontalPanel> - <g:HorizontalPanel ui:field="pkSection" width="100%" verticalAlignment="middle" addStyleNames="hpv_radio_pfly_fix"> - <g:RadioButton ui:field="rbPublicKey" addStyleNames="{style.radioButton}" /> - <ge:StringEntityModelTextAreaLabelEditor ui:field="publicKeyEditor" /> - </g:HorizontalPanel> - <d:AdvancedParametersExpander ui:field="expander"/> - <g:FlowPanel ui:field="expanderContent"> - <ge:EntityModelCheckBoxEditor ui:field="overrideIpTablesEditor"/> - <ge:EntityModelCheckBoxEditor ui:field="protocolEditor" /> - <g:Label ui:field="fingerprintLabel" addStyleNames="{style.headerFp}" /> - <ge:StringEntityModelTextBoxEditor ui:field="fetchSshFingerprint"/> - <g:SimplePanel ui:field="fetchPanel" addStyleNames="{style.fetchLink}, generalDialogComment" /> - <g:Label ui:field="fetchResult" addStyleNames="{style.fetchResultLabel}"/> - </g:FlowPanel> - </g:VerticalPanel> - </g:FlowPanel> - </g:FlowPanel> + </b:Column> + </b:Row> + <b:Row> + <ge:StringEntityModelTextBoxEditor ui:field="userNameEditor" usePatternFly="true" labelColSize="LG_5" widgetColSize="LG_7"/> + </b:Row> + <b:Row ui:field="passwordSection"> + <b:Column size="LG_5"> + <g:RadioButton ui:field="rbPassword" /> + <g:Label ui:field="rootPasswordLabel" addStyleNames="{style.headerAuthLabel} {style.rootPasswordLabel}" visible="false"/> + </b:Column> + <b:Column size="LG_7"> + <ge:StringEntityModelPasswordBoxEditor ui:field="passwordEditor" usePatternFly="true" /> + </b:Column> + </b:Row> + <b:Row ui:field="pkSection"> + <b:Column size="LG_5"> + <g:RadioButton ui:field="rbPublicKey" /> + </b:Column> + <b:Column size="LG_7"> + <ge:StringEntityModelTextAreaLabelEditor ui:field="publicKeyEditor" usePatternFly="true" /> + </b:Column> + </b:Row> + <b:Row> + <d:AdvancedParametersExpander ui:field="expander"/> + <g:FlowPanel ui:field="expanderContent"> + <ge:EntityModelCheckBoxEditor ui:field="overrideIpTablesEditor" usePatternFly="true" /> + <ge:EntityModelCheckBoxEditor ui:field="protocolEditor" usePatternFly="true" /> + <g:Label ui:field="fingerprintLabel" addStyleNames="{style.headerFp}" /> + <ge:StringEntityModelTextBoxEditor ui:field="fetchSshFingerprint" usePatternFly="true" /> + <g:SimplePanel ui:field="fetchPanel" addStyleNames="{style.fetchLink}, generalDialogComment" /> + <g:Label ui:field="fetchResult" addStyleNames="{style.fetchResultLabel}"/> + </g:FlowPanel> + </b:Row> + </b:Container> </t:content> </t:DialogTab> </t:tab> -- To view, visit https://gerrit.ovirt.org/40886 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I132100fa06802901c16ab1dead1432c94d5dc347 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
