Shahar Havivi has uploaded a new change for review. Change subject: vminit change UI cloud init dialog ......................................................................
vminit change UI cloud init dialog Change-Id: I12aa41b3523cd07e66bca980ad8394ed3dd00707 Signed-off-by: Shahar Havivi <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/CloudInitWidget.ui.xml 2 files changed, 26 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/22569/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 09b8bb6..9c686df 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -142,7 +142,7 @@ @DefaultStringValue("Boot Sequence:") String runOncePopupBootSequenceLabel(); - @DefaultStringValue("Hostname") + @DefaultStringValue("VM Hostname") String cloudInitHostnameLabel(); @DefaultStringValue("SSH Authorized Keys") diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/CloudInitWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/CloudInitWidget.ui.xml index c19ca38..bdaaa54 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/CloudInitWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/CloudInitWidget.ui.xml @@ -65,6 +65,31 @@ </g:FlowPanel> <g:FlowPanel addStyleNames="{style.horizontalPanel}"> + <e:EntityModelCheckBoxEditor ui:field="timeZoneEnabledEditor" addStyleNames="{style.optionCheckbox}" /> + <e:ListModelListBoxEditor ui:field="timeZoneEditor" addStyleNames="{style.primaryOption}" /> + </g:FlowPanel> + + <g:HTMLPanel><hr class="{style.dnsDivider}" /></g:HTMLPanel> + + <g:FlowPanel addStyleNames="{style.horizontalPanel}"> + <e:EntityModelCheckBoxEditor ui:field="rootPasswordEnabledEditor" addStyleNames="{style.optionCheckbox}" /> + <e:EntityModelPasswordBoxEditor ui:field="rootPasswordEditor" addStyleNames="{style.primaryOption}" /> + </g:FlowPanel> + <g:FlowPanel addStyleNames="{style.nestedOption}"> + <e:EntityModelPasswordBoxEditor ui:field="rootPasswordVerificationEditor" /> + </g:FlowPanel> + + <g:FlowPanel addStyleNames="{style.horizontalPanel}"> + <e:EntityModelCheckBoxEditor ui:field="authorizedKeysEnabledEditor" addStyleNames="{style.optionCheckbox}" /> + <e:EntityModelTextAreaEditor ui:field="authorizedKeysEditor" addStyleNames="{style.primaryOption}" /> + </g:FlowPanel> + <g:FlowPanel addStyleNames="{style.horizontalPanel}"> + <e:EntityModelCheckBoxEditor ui:field="regenerateKeysEnabledEditor" addStyleNames="{style.optionCheckbox}" /> + </g:FlowPanel> + + <g:HTMLPanel><hr class="{style.dnsDivider}" /></g:HTMLPanel> + + <g:FlowPanel addStyleNames="{style.horizontalPanel}"> <e:EntityModelCheckBoxEditor ui:field="networkEnabledEditor" addStyleNames="{style.optionCheckbox}" /> <w:ComboBox ui:field="networkComboBox" addStyleNames="{style.primaryOptionComboBox}" /> </g:FlowPanel> @@ -92,26 +117,5 @@ <e:EntityModelTextBoxEditor ui:field="dnsSearchDomains" /> </g:FlowPanel> - <g:FlowPanel addStyleNames="{style.horizontalPanel}"> - <e:EntityModelCheckBoxEditor ui:field="authorizedKeysEnabledEditor" addStyleNames="{style.optionCheckbox}" /> - <e:EntityModelTextAreaEditor ui:field="authorizedKeysEditor" addStyleNames="{style.primaryOption}" /> - </g:FlowPanel> - - <g:FlowPanel addStyleNames="{style.horizontalPanel}"> - <e:EntityModelCheckBoxEditor ui:field="regenerateKeysEnabledEditor" addStyleNames="{style.optionCheckbox}" /> - </g:FlowPanel> - - <g:FlowPanel addStyleNames="{style.horizontalPanel}"> - <e:EntityModelCheckBoxEditor ui:field="timeZoneEnabledEditor" addStyleNames="{style.optionCheckbox}" /> - <e:ListModelListBoxEditor ui:field="timeZoneEditor" addStyleNames="{style.primaryOption}" /> - </g:FlowPanel> - - <g:FlowPanel addStyleNames="{style.horizontalPanel}"> - <e:EntityModelCheckBoxEditor ui:field="rootPasswordEnabledEditor" addStyleNames="{style.optionCheckbox}" /> - <e:EntityModelPasswordBoxEditor ui:field="rootPasswordEditor" addStyleNames="{style.primaryOption}" /> - </g:FlowPanel> - <g:FlowPanel addStyleNames="{style.nestedOption}"> - <e:EntityModelPasswordBoxEditor ui:field="rootPasswordVerificationEditor" /> - </g:FlowPanel> </g:FlowPanel> </ui:UiBinder> -- To view, visit http://gerrit.ovirt.org/22569 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12aa41b3523cd07e66bca980ad8394ed3dd00707 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
