Greg Sheremeta has uploaded a new change for review.
Change subject: userportal, webadmin: rename feedback link label property
......................................................................
userportal, webadmin: rename feedback link label property
Refactor: rename feedback_message to feedback_link_label to
correspond with the other links in the application.
Refactor: move feedback link click handler from constructor to
onBind to correspond with the other click handlers.
Change-Id: I0890f86afa235f32da7ebb014a1385349535dfbd
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
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/ApplicationDynamicMessages.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
M packaging/branding/ovirt.brand/messages.properties
M packaging/branding/ovirt.brand/messages_de_DE.properties
M packaging/branding/ovirt.brand/messages_es_ES.properties
M packaging/branding/ovirt.brand/messages_fr_FR.properties
M packaging/branding/ovirt.brand/messages_ja_JP.properties
M packaging/branding/ovirt.brand/messages_pt_BR.properties
M packaging/branding/ovirt.brand/messages_zh_CN.properties
10 files changed, 27 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/18154/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 4524755..c990d3d 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
@@ -32,7 +32,7 @@
MAIN_HEADER_LABEL("main_header_label"), //$NON-NLS-1$
COPY_RIGHT_NOTICE("copy_right_notice"), //$NON-NLS-1$
FEEDBACK_URL("feedback_url"), //$NON-NLS-1$
- FEEDBACK_MESSAGE("feedback_message"), //$NON-NLS-1$
+ FEEDBACK_LINK_LABEL("feedback_link_label"), //$NON-NLS-1$
GUIDE_URL("guide_url"), //$NON-NLS-1$
GUIDE_LINK_LABEL("guide_link_label"), //$NON-NLS-1$
DOC("doc"); //$NON-NLS-1$
@@ -248,8 +248,8 @@
*
* @return The feedback link label.
*/
- public final String feedbackMessage() {
- return getString(DynamicMessageKey.FEEDBACK_MESSAGE);
+ public final String feedbackLinkLabel() {
+ return getString(DynamicMessageKey.FEEDBACK_LINK_LABEL);
}
/**
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 24dcfc6..13c445f 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
@@ -16,7 +16,7 @@
addFallback(DynamicMessageKey.MAIN_HEADER_LABEL,
constants.mainHeaderLabel());
addFallback(DynamicMessageKey.COPY_RIGHT_NOTICE,
constants.copyRightNotice());
addFallback(DynamicMessageKey.DOC, constants.engineWebAdminDoc());
- addFallback(DynamicMessageKey.FEEDBACK_MESSAGE,
constants.feedbackMessage());
+ addFallback(DynamicMessageKey.FEEDBACK_LINK_LABEL,
constants.feedbackMessage());
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 734edb3..34616ac 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
@@ -2,6 +2,7 @@
import org.ovirt.engine.ui.common.auth.CurrentUser;
import org.ovirt.engine.ui.common.presenter.AbstractHeaderPresenterWidget;
+import org.ovirt.engine.ui.common.utils.WebUtils;
import
org.ovirt.engine.ui.common.widget.tab.AbstractHeadlessTabPanel.TabWidgetHandler;
import org.ovirt.engine.ui.webadmin.ApplicationDynamicMessages;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.popup.configure.ConfigurePopupPresenterWidget;
@@ -11,7 +12,6 @@
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
import com.google.gwt.event.shared.GwtEvent.Type;
-import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
@@ -36,6 +36,8 @@
private final SearchPanelPresenterWidget searchPanel;
private final AboutPopupPresenterWidget aboutPopup;
private final ConfigurePopupPresenterWidget configurePopup;
+ private final String feedbackUrl;
+ private final String feedbackLinkLabel;
@Inject
public HeaderPresenterWidget(EventBus eventBus, ViewDef view, CurrentUser
user,
@@ -47,18 +49,8 @@
this.searchPanel = searchPanel;
this.aboutPopup = aboutPopup;
this.configurePopup = configurePopup;
-
- final String feedbackLink = dynamicMessages.feedbackUrl();
- if (feedbackLink != null && feedbackLink.length() > 0) {
-
getView().getFeedbackLabel().setText(dynamicMessages.feedbackMessage());
- registerHandler(getView().getFeedbackLabel().addClickHandler(new
ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- Window.open(feedbackLink, "_blank", null); //$NON-NLS-1$
- }
- }));
- getView().getFeedbackLabel().setVisible(true);
- }
+ this.feedbackUrl = dynamicMessages.feedbackUrl();
+ this.feedbackLinkLabel = dynamicMessages.feedbackLinkLabel();
}
@Override
@@ -93,6 +85,17 @@
RevealRootPopupContentEvent.fire(HeaderPresenterWidget.this,
aboutPopup);
}
}));
+
+ if (feedbackUrl != null && feedbackUrl.length() > 0) {
+ getView().getFeedbackLabel().setText(feedbackLinkLabel);
+ registerHandler(getView().getFeedbackLabel().addClickHandler(new
ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ WebUtils.openUrlInNewWindow(feedbackLinkLabel,
feedbackUrl);
+ }
+ }));
+ getView().getFeedbackLabel().setVisible(true);
+ }
}
@Override
diff --git a/packaging/branding/ovirt.brand/messages.properties
b/packaging/branding/ovirt.brand/messages.properties
index bed457c..52c0c97 100644
--- a/packaging/branding/ovirt.brand/messages.properties
+++ b/packaging/branding/ovirt.brand/messages.properties
@@ -32,7 +32,7 @@
obrand.webadmin.main_header_label=
# Feedback URL
obrand.webadmin.feedback_url=mailto:us...@ovirt.org
-obrand.webadmin.feedback_message=Feedback
+obrand.webadmin.feedback_link_label=Feedback
# Guide URL
obrand.webadmin.guide_url=http://www.ovirt.org/Documentation
obrand.webadmin.guide_link_label=Guide
diff --git a/packaging/branding/ovirt.brand/messages_de_DE.properties
b/packaging/branding/ovirt.brand/messages_de_DE.properties
index ec29b64..7dc26fe 100644
--- a/packaging/branding/ovirt.brand/messages_de_DE.properties
+++ b/packaging/branding/ovirt.brand/messages_de_DE.properties
@@ -10,7 +10,7 @@
obrand.webadmin.doc=ENGINE Web Administration Dokumentation
obrand.webadmin.main_header_label=\
obrand.webadmin.feedback_url=mailto\:us...@ovirt.org
-obrand.webadmin.feedback_message=Feedback
+obrand.webadmin.feedback_link_label=Feedback
obrand.welcome.header.main=\
obrand.welcome.welcome.text=Willkommen im Virtualization-Manager
obrand.welcome.version=Version {0}
diff --git a/packaging/branding/ovirt.brand/messages_es_ES.properties
b/packaging/branding/ovirt.brand/messages_es_ES.properties
index 36f0fe9..60ffc3a 100644
--- a/packaging/branding/ovirt.brand/messages_es_ES.properties
+++ b/packaging/branding/ovirt.brand/messages_es_ES.properties
@@ -16,7 +16,7 @@
obrand.webadmin.doc=Documentaci\u00F3n de administraci\u00F3n de la red ENGINE
obrand.webadmin.feedback_url=mailto\:us...@ovirt.org
# auto translated by TM merge from project: oVirt, version: master, DocId:
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.webadmin.ApplicationConstants
-obrand.webadmin.feedback_message=Comentarios
+obrand.webadmin.feedback_link_label=Comentarios
obrand.welcome.welcome.text=Bienvenido al gestor de virtualizaci\u00F3n abierto
obrand.welcome.version=Versi\u00F3n {0}
obrand.welcome.title=Ovirt-Engine
diff --git a/packaging/branding/ovirt.brand/messages_fr_FR.properties
b/packaging/branding/ovirt.brand/messages_fr_FR.properties
index 7e82c24..dcf1f27 100644
--- a/packaging/branding/ovirt.brand/messages_fr_FR.properties
+++ b/packaging/branding/ovirt.brand/messages_fr_FR.properties
@@ -13,7 +13,7 @@
obrand.webadmin.doc=ENGINE Web Admin Documentation
obrand.webadmin.feedback_url=mailto\:us...@ovirt.org
# auto translated by TM merge from project: oVirt, version: master, DocId:
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.webadmin.ApplicationConstants
-obrand.webadmin.feedback_message=Commentaire
+obrand.webadmin.feedback_link_label=Commentaire
obrand.welcome.welcome.text=Bienvenue dans Open Virtualization Manager.
obrand.welcome.version=Version {0}
obrand.welcome.title=Ovirt-Engine
diff --git a/packaging/branding/ovirt.brand/messages_ja_JP.properties
b/packaging/branding/ovirt.brand/messages_ja_JP.properties
index d3675e2..cc4a137 100644
--- a/packaging/branding/ovirt.brand/messages_ja_JP.properties
+++ b/packaging/branding/ovirt.brand/messages_ja_JP.properties
@@ -8,7 +8,7 @@
obrand.webadmin.application_title=oVirt Engine Web \u7BA1\u7406
obrand.webadmin.doc=Engine Web
\u7BA1\u7406\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
obrand.webadmin.feedback_url=mailto\:us...@ovirt.org
-obrand.webadmin.feedback_message=\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF
+obrand.webadmin.feedback_link_label=\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF
obrand.welcome.welcome.text=Open Virtualization Manager
\u3078\u3088\u3046\u3053\u305D
obrand.welcome.version=\u30D0\u30FC\u30B8\u30E7\u30F3 {0}
obrand.welcome.title=Ovirt-Engine
diff --git a/packaging/branding/ovirt.brand/messages_pt_BR.properties
b/packaging/branding/ovirt.brand/messages_pt_BR.properties
index 02851af..4c5f840 100644
--- a/packaging/branding/ovirt.brand/messages_pt_BR.properties
+++ b/packaging/branding/ovirt.brand/messages_pt_BR.properties
@@ -8,7 +8,7 @@
obrand.webadmin.application_title=Administra\u00E7\u00E3o da Web do Mecansimo
oVirt
obrand.webadmin.doc=MECANISMO da Documenta\u00E7\u00E3o da
Administra\u00E7\u00E3o da Web
obrand.webadmin.feedback_url=mailto\:us...@ovirt.org
-obrand.webadmin.feedback_message=Opini\u00E3o
+obrand.webadmin.feedback_link_label=Opini\u00E3o
obrand.welcome.welcome.text=Bem-vindo \u00E0 Abrir o Gerenciador de
Virtualiza\u00E7\u00E3o.
obrand.welcome.version=Vers\u00E3o {0}
obrand.welcome.title=Ovirt-Engine
diff --git a/packaging/branding/ovirt.brand/messages_zh_CN.properties
b/packaging/branding/ovirt.brand/messages_zh_CN.properties
index eac3d76..7a241a1 100644
--- a/packaging/branding/ovirt.brand/messages_zh_CN.properties
+++ b/packaging/branding/ovirt.brand/messages_zh_CN.properties
@@ -8,7 +8,7 @@
obrand.webadmin.application_title=oVirt \u5F15\u64CE\u7684 Web \u7BA1\u7406
obrand.webadmin.doc=ENGINE Web \u7BA1\u7406\u7684\u6587\u6863
obrand.webadmin.feedback_url=mailto\:us...@ovirt.org
-obrand.webadmin.feedback_message=\u53CD\u9988
+obrand.webadmin.feedback_link_label=\u53CD\u9988
obrand.welcome.welcome.text=\u6B22\u8FCE\u4F7F\u7528\u5F00\u653E\u5F0F\u865A\u62DF\u5316\u7BA1\u7406\u8005
obrand.welcome.version=\u7248\u672C {0}
obrand.welcome.title=Ovirt-Engine
--
To view, visit http://gerrit.ovirt.org/18154
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0890f86afa235f32da7ebb014a1385349535dfbd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
