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

Commit

Permalink
WIP: update ui with new css
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Nov 28, 2013
1 parent 1eda383 commit d5683e2
Show file tree
Hide file tree
Showing 7 changed files with 349 additions and 361 deletions.
1 change: 0 additions & 1 deletion zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
View file
Expand Up @@ -51,7 +51,6 @@
<div class="new-zanata-base">
<div class="new-zanata">
<ui:include src="../WEB-INF/template/left_menu.xhtml"/>
<ui:include src="../WEB-INF/template/right_menu.xhtml"/>
</div>
</div>

Expand Down
272 changes: 134 additions & 138 deletions zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
View file
Expand Up @@ -8,57 +8,56 @@

<div class="panels--2">
<div class="g--collapsed">
<div class="g__item w--1-2 w--1-2-s panels__panel">
<div class="bg--pop-high">
<div class="panels__panel__header">
<div class="g--tight">
<div class="g__item w--1-2 w--1-2-s">
<h2 class="heading--secondary epsilon">
<i class="i i--language"></i>
#{messages['jsf.Languages']}
</h2>
</div>
<div
class="g__item w--1-2 w--1-2-s txt--align-right txt--s-align-right">
<zanata:sortlist id="languages-language_sorting"
sortAction="#{versionGroupHomeAction.sortLanguageList()}"
render="languages-language_form"
sortingList="#{versionGroupHomeAction.languageSortingList}"/>
</div>
<div class="g__item w--1-2 w--1-2-s panels__panel panel">
<div class="panels__panel__header panel__header">
<div class="bx--table">
<div class="bx--table__cell w--1 w--1-s">
<h2 class="heading--secondary epsilon">
<i class="i i--language"></i>
#{messages['jsf.Languages']}
</h2>
</div>
<div
class="txt--nowrap txt--align-right txt--s-align-right">
<zanata:sortlist id="languages-language_sorting"
sortAction="#{versionGroupHomeAction.sortLanguageList()}"
render="languages-language_form"
sortingList="#{versionGroupHomeAction.languageSortingList}"/>
</div>
</div>
<h:form id="languages-language_form" styleClass="l--push-bottom-0">
<s:fragment
rendered="#{versionGroupHomeAction.getActiveLocales().isEmpty()}">
<div class="l--pad-all-half">
<p class="txt--meta">#{messages['jsf.NoActiveLanguages']}</p>
<s:fragment
rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
<p>
<a href="#settings-languages" class="button--primary"
onclick="updateHashAndGotoUrl(this)">
#{messages['jsf.AddLanguages']}
</a>
</p>
</s:fragment>
</div>
</s:fragment>
</div>
<h:form id="languages-language_form" styleClass="l--push-bottom-0">
<s:fragment
rendered="#{versionGroupHomeAction.getActiveLocales().isEmpty()}">
<div class="l--pad-all-half">
<p class="txt--meta">#{messages['jsf.NoActiveLanguages']}</p>
<s:fragment
rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
<p>
<a href="#settings-languages" class="button--primary"
onclick="updateHashAndGotoUrl(this)">
#{messages['jsf.AddLanguages']}
</a>
</p>
</s:fragment>
</div>
</s:fragment>

<s:fragment
rendered="#{!versionGroupHomeAction.getActiveLocales().isEmpty()}">
<ul class="list--stats" id="languages-language_list">
<ui:repeat
value="#{versionGroupHomeAction.getActiveLocales()}"
var="hLocale">
<li
class="progress-bar__expander panels__panel__item bg--highest--hover">
<a4j:commandLink
action="#{versionGroupHomeAction.setSelectedLocale(hLocale)}"
render="languages-project_list, language-label"
onclick="updateActiveRow(this);toggleColumn('languages_content')"
styleClass="bx--block">
<div class="list__item">
<div class="list__item__info">
<s:fragment
rendered="#{!versionGroupHomeAction.getActiveLocales().isEmpty()}">
<ul class="list--stats" id="languages-language_list">
<ui:repeat
value="#{versionGroupHomeAction.getActiveLocales()}"
var="hLocale">
<li
class="progress-bar__expander panels__panel__item bg--highest--hover">
<a4j:commandLink
action="#{versionGroupHomeAction.setSelectedLocale(hLocale)}"
render="languages-project_list, language-label"
onclick="updateActiveRow(this);toggleColumn('languages_content')"
styleClass="bx--block">
<div class="list__item">
<div class="list__item__info">
<span class="list__title">
${hLocale.retrieveDisplayName()}
<a4j:outputPanel
Expand All @@ -68,9 +67,9 @@
#{versionGroupHomeAction.getMissingVersion(hLocale.localeId).size()}
</a4j:outputPanel>
</span>
</div>
<s:div styleClass="list__item__stats"
rendered="#{versionGroupHomeAction.pageRendered}">
</div>
<s:div styleClass="list__item__stats"
rendered="#{versionGroupHomeAction.pageRendered}">
<span class="stats--small txt--state-neutral">
<span class="stats__figure">
${versionGroupHomeAction.getStatisticFigureForLocale(versionGroupHomeAction.languageSortingList.selectedSortOption, hLocale.localeId)}
Expand All @@ -79,89 +78,87 @@
${versionGroupHomeAction.getStatisticUnit(versionGroupHomeAction.languageSortingList.selectedSortOption)}
</span>
</span>
</s:div>
</div>
</s:div>
</div>

<zanata:statistic
value="${versionGroupHomeAction.getStatisticsForLocale(hLocale.localeId)}"
rendered="#{versionGroupHomeAction.pageRendered}"/>
<zanata:statistic
value="${versionGroupHomeAction.getStatisticsForLocale(hLocale.localeId)}"
rendered="#{versionGroupHomeAction.pageRendered}"/>

<zanata:loader type="large"
rendered="#{!versionGroupHomeAction.pageRendered}"/>
</a4j:commandLink>
</li>
</ui:repeat>
</ul>
</s:fragment>
</h:form>
</div>
<zanata:loader type="large"
rendered="#{!versionGroupHomeAction.pageRendered}"/>
</a4j:commandLink>
</li>
</ui:repeat>
</ul>
</s:fragment>
</h:form>
</div>

<div class="g__item w--1-2 w--1-2-s panels__panel">
<s:div styleClass="bg--pop-higher">
<div class="panels__panel__header">
<div class="g--tight">
<div class="g__item w--1-2 w--1-2-s">
<h2 class="heading--secondary epsilon">
<span class="is-hidden--l-up">
<a href="#"
onclick="removeActiveRows('languages-language_list');toggleColumn('languages_content')"
title="#{messages['Languages']}">
<i class="i i--language"></i>
</a>
<i class="i i--arrow-right"></i>
</span>
<i class="i i--project"></i>
<a4j:outputPanel id="language-label">
#{versionGroupHomeAction.selectedLocale.retrieveDisplayName()}
</a4j:outputPanel>
#{messages['Projects']}
</h2>
</div>
<div
class="g__item w--1-2 w--1-2-s txt--align-right txt--s-align-right">
<zanata:sortlist id="languages-project_sorting"
sortAction="#{versionGroupHomeAction.sortProjectList(versionGroupHomeAction.selectedLocale.localeId)}"
render="languages-project_list"
sortingList="#{versionGroupHomeAction.projectSortingList}"/>
</div>
<div class="g__item w--1-2 w--1-2-s panels__panel panel bg--pop-higher">
<div class="panel__header">
<div class="bx--table">
<div class="is-hidden--l-up bx--table-cell txt--nowrap">
<a href="#" class="l--pad-all-half bx--inline-block"
onclick="removeActiveRows('languages-language_list');toggleColumn('languages_content')"
title="#{messages['Languages']}">
<i class="i--huge i--arrow-left"></i>
</a>
</div>

<div class="bx--table__cell w--1 w--1-s l--pad-all-half d--left">
<h2 class="heading--secondary epsilon">
<i class="i i--project l--push-right-quarter"></i>
<a4j:outputPanel id="language-label">
#{versionGroupHomeAction.selectedLocale.retrieveDisplayName()}
</a4j:outputPanel>
#{messages['Projects']}
</h2>
</div>
<div
class="txt--align-right txt--s-align-right txt--nowrap l--push-right-half">
<zanata:sortlist id="languages-project_sorting"
sortAction="#{versionGroupHomeAction.sortProjectList(versionGroupHomeAction.selectedLocale.localeId)}"
render="languages-project_list"
sortingList="#{versionGroupHomeAction.projectSortingList}"/>
</div>
</div>
<h:form id="languages-project_list" styleClass="l--push-bottom-0">
<s:fragment
rendered="#{versionGroupHomeAction.selectedLocale == null}">
<div class="l--pad-all-half">
<p class="txt--meta">
#{messages['jsf.SelectALanguageFromList']}
</p>
</div>
</s:fragment>
<s:fragment
rendered="#{versionGroupHomeAction.selectedLocale != null and versionGroupHomeAction.getProjectIterations().isEmpty()}">
<div class="l--pad-all-half">
<p class="txt--meta">#{messages['jsf.NoProjectsInGroup']}</p>
</div>
<h:form id="languages-project_list" styleClass="l--push-bottom-0">
<s:fragment
rendered="#{versionGroupHomeAction.selectedLocale == null}">
<div class="l--pad-all-half">
<p class="txt--meta">
#{messages['jsf.SelectALanguageFromList']}
</p>
</div>
</s:fragment>
<s:fragment
rendered="#{versionGroupHomeAction.selectedLocale != null and versionGroupHomeAction.getProjectIterations().isEmpty()}">
<div class="l--pad-all-half">
<p class="txt--meta">#{messages['jsf.NoProjectsInGroup']}</p>

<s:fragment
rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
<p>
<a href="#settings-projects" class="button--primary"
onclick="updateHashAndGotoUrl(this)">
#{messages['jsf.AddProjectVersions']}
</a>
</p>
</s:fragment>
</div>
</s:fragment>
<s:fragment
rendered="#{versionGroupHomeAction.selectedLocale != null and !versionGroupHomeAction.getProjectIterations().isEmpty()}">
<ul class="list--stats">
<ui:repeat
value="#{versionGroupHomeAction.getProjectIterations()}"
var="version">
<li
class="progress-bar__expander panels__panel__item bg--highest--hover">
<div class="list__item">
<div class="list__item__info">
<s:fragment
rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
<p>
<a href="#settings-projects" class="button--primary"
onclick="updateHashAndGotoUrl(this)">
#{messages['jsf.AddProjectVersions']}
</a>
</p>
</s:fragment>
</div>
</s:fragment>
<s:fragment
rendered="#{versionGroupHomeAction.selectedLocale != null and !versionGroupHomeAction.getProjectIterations().isEmpty()}">
<ul class="list--stats">
<ui:repeat
value="#{versionGroupHomeAction.getProjectIterations()}"
var="version">
<li
class="progress-bar__expander panels__panel__item bg--highest--hover">
<div class="list__item">
<div class="list__item__info">
<span class="list__title">
<h:outputLink
value="#{request.contextPath}/webtrans/Application.seam"
Expand Down Expand Up @@ -194,8 +191,8 @@
class="badge--danger">#{messages['jsf.Missing']}</span>
</s:link>
</span>
</div>
<div class="list__item__stats">
</div>
<div class="list__item__stats">
<span class="stats--small">
<span class="stats__figure">
${versionGroupHomeAction.getStatisticFigureForProjectWithLocale(versionGroupHomeAction.projectSortingList.selectedSortOption, versionGroupHomeAction.selectedLocale.localeId, version.id)}
Expand All @@ -204,16 +201,15 @@
${versionGroupHomeAction.getStatisticUnit(versionGroupHomeAction.projectSortingList.selectedSortOption)}
</span>
</span>
</div>
</div>
<zanata:statistic
value="${versionGroupHomeAction.getSelectedLocaleStatistic(version.id)}"/>
</li>
</ui:repeat>
</ul>
</s:fragment>
</h:form>
</s:div>
</div>
<zanata:statistic
value="${versionGroupHomeAction.getSelectedLocaleStatistic(version.id)}"/>
</li>
</ui:repeat>
</ul>
</s:fragment>
</h:form>
</div>
</div>
</div>
Expand Down

0 comments on commit d5683e2

Please sign in to comment.