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

Commit

Permalink
work in progress: Integrate new top menu into jsf
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex-sl-eng
alex-sl-eng committed Jun 8, 2012
1 parent 615c175 commit d715209
Show file tree
Hide file tree
Showing 6 changed files with 247 additions and 134 deletions.
Binary file added zanata-war/etc/gui-preview/logo2.xcf
View file
Binary file not shown.
Binary file added zanata-war/src/main/resources/images/crystal_project/_16x16/actions/kuser.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zanata-war/src/main/resources/images/crystal_project/_32x32/apps/kwrite.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added zanata-war/src/main/resources/images/logo2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
133 changes: 86 additions & 47 deletions zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
View file
Expand Up @@ -21,44 +21,89 @@
</head>

<body>

<div id="container">
<div id="banner">
<div id="headerlogo">
<s:link view="/home.xhtml" propagation="none">
<img src="#{requestContextPath}/images/logo.png" alt="#{messages['jsf.ZanataMainDescription']}" />
</s:link>
</div>
<div id="header_top_right">
<s:fragment rendered="#{identity.loggedIn}">

<h:outputText value="#{identity.username} " />

<rich:spacer width="10px" />

<s:link id="Sign_out" view="/account/sign_out" value="#{messages['jsf.SignOut']}" propagation="none" />
</s:fragment>

<s:fragment rendered="#{not identity.loggedIn}">
<s:link id="Sign_in" view="/account/sign_in?continue=#{urlUtil.getEncodedLocalUrl(request)}" value="#{messages['jsf.SignIn']}" propagation="none" />

<rich:spacer width="10px" />

<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>
</s:fragment>


</div>

<a href="http://gravatar.com" target="_blank" id="UserImgLink">
<h:graphicImage value="#{gravatarServiceImpl.getUserImageUrl(35)}" height="35" rendered="#{identity.loggedIn}"
styleClass="user_img"/>
</a>
<rich:toolTip value="#{messages['jsf.ChangeYourGravatar']}" for="UserImgLink" direction="bottom-left"/>
<div class="header">
<div class="navBar">
<ul>
<li id="logoCol">
<s:link view="/home.xhtml" propagation="none">
<img src="#{requestContextPath}/images/logo2.png" alt="#{messages['jsf.ZanataMainDescription']}" class="logo" />
</s:link>
</li>
<li id="translationCol">
<a href="#">
<img src="#{request.contextPath}/images/crystal_project/_32x32/apps/kwrite.png" />Translation</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>
</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>
</li>
</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"/>
<span><h:outputText value="#{identity.username} " /></span>
</a>
<div class="submenu">
<ul>
<li>
<s:link id="MyProfile" view="/profile/view.xhtml" propagation="none">
<img src="#{request.contextPath}/images/crystal_project/_16x16/actions/kuser.png" />#{messages['jsf.MyProfile']}
</s:link>
</li>
<li>
<s:link id="Sign_out" view="/account/sign_out" value="#{messages['jsf.SignOut']}" propagation="none" />
</li>
</ul>
</div>
</s:fragment>
<s:fragment rendered="#{not identity.loggedIn}">
<s:link id="Sign_in" view="/account/sign_in?continue=#{urlUtil.getEncodedLocalUrl(request)}" value="#{messages['jsf.SignIn']}" propagation="none" />
</s:fragment>
</li>
<li id="menuCol">
<a href="#" class="text">&#9660;</a>
<div class="submenu">
<ul>
<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>

<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>
<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">
<a:status>
Expand All @@ -67,16 +112,10 @@
</f:facet>
</a:status>
</div>

</div>

<div id="tabs-menu">
<ui:include src="menu.xhtml">
<ui:param name="projectName" value="zanata" />
</ui:include>
</div>


</div>

<div id="container">
<div id="bd">
<ui:include src="search_panel.xhtml" />
<div id="yui-main">
Expand Down

0 comments on commit d715209

Please sign in to comment.