Shahar Havivi has uploaded a new change for review. Change subject: UI: add info tooltip for Cloud-Init custom script ......................................................................
UI: add info tooltip for Cloud-Init custom script Bug-Url: https://bugzilla.redhat.com/1051041 Change-Id: Id3990c7ccc646f3c9653993a36c3b1c5668a453f Signed-off-by: Shahar Havivi <shah...@redhat.com> --- 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/VmInitWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/24431/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 a7b8a8b..63a66f1 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 @@ -1624,6 +1624,9 @@ @DefaultStringValue("Attach a VirtIO-SCSI controller when running the VM") String isVirtioScsiEnabledInfo(); + @DefaultStringValue("Cloud-Init YAML sections, please refer to: http://www.ovirt.org/Features/vm-init-persistent#Custom_Script";) + String customScriptInfo(); + @DefaultStringValue("VirtIO-SCSI can be enabled from Resource Allocation tab on VM dialog") String diskInterfaceInfo(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java index 8fe2320..7434ea6 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java @@ -2,6 +2,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.editor.client.SimpleBeanEditorDriver; +import com.google.gwt.editor.client.Editor.Ignore; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.resources.client.ClientBundle; @@ -14,12 +15,16 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.Widget; + import org.ovirt.engine.ui.common.CommonApplicationConstants; +import org.ovirt.engine.ui.common.CommonApplicationResources; +import org.ovirt.engine.ui.common.CommonApplicationTemplates; 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.ComboBox; import org.ovirt.engine.ui.common.widget.dialog.AdvancedParametersExpander; +import org.ovirt.engine.ui.common.widget.dialog.InfoIcon; import org.ovirt.engine.ui.common.widget.editor.EntityModelCheckBoxEditor; import org.ovirt.engine.ui.common.widget.editor.EntityModelPasswordBoxEditor; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextAreaEditor; @@ -36,6 +41,9 @@ import java.util.Map; public abstract class VmInitWidget extends AbstractModelBoundPopupWidget<VmInitModel> implements IndexedPanel { + + private static final CommonApplicationTemplates applicationTemplates = GWT.create(CommonApplicationTemplates.class); + private static final CommonApplicationResources applicationResources = GWT.create(CommonApplicationResources.class); interface Driver extends SimpleBeanEditorDriver<VmInitModel, VmInitWidget> { } @@ -122,6 +130,9 @@ @Path(value = "customScript.entity") @WithElementId EntityModelTextAreaEditor customScriptEditor; + + @UiField(provided = true) + public InfoIcon customScriptInfoIcon; @UiField @Path(value = "regenerateKeysEnabled.entity") @@ -261,6 +272,9 @@ this.customizableStyle = style; + customScriptInfoIcon = + new InfoIcon(applicationTemplates.italicText(constants.customScriptInfo()), applicationResources); + initCheckBoxEditors(); initListBoxEditors(); initComboBoxEditors(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml index 52251c6..28d01c3 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml @@ -48,6 +48,11 @@ display: none !important; } + .customScriptInfoIconStyle { + display: inline; + float: left; + } + </ui:style> <g:FlowPanel addStyleNames="{style.verticalPanel}" ui:field="mainPanel"> @@ -107,6 +112,7 @@ <d:AdvancedParametersExpander ui:field="customScriptExpander" addStyleNames="{style.verticalPanel}"/> <g:FlowPanel ui:field="customScriptExpanderContent" > + <d:InfoIcon ui:field="customScriptInfoIcon" addStyleNames="{style.customScriptInfoIconStyle}" /> <e:EntityModelTextAreaEditor ui:field="customScriptEditor" labelStyleName="{style.displayNone}" /> </g:FlowPanel> -- To view, visit http://gerrit.ovirt.org/24431 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3990c7ccc646f3c9653993a36c3b1c5668a453f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
