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: redesign zanata:
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex-sl-eng
Alex Eng authored and alex-sl-eng committed Aug 2, 2012
1 parent b397a3f commit 709cf95
Show file tree
Hide file tree
Showing 10 changed files with 248 additions and 313 deletions.
12 changes: 11 additions & 1 deletion zanata-war/etc/gui-preview/template.xhtml
View file
Expand Up @@ -118,7 +118,9 @@

<div id="container">
<div id="bd">
<ui:include src="search_panel.xhtml" />
<div id="submenu">
<ui:include src="search_panel.xhtml" />
</div>
<div id="yui-main">
<div class="yui-b">
<a:outputPanel ajaxRendered="true">
Expand Down Expand Up @@ -161,6 +163,14 @@
</script><script type="text/javascript">
try {
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", #{applicationConfiguration.piwikIdSite});
var username = "#{identity.username}";
if(#{identity.loggedIn} == false)
{
username = "anonymous";
}
piwikTracker.setCustomVariable (1, "Visit", username, "visit" );
piwikTracker.setCustomVariable (2, "View page", username, "page" );

piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
Expand Down
Binary file added ...ar/src/main/resources/images/crystal_project/_16x16/actions/agt_action_fail.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/_16x16/actions/lock.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
View file
Expand Up @@ -11,7 +11,7 @@
<h:selectBooleanCheckbox id="inc_obs" value="#{projectSearch.includeObsolete}" rendered="#{s:hasPermission('HProject', 'view-obsolete')}"
title="#{messages['jsf.project.search.IncludeObsoleteTooltip']}"/>
<h:inputText id="q" styleClass="with_icon search_icon" value="#{projectSearch.searchQuery}"/>
<h:commandButton value="#{messages['jsf.SearchProjects']}" action="#{projectSearch.search}"/>
<h:commandButton value="#{messages['jsf.SearchProjects']}" action="#{projectSearch.search}" styleClass="projectSearchButton"/>
</h:form>

</div>
162 changes: 101 additions & 61 deletions zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
View file
Expand Up @@ -17,48 +17,94 @@
href="#{request.contextPath}/images/favicon.ico" type="image/x-icon" />
<a:loadStyle src="/stylesheet/base.css" />
<a:loadStyle src="/stylesheet/zanata.css" />
<a:loadStyle src="/stylesheet/2.0.css" />
<ui:insert name="head" />
</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/_16x16/apps/easymoblog.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" class="avatar"/>
<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,18 +113,14 @@
</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="submenu">
<ui:include src="search_panel.xhtml" />
</div>
<div id="yui-main">
<div class="yui-b">
<a:outputPanel ajaxRendered="true">
Expand All @@ -95,26 +137,25 @@
<ui:insert name="left_content" />
</div>
</div>
</div>

<div class="footer">
<div>
#{messages['jsf.Copyright']} #{messages['jsf.CopyrightYearInfo']}
<a href="http://www.redhat.com/">#{messages['jsf.ManufacturerInfo']}</a> #{messages['jsf.AndOthers']}.
#{messages['jsf.PoweredBy']} <a href="http://zanata.org/">#{messages['jsf.Zanata']}</a>.
<br/>#{messages['jsf.RunningVersionInfo']}
</div>

<div id="ft">
<div id="footer">
<div id="footer-text">
#{messages['jsf.Copyright']} #{messages['jsf.CopyrightYearInfo']}
<a href="http://www.redhat.com/">#{messages['jsf.ManufacturerInfo']}</a> #{messages['jsf.AndOthers']}.
#{messages['jsf.PoweredBy']} <a href="http://zanata.org/">#{messages['jsf.Zanata']}</a>.
<br/>#{messages['jsf.RunningVersionInfo']}
</div>
<div id="localeSelector">
<div id="localeSelector">
<h:form id="localeSelector_form">
<h:selectOneMenu id="Select"
value="#{localeSelector.localeString}" valueChangeListener="#{localeSelector.select}" onchange="submit()" >
<f:selectItems value="#{localeSelector.supportedLocales}"/>
</h:selectOneMenu>
</h:form>
</div>
</div>
</div>
</div>
<s:fragment rendered="#{not empty applicationConfiguration.piwikUrl and not empty applicationConfiguration.piwikIdSite}">
<!-- Piwik --> <script type="text/javascript">
var pkBaseURL = (("https:" == document.location.protocol) ? "https://#{applicationConfiguration.piwikUrl}/" : "http://#{applicationConfiguration.piwikUrl}/");
Expand All @@ -138,5 +179,4 @@
</s:fragment>
</body>
</html>
</f:view>

</f:view>
147 changes: 61 additions & 86 deletions zanata-war/src/main/webapp/project/project.xhtml
View file
Expand Up @@ -35,92 +35,67 @@
<s:formattedText id="project-home-content" value="#{projectHome.instance.homeContent}"/>
<s:formattedText value="#{projectHome.instance.description}" rendered="#{empty projectHome.instance.homeContent}"/>

<s:fragment rendered="#{projectHome.activeIterations.size > 0}">
<div class="iterations">
<rich:tabPanel switchType="client">
<rich:tab label="#{messages['jsf.ActiveVersions']}" styleClass="version_header">
<rich:dataGrid id="activeIterations" columns="5"
value="#{projectHome.activeIterations}"
var="_iteration"
columnClasses="iteration_grid_col"
styleClass="noBorderTable">
<s:link view="/iteration/view.xhtml" styleClass="version_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
<div class="version_link_div">
<div class="version_title">
<h:outputText value="#{_iteration.slug}"/>
</div>
<div class="version_info">
Documents: #{_iteration.documents.size()}
</div>
</div>
</s:link>
</rich:dataGrid>
</rich:tab>
</rich:tabPanel>

</div>
</s:fragment>

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

<s:fragment rendered="#{projectHome.readOnlyIterations.size > 0}">
<div class="iterations">
<rich:tabPanel switchType="client">
<rich:tab label="#{messages['jsf.ReadOnlyVersions']}" styleClass="version_header">
<rich:dataGrid id="readOnlyIterations" columns="5"
value="#{projectHome.readOnlyIterations}"
var="_iteration"
columnClasses="iteration_grid_col"
styleClass="noBorderTable">
<s:link view="/iteration/view.xhtml" styleClass="version_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
<div class="version_link_div">
<div class="version_title">
<h:outputText value="#{_iteration.slug}"/>
</div>
<div class="version_info">
Documents: #{_iteration.documents.size()}
</div>
</div>
</s:link>
</rich:dataGrid>
</rich:tab>
</rich:tabPanel>
</div>
</s:fragment>

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

<s:fragment rendered="#{projectHome.obsoleteIterations.size > 0 and s:hasPermission('HProjectIteration','view-obsolete')}">
<div class="iterations">
<rich:tabPanel switchType="client">
<rich:tab label="#{messages['jsf.ObsoleteVersions']}" styleClass="version_header">
<rich:dataGrid id="obsoleteIterations" columns="5"
value="#{projectHome.obsoleteIterations}"
var="_iteration"
columnClasses="iteration_grid_col"
styleClass="noBorderTable">
<s:link view="/iteration/view.xhtml" styleClass="version_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
<div class="version_link_div">
<div class="version_title">
<h:outputText value="#{_iteration.slug}"/>
</div>
<div class="version_info">
Documents: #{_iteration.documents.size()}
</div>
</div>
</s:link>
</rich:dataGrid>
</rich:tab>
</rich:tabPanel>
</div>
</s:fragment>

<div class="iterations">
<rich:dataGrid id="activeIterations" columns="5"
value="#{projectHome.activeIterations}"
var="_iteration"
columnClasses="iteration_grid_col">
<s:link view="/iteration/view.xhtml" styleClass="version_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
<div class="version_link_div">
<div class="version_title">
<h:outputText value="#{_iteration.slug}"/>
</div>
<div class="version_info">
Documents: #{_iteration.documents.size()}
</div>
</div>
</s:link>
</rich:dataGrid>

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

<rich:dataGrid id="readOnlyIterations" columns="5"
value="#{projectHome.readOnlyIterations}"
var="_iteration"
columnClasses="iteration_grid_col">
<s:link view="/iteration/view.xhtml" styleClass="version_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
<div class="version_link_div">
<div class="version_title">
<h:outputText value="#{_iteration.slug}"/>
</div>
<img src="#{request.contextPath}/images/crystal_project/_16x16/actions/lock.png" alt="#{messages['jsf.ReadOnlyVersions']}" title="#{messages['jsf.ReadOnlyVersions']}"/>
<div class="version_info">
Documents: #{_iteration.documents.size()}
</div>
</div>
</s:link>
</rich:dataGrid>

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

<rich:dataGrid id="obsoleteIterations" columns="5"
value="#{projectHome.obsoleteIterations}"
var="_iteration"
columnClasses="iteration_grid_col">
<s:link view="/iteration/view.xhtml" styleClass="version_link">
<f:param name="projectSlug" value="#{projectHome.instance.slug}"/>
<f:param name="iterationSlug" value="#{_iteration.slug}"/>
<div class="version_link_div">
<div class="version_title">
<h:outputText value="#{_iteration.slug}"/>
</div>
<img src="#{request.contextPath}/images/crystal_project/_16x16/actions/agt_action_fail.png" alt="#{messages['jsf.ObsoleteVersions']}" title="#{messages['jsf.ObsoleteVersions']}"/>
<div class="version_info">
Documents: #{_iteration.documents.size()}
</div>
</div>
</s:link>
</rich:dataGrid>
</div>
</s:decorate>
</ui:define>

Expand Down

0 comments on commit 709cf95

Please sign in to comment.