Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Rename element id to be consistance with new text
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Aug 1, 2013
1 parent ce20b1e commit 75b0116
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 21 deletions.
6 changes: 3 additions & 3 deletions functional-test/src/main/java/org/zanata/page/BasePage.java
View file
Expand Up @@ -66,13 +66,13 @@ public class BasePage extends AbstractPage
@FindBy(id = "nav-main")
WebElement navBar;

@FindBy(id = "banner_projects_link")
@FindBy(id = "projects_link")
private WebElement projectsLink;

@FindBy(id = "banner_version-groups_link")
@FindBy(id = "version-groups_link")
private WebElement groupsLink;

@FindBy(id = "banner_languages_link")
@FindBy(id = "languages_link")
private WebElement languagesLink;

@FindBy(id = "user_avatar")
Expand Down
3 changes: 2 additions & 1 deletion zanata-war/src/main/resources/messages.properties
View file
Expand Up @@ -70,11 +70,12 @@ jsf.KnownIssues=Known issues
jsf.Glossary=Glossary
jsf.Administration=Administration
jsf.Register=Register
jsf.SignIn=Sign In
jsf.Logout=Logout
jsf.MyProfile=My Profile
jsf.Login=Login
jsf.Signup=Sign up
jsf.Menu=Menu
jsf.Account=Account

#--- Project search (all pages) ---
jsf.SearchProjects=Search Projects
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/resources/messages_ja.properties
View file
Expand Up @@ -69,7 +69,7 @@ jsf.Glossary=\u7528\u8A9E\u96C6
jsf.Administration=\u7BA1\u7406
# translation auto-copied from project Subscription Manager, version 1.8.X, document keys
jsf.Register=\u767B\u9332
jsf.SignIn=\u30B5\u30A4\u30F3\u30A4\u30F3
jsf.Login=\u30B5\u30A4\u30F3\u30A4\u30F3
# translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.webadmin.ApplicationConstants, author nnakakit
jsf.Logout=\u30B5\u30A4\u30F3\u30A2\u30A6\u30C8
jsf.MyProfile=\u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/resources/messages_uk.properties
View file
Expand Up @@ -86,7 +86,7 @@ jsf.Administration=\u0410\u0434\u043C\u0456\u043D\u0456\u0441\u0442\u0440\u0430\
# translation auto-copied from project Zanata, version jsf-pages, document main/resources/messages, author Maks
jsf.Register=\u0420\u0435\u0454\u0441\u0442\u0440\u0430\u0446\u0456\u044F
# translation auto-copied from project Zanata, version jsf-pages, document main/resources/messages, author Maks
jsf.SignIn=\u0412\u0445\u0456\u0434
jsf.Login=\u0412\u0445\u0456\u0434
# translation auto-copied from project Zanata, version jsf-pages, document main/resources/messages, author Maks
jsf.Logout=\u0412\u0438\u0445\u0456\u0434
jsf.MyProfile=\u041C\u0456\u0439 \u043F\u0440\u043E\u0444\u0456\u043B\u044C
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/resources/messages_zh_TW_Hant.properties
View file
Expand Up @@ -66,7 +66,7 @@ jsf.Glossary=\u5C0F\u8FAD\u5F59
jsf.Administration=\u7BA1\u7406
# translation auto-copied from project Subscription Manager, version 1.8.X, document keys
jsf.Register=\u8A3B\u518A
jsf.SignIn=\u767B\u5165
jsf.Login=\u767B\u5165
jsf.Logout=\u767B\u51FA
jsf.MyProfile=\u6211\u7684\u8A2D\u5B9A\u6A94
jsf.SearchProjects=\u641C\u5C0B\u5C08\u6848
Expand Down
4 changes: 2 additions & 2 deletions zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
View file
Expand Up @@ -20,7 +20,7 @@

<s:token allowMultiplePosts="true" />
<rich:panel rendered="#{not identity.loggedIn and not applicationConfiguration.kerberosAuth}">
<f:facet name="header" class="loginForm_header">#{messages['jsf.SignIn']}</f:facet>
<f:facet name="header" class="loginForm_header">#{messages['jsf.Login']}</f:facet>

<s:decorate id="usernameField" template="edit.xhtml" rendered="#{!applicationConfiguration.openIdAuth}">
<ui:define name="label"><span class="loginForm_label">#{messages['jsf.Username']}</span></ui:define>
Expand Down Expand Up @@ -50,7 +50,7 @@
</s:decorate>
<div style="clear:both"/>
<div class="actionButtons">
<h:commandButton id="Sign_in" value="#{messages['jsf.SignIn']}" action="#{loginAction.login}"
<h:commandButton id="Sign_in" value="#{messages['jsf.Login']}" action="#{loginAction.login}"
style="#{applicationConfiguration.openIdAuth ? 'display:none' : ''}"/>
</div>
</rich:panel>
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/webapp/WEB-INF/pages.xml
View file
Expand Up @@ -95,7 +95,7 @@
<header name="Cache-Control" value="no-cache, no-store, max-age=0, must-revalidate" />
<param name="continue" value="#{userRedirect.encodedUrl}" />
<action execute="#{breadcrumbs.clear}"/>
<action execute="#{breadcrumbs.addLocation('', messages['jsf.SignIn'])}"/>
<action execute="#{breadcrumbs.addLocation('', messages['jsf.Login'])}"/>
<navigation from-action="#{loginAction.login}">
<rule if="#{authenticationManager.authenticated and authenticationManager.newUser}">
<redirect view-id="/profile/edit.xhtml" />
Expand Down
14 changes: 7 additions & 7 deletions zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
View file
Expand Up @@ -9,7 +9,7 @@

<a href="#off-canvas--left" class="off-canvas__toggle--left is-hidden--m-up l--float-left">
<i class="i i--large i--list"></i>
<span class="is-invisible">Menu</span>
<span class="is-invisible">#{messages['jsf.Menu']}</span>
</a>

<h1 class="header__title heading--sub">
Expand All @@ -23,7 +23,7 @@
<a href="#off-canvas--right" id="user_avatar" class="off-canvas__toggle--right l--float-right badge__container" title="#{personHome.instance.account.username}">
<span class="badge--bl"><!-- This is for notification count --></span>
<img src="#{gravatarServiceImpl.getUserImageUrl(72)}" alt="#{personHome.instance.name}"/>
<span class="is-invisible">Account</span>
<span class="is-invisible">#{messages['jsf.Account']}</span>
</a>
</s:fragment>
<s:fragment rendered="#{not identity.loggedIn}">
Expand All @@ -49,21 +49,21 @@
<nav id="nav-main" class="header__menu is-hidden--s l--push-left-half">
<ul class="list--horizontal">
<li class="l--push-left-half">
<s:link id="banner_projects_link" view="/project/home.xhtml" propagation="none">#{messages['jsf.Projects']}</s:link>
<s:link id="projects_link" view="/project/home.xhtml" propagation="none">#{messages['jsf.Projects']}</s:link>
</li>
<li class="l--push-left-half">
<s:link id="banner_version-groups_link" view="/version-group/home.xhtml" propagation="none">#{messages['jsf.Groups']}</s:link>
<s:link id="version-groups_link" view="/version-group/home.xhtml" propagation="none">#{messages['jsf.Groups']}</s:link>
</li>
<li class="l--push-left-half">
<s:link id="banner_languages_link" view="/language/home.xhtml" propagation="none">#{messages['jsf.Languages']}</s:link>
<s:link id="languages_link" view="/language/home.xhtml" propagation="none">#{messages['jsf.Languages']}</s:link>
</li>
<s:fragment rendered="#{identity.loggedIn}">
<li class="l--push-left-half">
<s:link id="banner_glossary_link" view="/glossary/view.xhtml" propagation="none">#{messages['jsf.Glossary']}</s:link>
<s:link id="glossary_link" view="/glossary/view.xhtml" propagation="none">#{messages['jsf.Glossary']}</s:link>
</li>
</s:fragment>

<li class="l--push-left-half"><s:link id="banner_help_link" view="/help/view.xhtml" propagation="none">#{messages['jsf.Help']}</s:link></li>
<li class="l--push-left-half"><s:link id="help_link" view="/help/view.xhtml" propagation="none">#{messages['jsf.Help']}</s:link></li>
</ul>
</nav>
</header>
4 changes: 2 additions & 2 deletions zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
View file
Expand Up @@ -106,11 +106,11 @@
<s:fragment rendered="#{not identity.loggedIn}">
<h:outputLink id="Sign_in" value="#{request.contextPath}/account/sign_in?continue=#{urlUtil.getEncodedLocalUrl(request)}" propagation="none"
rendered="#{not applicationConfiguration.kerberosAuth}">
<span class="icon-login"/>#{messages['jsf.SignIn']}
<span class="icon-login"/>#{messages['jsf.Login']}
</h:outputLink>
<h:outputLink id="kSign_in" value="#{request.contextPath}/account/klogin.seam?continue=#{urlUtil.getEncodedLocalUrl(request)}" propagation="none"
rendered="#{applicationConfiguration.kerberosAuth}">
<span class="icon-login"/>#{messages['jsf.SignIn']}
<span class="icon-login"/>#{messages['jsf.Login']}
</h:outputLink>
</s:fragment>
</li>
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/webapp/account/login.xhtml
View file
Expand Up @@ -8,7 +8,7 @@
xmlns:rich="http://richfaces.org/rich"
template="../WEB-INF/template/template_2x.xhtml">

<ui:define name="page_title">#{messages['jsf.SignIn']}</ui:define>
<ui:define name="page_title">#{messages['jsf.Login']}</ui:define>
<ui:define name="center_content">
</ui:define>
</ui:composition>
2 changes: 1 addition & 1 deletion zanata-war/src/main/webapp/account/login_input.xhtml
View file
Expand Up @@ -8,7 +8,7 @@
xmlns:rich="http://richfaces.org/rich"
template="../WEB-INF/template/template_2x.xhtml">

<ui:define name="page_title">#{messages['jsf.SignIn']}</ui:define>
<ui:define name="page_title">#{messages['jsf.Login']}</ui:define>
<ui:define name="center_content">
<ui:include src="../WEB-INF/layout/login_form.xhtml"/>
</ui:define>
Expand Down

0 comments on commit 75b0116

Please sign in to comment.