Alexander Wels has uploaded a new change for review. Change subject: webadmin: feedback tooltip ......................................................................
webadmin: feedback tooltip - Added brandabled tooltip text to feedback link. Change-Id: Id17d0addf99645d2c8fb6f54ccafa0d4d688d177 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1057212 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java M packaging/branding/ovirt.brand/messages.properties 6 files changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/25703/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java index 8d3f833..c3f4882 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java @@ -13,6 +13,7 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.Set; + import org.ovirt.engine.ui.frontend.utils.BaseContextPathData; /** @@ -35,6 +36,7 @@ COPY_RIGHT_NOTICE("copy_right_notice"), //$NON-NLS-1$ FEEDBACK_URL("feedback_url"), //$NON-NLS-1$ FEEDBACK_LINK_LABEL("feedback_link_label"), //$NON-NLS-1$ + FEEDBACK_LINK_TOOLTIP("feedback_link_tooltip"), //$NON-NLS-1$ GUIDE_URL("guide_url"), //$NON-NLS-1$ EXTENDED_GUIDE_URL("extended_guide_url"), //$NON-NLS-1$ GUIDE_LINK_LABEL("guide_link_label"), //$NON-NLS-1$ @@ -267,6 +269,16 @@ } /** + * Get the feedback link tooltip using the {@code Dictionary} in the host page. With a fall back to the standard GWT + * Constant. + * + * @return The feedback link tooltip. + */ + public final String feedbackLinkTooltip() { + return getString(DynamicMessageKey.FEEDBACK_LINK_TOOLTIP); + } + + /** * Get the guide URL using the {@code Dictionary} in the host page. Uses current locale (e.g. "en_US") * for placeholder {0}, if it exists. With a fall back to the standard GWT Constant. * diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 8dfc5bc..ff7dc91 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -3308,6 +3308,10 @@ @DefaultStringValue("Feedback") String feedbackMessage(); + @DefaultStringValue("Clicking this link will open the feedback in a new browser window/tab." + + " If nothing appears to happen make sure you have your e-mail client configured.") + String feedbackTooltip(); + @DefaultStringValue("Remove Filter") String removeFilter(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java index 13c445f..5421a18 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationDynamicMessages.java @@ -17,6 +17,7 @@ addFallback(DynamicMessageKey.COPY_RIGHT_NOTICE, constants.copyRightNotice()); addFallback(DynamicMessageKey.DOC, constants.engineWebAdminDoc()); addFallback(DynamicMessageKey.FEEDBACK_LINK_LABEL, constants.feedbackMessage()); + addFallback(DynamicMessageKey.FEEDBACK_LINK_TOOLTIP, constants.feedbackTooltip()); addFallback(DynamicMessageKey.GUIDE_LINK_LABEL, constants.guideLinkLabel()); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java index 952a783..6001c00 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java @@ -34,7 +34,7 @@ HasClickHandlers getFeedbackLink(); - void setFeedbackText(String feedbackText); + void setFeedbackText(String feedbackText, String feedbackTitle); } @ContentSlot @@ -125,7 +125,7 @@ String version = (String) result; feedbackUrl = dynamicMessages.feedbackUrl(version); if (feedbackUrl != null && feedbackUrl.length() > 0) { - getView().setFeedbackText(feedbackLinkLabel); + getView().setFeedbackText(feedbackLinkLabel, dynamicMessages.feedbackLinkTooltip()); registerHandler(getView().getFeedbackLink().addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java index 4db8603..fdf0e63 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java @@ -135,9 +135,12 @@ } @Override - public void setFeedbackText(String feedbackText) { + public void setFeedbackText(String feedbackText, String feedbackTitle) { feedbackImagePanel.setVisible(true); feedbackImageLabel.setText(feedbackText); + if (feedbackTitle != null) { + feedbackImageLabel.setTitle(feedbackTitle); + } } } diff --git a/packaging/branding/ovirt.brand/messages.properties b/packaging/branding/ovirt.brand/messages.properties index 59e9db1..6fabad2 100644 --- a/packaging/branding/ovirt.brand/messages.properties +++ b/packaging/branding/ovirt.brand/messages.properties @@ -38,6 +38,8 @@ obrand.webadmin.main_header_label= # Feedback URL obrand.webadmin.feedback_link_label=Feedback +# The tooltip text associated with the feedback link +#obrand.webadmin.feedback_link_tooltip= # Guide URL obrand.webadmin.guide_link_label=Guide obrand.userportal.guide_link_label=Guide -- To view, visit http://gerrit.ovirt.org/25703 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id17d0addf99645d2c8fb6f54ccafa0d4d688d177 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
