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

Commit

Permalink
Merge pull request #422 from zanata/groups-update-markup
Browse files Browse the repository at this point in the history 
Update group's page markup in languages column
  • Loading branch information
@definite
definite committed Apr 23, 2014
2 parents 16b5673 + 94c4533 commit dc651fa
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 46 deletions.
7 changes: 4 additions & 3 deletions zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
View file
Expand Up @@ -80,7 +80,7 @@
<ui:repeat
value="#{versionGroupHomeAction.languageTabLanguageFilter.pagedFilteredList}"
var="hLocale">
<li class="progress-bar__expander">
<li class="progress-bar__expander panels__panel__item">
<a4j:commandLink
oncomplete="zanata.loader.deactivate('#languagesTab-language-label-loader')"
action="#{versionGroupHomeAction.setSelectedLocale(hLocale)}"
Expand All @@ -91,14 +91,15 @@
styleClass="bx--block #{hLocale.localeId}">
<div class="list__item">
<div class="list__item__info">
<span class="list__title">
<h3 class="list__title">
#{hLocale.retrieveDisplayName()}
<s:span styleClass="badge--danger"
rendered="#{!versionGroupHomeAction.getMissingVersion(hLocale.localeId).isEmpty()}"
title="#{versionGroupHomeAction.getMissingVersionTitle(hLocale.localeId)}">
#{versionGroupHomeAction.getMissingVersion(hLocale.localeId).size()}
</s:span>
</span>
</h3>
<span class="list__item__meta">#{hLocale.localeId}</span>
</div>
<div class="list__item__stats">
<a4j:status name="statistic-loader">
Expand Down
94 changes: 56 additions & 38 deletions zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
View file
Expand Up @@ -220,50 +220,68 @@
<ui:repeat
value="#{versionGroupHomeAction.projectTabLanguageFilter.pagedFilteredList}"
var="hLocale">
<li class="progress-bar__expander">
<div class="list__item">
<div class="list__item__info">
<span class="list__title">
<h:outputLink
value="#{request.contextPath}/webtrans/Application.seam"
rendered="#{versionGroupHomeAction.isLocaleActivatedInVersion(versionGroupHomeAction.selectedVersion, hLocale.localeId)}">
<f:param name="project"
value="#{versionGroupHomeAction.selectedVersion.project.slug}"/>
<f:param name="iteration"
value="#{versionGroupHomeAction.selectedVersion.slug}"/>
<f:param name="localeId" value="#{hLocale.localeId}"/>
<f:param name="locale" value="#{locale.language}"/>
#{hLocale.retrieveDisplayName()}
</h:outputLink>

<s:fragment
rendered="#{!versionGroupHomeAction.isLocaleActivatedInVersion(versionGroupHomeAction.selectedVersion, hLocale.localeId)}">
#{hLocale.retrieveDisplayName()}
</s:fragment>
<li class="progress-bar__expander panels__panel__item">
<h:outputLink
value="#{request.contextPath}/webtrans/Application.seam"
rendered="#{versionGroupHomeAction.isLocaleActivatedInVersion(versionGroupHomeAction.selectedVersion, hLocale.localeId)}">
<f:param name="project"
value="#{versionGroupHomeAction.selectedVersion.project.slug}"/>
<f:param name="iteration"
value="#{versionGroupHomeAction.selectedVersion.slug}"/>
<f:param name="localeId" value="#{hLocale.localeId}"/>
<f:param name="locale" value="#{locale.language}"/>

<s:link view="/iteration/view.xhtml"
rendered="#{!versionGroupHomeAction.isLocaleActivatedInVersion(versionGroupHomeAction.selectedVersion, hLocale.localeId)}">
<f:param name="projectSlug"
value="#{versionGroupHomeAction.selectedVersion.project.slug}"/>
<f:param name="iterationSlug"
value="#{versionGroupHomeAction.selectedVersion.slug}"/>
<span
class="label--danger">#{messages['jsf.Missing']}</span>
</s:link>

</span>
</div>
<div class="list__item__stats">
<ui:param name="displayUnit"
value="#{versionGroupHomeAction.getStatisticFigureForProjectWithLocale(versionGroupHomeAction.languageSortingList.selectedSortOption, hLocale.localeId, versionGroupHomeAction.selectedVersion.id)}"/>
<div class="list__item">
<div class="list__item__info">
<h3 class="list__title">
#{hLocale.retrieveDisplayName()}
</h3>
<span class="list__item__meta">#{hLocale.localeId}</span>
</div>
<div class="list__item__stats">
<ui:param name="displayUnit"
value="#{versionGroupHomeAction.getStatisticFigureForProjectWithLocale(versionGroupHomeAction.languageSortingList.selectedSortOption, hLocale.localeId, versionGroupHomeAction.selectedVersion.id)}"/>
<span class="stats--small #{displayUnit.cssClass}">
<span class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit">#{displayUnit.unit}</span>
</span>
</div>
</div>
</div>
<zanata:statistic
value="#{versionGroupHomeAction.getSelectedVersionStatistic(hLocale.localeId)}"/>
<zanata:statistic
value="#{versionGroupHomeAction.getSelectedVersionStatistic(hLocale.localeId)}"/>
</h:outputLink>

<s:fragment
rendered="#{!versionGroupHomeAction.isLocaleActivatedInVersion(versionGroupHomeAction.selectedVersion, hLocale.localeId)}">
<div class="list__item">
<div class="list__item__info">
<h3 class="list__title">
#{hLocale.retrieveDisplayName()}

<s:link view="/iteration/view.xhtml">
<f:param name="projectSlug"
value="#{versionGroupHomeAction.selectedVersion.project.slug}"/>
<f:param name="iterationSlug"
value="#{versionGroupHomeAction.selectedVersion.slug}"/>
<span
class="label--danger">#{messages['jsf.Missing']}</span>
</s:link>

</h3>
<span class="list__item__meta">#{hLocale.localeId}</span>
</div>
<div class="list__item__stats">
<ui:param name="displayUnit"
value="#{versionGroupHomeAction.getStatisticFigureForProjectWithLocale(versionGroupHomeAction.languageSortingList.selectedSortOption, hLocale.localeId, versionGroupHomeAction.selectedVersion.id)}"/>
<span class="stats--small #{displayUnit.cssClass}">
<span class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit">#{displayUnit.unit}</span>
</span>
</div>
</div>
<zanata:statistic
value="#{versionGroupHomeAction.getSelectedVersionStatistic(hLocale.localeId)}"/>
</s:fragment>
</li>
</ui:repeat>
</ul>
Expand Down
10 changes: 5 additions & 5 deletions zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
View file
Expand Up @@ -410,11 +410,11 @@
rendered="#{versionHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.documentSortingList.selectedSortOption, versionHomeAction.selectedLocale.localeId, document)}"/>
<span class="#{displayUnit.cssClass}"
title="#{displayUnit.title}">
<span class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit">#{displayUnit.unit}</span>
</span>
<span class="#{displayUnit.cssClass}"
title="#{displayUnit.title}">
<span class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit">#{displayUnit.unit}</span>
</span>
</s:div>
</div>
<zanata:statistic
Expand Down

0 comments on commit dc651fa

Please sign in to comment.