Frank Kobzik has uploaded a new change for review. Change subject: frontend: Adjust console tooltips ......................................................................
frontend: Adjust console tooltips Console tooltips for clients are vague and difficult to reach (user needs to hover over the radio button). This patch moves the description from radio button tooltip to explicit InfoIcon widget. Change-Id: I2459521e7ba303918a0992ffd95398b0c42f03df Bug-Url: https://bugzilla.redhat.com/1051255 Signed-off-by: Frantisek Kobzik <[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/view/popup/ConsolePopupView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml 3 files changed, 47 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/24249/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 8832c68..8fb0ce0 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 @@ -1460,16 +1460,16 @@ @DefaultStringValue("SPICE Options") String spiceOptions(); - @DefaultStringValue("If there is a SPICE plugin installed in your browser, it is used for invoking the console session. Otherwise SPICE configuration file is downloaded.") + @DefaultStringValue("If there is a SPICE plugin installed in your browser, it is used for invoking the console session. Otherwise SPICE configuration file is downloaded which will automatically launch locally installed Remote Viewer (Remote Viewer application can be installed via \"Console Client Resources\" page.).") String spiceInvokeAuto(); - @DefaultStringValue("Downloads a SPICE configuration file to be opened by a SPICE client installed on your system.") + @DefaultStringValue("Downloads a SPICE configuration file to be opened by Remote Viewer application installed on your system (Remote Viewer application can be installed via \"Console Client Resources\" page.).") String spiceInvokeNative(); @DefaultStringValue("Uses SPICE browser plugin for invoking console session. For this you must have SPICE console plugin installed in your browser.") String spiceInvokePlugin(); - @DefaultStringValue("Uses SPICE HTML5 client that runs inside your browser.") + @DefaultStringValue("Uses SPICE HTML5 client that runs inside your browser. This client is a Technology preview and it's possible some functions will not work as expected.") String spiceInvokeHtml5(); @DefaultStringValue("Console Invocation") diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java index 13ae773..bc19853 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.common.view.popup; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationResources; @@ -8,6 +9,7 @@ import org.ovirt.engine.ui.common.presenter.popup.ConsolePopupPresenterWidget; import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.widget.Align; +import org.ovirt.engine.ui.common.widget.dialog.InfoIcon; import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; import org.ovirt.engine.ui.common.widget.editor.EntityModelRadioButtonEditor; import org.ovirt.engine.ui.common.widget.uicommon.popup.console.EntityModelValueCheckBoxEditor; @@ -81,6 +83,18 @@ @UiField(provided = true) @WithElementId EntityModelRadioButtonEditor spiceHtml5ImplRadioButton; + + @UiField(provided = true) + InfoIcon spiceAutoInfo; + + @UiField(provided = true) + InfoIcon spiceNativeInfo; + + @UiField(provided = true) + InfoIcon spicePluginInfo; + + @UiField(provided = true) + InfoIcon spiceHtml5Info; @UiField(provided = true) @WithElementId @@ -183,6 +197,11 @@ spiceHtml5ImplRadioButton = new EntityModelRadioButtonEditor("2"); //$NON-NLS-1$ spiceHtml5ImplRadioButton.setLabel(constants.spiceHtml5()); + spiceAutoInfo = new InfoIcon(SafeHtmlUtils.fromString(constants.spiceInvokeAuto()), resources); + spiceNativeInfo = new InfoIcon(SafeHtmlUtils.fromString(constants.spiceInvokeNative()), resources); + spicePluginInfo = new InfoIcon(SafeHtmlUtils.fromString(constants.spiceInvokePlugin()), resources); + spiceHtml5Info = new InfoIcon(SafeHtmlUtils.fromString(constants.spiceInvokeHtml5()), resources); + vncNativeImplRadioButton = new EntityModelRadioButtonEditor("3"); //$NON-NLS-1$ vncNativeImplRadioButton.setLabel(constants.nativeClient()); noVncImplRadioButton = new EntityModelRadioButtonEditor("3"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml index 9e5dd57..6963bd7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml @@ -43,6 +43,14 @@ .consoleResourcesLink { margin-left: 12px; } + + .protocolImplRadio { + float: left; + } + + .clear { + clear: both; + } </ui:style> <d:SimpleDialogPanel width="500px" height="420px"> @@ -59,12 +67,24 @@ <g:FlowPanel ui:field="spicePanel" addStyleNames="{style.protocolPanel}"> <g:Label text="{constants.consoleInvocation}" addStyleNames="{style.labelStyle}" /> - <e:EntityModelRadioButtonEditor ui:field="spiceAutoImplRadioButton" title="{constants.spiceInvokeAuto}"/> - <e:EntityModelRadioButtonEditor ui:field="spiceNativeImplRadioButton" title="{constants.spiceInvokeNative}"/> - <e:EntityModelRadioButtonEditor ui:field="spicePluginImplRadioButton" title="{constants.spiceInvokePlugin}"/> - <e:EntityModelRadioButtonEditor ui:field="spiceHtml5ImplRadioButton" title="{constants.spiceInvokeHtml5}"/> + <g:FlowPanel addStyleNames="{style.clear}"> + <e:EntityModelRadioButtonEditor ui:field="spiceAutoImplRadioButton" addStyleNames="{style.protocolImplRadio}"/> + <d:InfoIcon ui:field="spiceAutoInfo" /> + </g:FlowPanel> + <g:FlowPanel addStyleNames="{style.clear}"> + <e:EntityModelRadioButtonEditor ui:field="spiceNativeImplRadioButton" addStyleNames="{style.protocolImplRadio}"/> + <d:InfoIcon ui:field="spiceNativeInfo" /> + </g:FlowPanel> + <g:FlowPanel addStyleNames="{style.clear}"> + <e:EntityModelRadioButtonEditor ui:field="spicePluginImplRadioButton" addStyleNames="{style.protocolImplRadio}"/> + <d:InfoIcon ui:field="spicePluginInfo" /> + </g:FlowPanel> + <g:FlowPanel addStyleNames="{style.clear}"> + <e:EntityModelRadioButtonEditor ui:field="spiceHtml5ImplRadioButton" addStyleNames="{style.protocolImplRadio}"/> + <d:InfoIcon ui:field="spiceHtml5Info" /> + </g:FlowPanel> - <g:Label ui:field="spiceTitle" text="{constants.spiceOptions}" addStyleNames="{style.labelStyle}" /> + <g:Label ui:field="spiceTitle" text="{constants.spiceOptions}" addStyleNames="{style.labelStyle} {style.clear}" /> <w:EntityModelValueCheckBoxEditor ui:field="remapCtrlAltDeleteSpice" /> <w:EntityModelValueCheckBoxEditor ui:field="enableUsbAutoshare" /> <w:EntityModelValueCheckBoxEditor ui:field="openInFullScreen" /> -- To view, visit http://gerrit.ovirt.org/24249 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2459521e7ba303918a0992ffd95398b0c42f03df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
