Greg Sheremeta has uploaded a new change for review. Change subject: userportal, webadmin: added IDs to locale boxes, welcome page links ......................................................................
userportal, webadmin: added IDs to locale boxes, welcome page links Added element IDs to some elements to help with Selenium tests: * locale drop-down in welcome page * locale drop-down in UserPortal & WebAdmin login screen * all links in welcome page template Change-Id: Ic456286d03a906d3cc8c224050504a0f4e4b2d6c Signed-off-by: Greg Sheremeta <[email protected]> --- M backend/manager/modules/welcome/src/main/webapp/WEB-INF/ovirt-engine.jsp M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java M packaging/branding/ovirt.brand/welcome_page.template 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/28333/1 diff --git a/backend/manager/modules/welcome/src/main/webapp/WEB-INF/ovirt-engine.jsp b/backend/manager/modules/welcome/src/main/webapp/WEB-INF/ovirt-engine.jsp index 04e6508..4ccd1b3 100644 --- a/backend/manager/modules/welcome/src/main/webapp/WEB-INF/ovirt-engine.jsp +++ b/backend/manager/modules/welcome/src/main/webapp/WEB-INF/ovirt-engine.jsp @@ -51,7 +51,7 @@ <div style="clear: both;"></div> <div class="col-sm-12 locale-div"> - <select class="gwt-ListBox obrand_locale_list_box" onchange="localeSelected(this)"> + <select class="gwt-ListBox obrand_locale_list_box" onchange="localeSelected(this)" id="OvirtEngineJSP_localeBox"> <c:forEach items="${requestScope['localeKeys']}" var="localeKey"> <c:choose> <c:when test="${requestScope['locale'].toString() == localeKey}"> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java index 59ed186..ba77f5a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/AbstractLoginFormView.java @@ -108,6 +108,7 @@ private void initLocalizationEditor() { localeBox = new ListBox(); + localeBox.getElement().setId("AbstractLoginFormView_localeBox"); //$NON-NLS-1$ // Add the option to change the locale String currentLocale = LocaleInfo.getCurrentLocale().getLocaleName(); diff --git a/packaging/branding/ovirt.brand/welcome_page.template b/packaging/branding/ovirt.brand/welcome_page.template index 56671a1..1b69764 100644 --- a/packaging/branding/ovirt.brand/welcome_page.template +++ b/packaging/branding/ovirt.brand/welcome_page.template @@ -1,11 +1,11 @@ <div class="col-sm-7 col-md-6 col-lg-5 login"> <div class="welcome-section-title">{portal_title}</div> - <div class="welcome-link"><a href="userportal/?locale={userLocale}">{portal_user_portal}</a></div> - <div class="welcome-link"><a href="webadmin/?locale={userLocale}">{portal_admin}</a></div> - <div class="welcome-link"><a href="services/reports-redirect">{portal_reports}</a></div> + <div class="welcome-link"><a id="WelcomePage_userportal" href="userportal/?locale={userLocale}">{portal_user_portal}</a></div> + <div class="welcome-link"><a id="WelcomePage_webadmin" href="webadmin/?locale={userLocale}">{portal_admin}</a></div> + <div class="welcome-link"><a id="WelcomePage_reports" href="services/reports-redirect">{portal_reports}</a></div> </div> <div class="col-sm-5 col-md-6 col-lg-7 details"> <div class="welcome-section-title"><span class="">{downloads_title}</div> - <div class="welcome-link"><a href="{console_client_resources_url}" target="_blank">{console_client_resources}</a></div> + <div class="welcome-link"><a id="WelcomePage_ccr" href="{console_client_resources_url}" target="_blank">{console_client_resources}</a></div> </div> -- To view, visit http://gerrit.ovirt.org/28333 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic456286d03a906d3cc8c224050504a0f4e4b2d6c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
