Initial design of Zanata 2.0: https://bugzilla.redhat.com/show_bug.cg…

…i?id=844819

zanata-war/src/main/resources/messages.properties

@@ -92,7 +92,7 @@ javax.faces.validator.LongRangeValidator.TYPE=value is not of the correct type
 
 javax.faces.validator.NOT_IN_RANGE=value must be between {0} and {1}
 javax.faces.converter.STRING=value could not be converted to a string
-
+jsf.AboutZanata=About Zanata
 jsf.AccountDetails=Account Details
 jsf.AccountEnabled=Account enabled
 jsf.Actions=Actions
@@ -120,6 +120,7 @@ jsf.AreYouSureYouWishToDeleteThisLanguageThisActionCannotBeUndone=Are you sure y
 jsf.AreYouSureYouWishToRemoveThisPersonAsProjectMaintainer=Are you sure you wish to remove this person as project maintainer?
 jsf.AreYouSureYouWishToRemoveThisPersonAsGroupMaintainer=Are you sure you wish to remove this person as group maintainer?
 jsf.AvailableLocales=Disabled Locales
+jsf.Blog=Blog
 jsf.Cancel=Cancel
 jsf.ChangePassword=Change Password
 jsf.ChangeYourGravatar=Change your avatar at gravatar.com
@@ -162,6 +163,7 @@ jsf.Active=Active
 jsf.ActiveVersions=Active versions
 jsf.Delete=Delete
 jsf.Description=Description
+jsf.Documentation=Documentation
 jsf.Disabled=Disable
 jsf.Files=Files
 jsf.DuplicatedRecord=Duplicated record
@@ -242,6 +244,7 @@ jsf.Enabled=Enabled
 jsf.EnabledByDefault=Enabled by default
 jsf.Error=Error
 jsf.ErrorTitle=Current Errors:
+jsf.FAQ=FAQ
 jsf.FedoraUsername=Fedora Username
 jsf.FirstExternalLoginMessage=Please verify the email address below and click Save to validate your email address.
 jsf.ForgotYourPassword=Forgot your password?
@@ -264,7 +267,7 @@ jsf.IAgreeToThe=I agree to the
 jsf.ImportJavaLocales=Import Java Locales
 jsf.InvalidActivationKey=Invalid activation key
 jsf.Version=Version
-
+jsf.IrcHelp=IRC Help
 jsf.iteration.ShowAllLocales.title=Your teams will be <span class='highlighted_datatable_row'>highlighted</span> below.
 jsf.iteration.CopyTrans=Copy Translations
 jsf.iteration.CopyTrans.inProgress=Copy Trans in progress...
@@ -304,7 +307,6 @@ jsf.iteration.files.LocaleId=Locale Id
 jsf.iteration.files.Merge=Merge
 jsf.iteration.files.MergeCheckbox.Title=When checked, updated translations will be written, leaving all others unchaged.
 jsf.iteration.files.NoFiles=No Files Available
-jsf.iteration.files.PanelTitle=Available Files
 jsf.iteration.files.Path=Path
 jsf.iteration.files.ProcessDlgTitle=Processing project files...
 jsf.iteration.files.Statistics=Statistics
@@ -317,6 +319,7 @@ jsf.iteration.stats.Percentage=Percentage
 jsf.JavaLocaleId=Java Locale Id
 jsf.JoinLanguageTeam=Join Language Team
 jsf.JoinedGroups=Joined Groups
+jsf.KnownIssues=Known issues
 jsf.Language=Language
 
 jsf.language.validation.Existing=This language already exists
@@ -453,12 +456,15 @@ jsf.Script=Script
 jsf.SignIn=Sign In
 jsf.SignOut=Sign Out
 jsf.SignUp=Sign Up
+jsf.SiteMap=Site map
 jsf.SizeMembers=#{languageTeamAction.locale.members.size} members
 jsf.Slug=Slug
 jsf.Start=Start
 jsf.Statistics=Statistics
 jsf.Status=Status
 jsf.SubmitRequest=Submit Request
+jsf.Support=Support
+jsf.System=System
 jsf.SupportedLanguageDetails=Supported Language Details
 jsf.TeamMembers=Team Members
 jsf.TermsOfUse=Terms of Use
@@ -481,12 +487,14 @@ jsf.UserManager.delete.constraintViolation.error=This user cannot be removed fro
 jsf.Username=Username
 jsf.UsernameToolTip=The username should be all in lower case.
 jsf.Variant=Variant
+jsf.View=View
 jsf.Open=Open
 jsf.OpenGWTDevMode=Open (GWT DevMode)
 
 jsf.project.search.IncludeObsoleteTooltip=Include Obsolete Projects in Search
 
 jsf.Warning=Warning
+jsf.Wiki=Wiki
 jsf.YouDoNotHavePermissionToAccessThisResource=You do not have permission to access this resource.
 jsf.YourSessionHasTimedOutPleaseTryAgain=Your session has timed out. Please try again.
 jsf.YourCurrentApiKeyIs=Your current API key is

zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

@@ -30,36 +30,60 @@
 							<img src="#{requestContextPath}/images/logo.png" alt="#{messages['jsf.ZanataMainDescription']}" class="logo" />
 						</s:link>
 					</li>
-					<li id="translationCol">
-						<a href="#">
-							<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/easymoblog.png" />Translation
-							<span class="downArrow">∨</span>
+					<li id="projectCol">
+						<s:link id="Projects" view="/project/home.xhtml" propagation="none">
+							<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/kllckety.png" />#{messages['jsf.Projects']}
+						</s:link>
+					</li>
+					<li id="groupCol">
+						<s:link id="version-groups" view="/version-group/home.xhtml" propagation="none">
+							<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/kdf.png" />#{messages['jsf.Groups']}
+						</s:link>
+					</li>
+					<li id="languageCol">
+						<s:link id="Languages" view="/language/home.xhtml" propagation="none">
+							<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/locale.png" />#{messages['jsf.Languages']}
+						</s:link>
+					</li>
+					<li id="systemCol">
+					    <a href="#">
+							#{messages['jsf.System']}<img src="#{request.contextPath}/images/zanata-icon/16x16/chevron-down.png" class="downArrow" />
 						</a>
 						<div class="submenu">
 							<ul>
 								<li>
-									<s:link id="Projects" view="/project/home.xhtml" propagation="none">
-										<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/kllckety.png" />#{messages['jsf.Projects']}
-									</s:link>
-								</li>
-								<li>
-									<s:link id="version-groups" view="/version-group/home.xhtml" propagation="none">
-										<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/kdf.png" />#{messages['jsf.Groups']}
+									<s:link id="help" view="/help/view.xhtml" propagation="none">
+										<img src="#{request.contextPath}/images/crystal_project/_16x16/actions/help.png" />#{messages['jsf.Help']}
 									</s:link>
 								</li>
 								<li>
-									<s:link id="Languages" view="/language/home.xhtml" propagation="none">
-										<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/locale.png" />#{messages['jsf.Languages']}
-									</s:link>
+									<a href="https://bugzilla.redhat.com/enter_bug.cgi?format=guided&amp;product=Zanata" target="_blank" id="reportBug">
+										<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/bug.png" />#{messages['jsf.ReportAProblem']}
+									</a>
 								</li>
+								<s:fragment rendered="#{not identity.loggedIn}">
+									<li>
+									   <s:link id="Register" view="/account/register.xhtml" value="#{messages['jsf.Register']}" propagation="none" rendered="#{applicationConfiguration.internalAuth}"/>
+									   <s:fragment rendered="#{not applicationConfiguration.internalAuth}">
+									       <a href="#{applicationConfiguration.registerPath}">#{messages['jsf.Register']}</a>
+									   </s:fragment>
+									</li>
+								</s:fragment>
+								<s:fragment rendered="#{s:hasRole('admin')}">
+									<li>
+										<s:link id="Administration" view="/admin/home.xhtml" propagation="none">
+											<img src="#{request.contextPath}/images/crystal_project/_16x16/actions/admin_icon.png" />#{messages['jsf.Administration']}
+										</s:link>
+									</li>
+								</s:fragment>
 							</ul>
 						</div>
 					</li>
 					<li id="userCol">
 						<s:fragment rendered="#{identity.loggedIn}">
 							<a href="#"> 
 								<h:graphicImage value="#{gravatarServiceImpl.getUserImageUrl(23)}" height="23" title="http://gravatar.com" class="avatar"/> 
-								<span><h:outputText value="#{identity.username} "/></span><span class="downArrow">∨</span>
+								<span><h:outputText value="#{identity.username} "/></span><img src="#{request.contextPath}/images/zanata-icon/16x16/chevron-down.png" class="downArrow"/>
 							</a>
 							<div class="submenu">
 								<ul>
@@ -77,53 +101,11 @@
 							</div>
 						</s:fragment>
 						<s:fragment rendered="#{not identity.loggedIn}">
-						    <a href="#" class="text">#{messages['jsf.SignIn']}/#{messages['jsf.Register']}<span class="downArrow">∨</span></a>
-
-							<div class="submenu">
-								<ul>
-									<li>
-									   <s:link id="Sign_in" view="/account/sign_in?continue=#{urlUtil.getEncodedLocalUrl(request)}" propagation="none">
-									   		<img src="#{requestContextPath}/images/zanata-icon/16x16/signin.png" alt="#{messages['jsf.ZanataMainDescription']}"/>#{messages['jsf.SignIn']}
-									   </s:link>
-									</li>
-
-									<li>
-									   <s:link id="Register" view="/account/register.xhtml" value="#{messages['jsf.Register']}" propagation="none" rendered="#{applicationConfiguration.internalAuth}"/>
-									   <s:fragment rendered="#{not applicationConfiguration.internalAuth}">
-									       <a href="#{applicationConfiguration.registerPath}">#{messages['jsf.Register']}</a>
-									   </s:fragment>
-									</li>
-								</ul>
-							</div>
+						    <s:link id="Sign_in" view="/account/sign_in?continue=#{urlUtil.getEncodedLocalUrl(request)}" propagation="none">
+						   		<img src="#{requestContextPath}/images/zanata-icon/16x16/signin.png" alt="#{messages['jsf.ZanataMainDescription']}"/>#{messages['jsf.SignIn']}
+						   </s:link>
 						</s:fragment>
 					</li>
-					<li id="menuCol">
-						<a href="#" class="text">&#9660;</a>
-						<div class="submenu">
-							<ul>
-								<li>
-									<s:link id="help" view="/help/view.xhtml" propagation="none">
-										<img src="#{request.contextPath}/images/crystal_project/_16x16/actions/help.png" />#{messages['jsf.Help']}
-									</s:link>
-								</li>
-
-								<li>
-									<a href="https://bugzilla.redhat.com/enter_bug.cgi?format=guided&amp;product=Zanata" target="_blank" id="reportBug">
-										<img src="#{request.contextPath}/images/crystal_project/_16x16/apps/bug.png" />#{messages['jsf.ReportAProblem']}
-									</a>
-								</li>
-
-
-								<s:fragment rendered="#{s:hasRole('admin')}">
-									<li>
-										<s:link id="Administration" view="/admin/home.xhtml" propagation="none">
-											<img src="#{request.contextPath}/images/crystal_project/_16x16/actions/lin_agt_wrench.png" />#{messages['jsf.Administration']}
-										</s:link>
-									</li>
-								</s:fragment>
-							</ul>
-						</div>
-					</li>
 				</ul>
 
 				<div id="loading_top_right">
@@ -169,47 +151,59 @@
 					<div class="content">
 						<ul>
 							<li>
-								<a href="http://zanata.org/">About Zanata</a>
+								<a href="http://zanata.org/">#{messages['jsf.AboutZanata']}</a>
 							</li>
 							<li>
-								<a href="http://zanata.org/documentation.html">Documentation</a>
+								<a href="http://zanata.org/documentation.html">#{messages['jsf.Documentation']}</a>
 							</li>
 							<li>
-								<a href="https://github.com/zanata/zanata/wiki">Zanata Wiki</a>
+								<a href="https://github.com/zanata/zanata/wiki">#{messages['jsf.Wiki']}</a>
 							</li>
 							<li>
-								<a href="http://blog-zanatatm.rhcloud.com/">Blog</a>
+								<a href="http://blog-zanatatm.rhcloud.com/">#{messages['jsf.Blog']}</a>
 							</li>
 						</ul>
 					</div>
 				</div>
 
 				<div class="section_block">
-					<h4>Support</h4>
+					<h4>#{messages['jsf.Support']}</h4>
 					<div class="content">
 						<ul>
 							<li>
 							    <s:link view="/help/view.xhtml" propagation="none">#{messages['jsf.Help']}</s:link>
 							</li>
 							<li>
-								<a href="http://webchat.freenode.net/?channels=zanata">IRC Help</a>
+								<a href="http://webchat.freenode.net/?channels=zanata">#{messages['jsf.IrcHelp']}</a>
 							</li>
 							<li>
-								<a href="http://zanata.org/faq.html">FAQ</a>
+								<a href="http://zanata.org/faq.html">#{messages['jsf.FAQ']}</a>
+							</li>
+							<li>
+								<a href="https://bugzilla.redhat.com/enter_bug.cgi?format=guided&amp;product=Zanata">#{messages['jsf.ReportAProblem']}</a>
+							</li>
+							<li>
+								<a href="https://bugzilla.redhat.com/buglist.cgi?product=Zanata&amp;bug_status=__open__">#{messages['jsf.KnownIssues']}</a>
 							</li>
 						</ul>
 					</div>
 				</div>
 
 				<div class="section_block">
-					<h4>Issues</h4>
+					<h4>#{messages['jsf.SiteMap']}</h4>
 					<div class="content">
 						<ul>
 							<li>
-								<a href="https://bugzilla.redhat.com/enter_bug.cgi?format=guided&amp;product=Zanata">#{messages['jsf.ReportAProblem']}</a>
+							   <s:link id="Projects_sitemap" view="/project/home.xhtml" propagation="none" value="#{messages['jsf.Projects']}"/>
+							</li>
+							<li>
+							   <s:link id="Groups_sitemap" view="/version-group/home.xhtml" propagation="none" value="#{messages['jsf.Groups']}"/>
+							</li>
+							<li>
+							   <s:link id="Languages_sitemap" view="/language/home.xhtml" propagation="none" value="#{messages['jsf.Languages']}"/>
 							</li>
 							<li>
-								<a href="https://bugzilla.redhat.com/buglist.cgi?product=Zanata&amp;bug_status=__open__">Known issues</a>
+							   <s:link id="Help_sitemap" view="/help/view.xhtml" propagation="none" value="#{messages['jsf.Help']}"/>
 							</li>
 						</ul>
 					</div>