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

Commit

Permalink
Refactor loader class for tab
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Mar 30, 2014
1 parent d15b4e9 commit 59ecf04
Show file tree
Hide file tree
Showing 6 changed files with 141 additions and 100 deletions.
35 changes: 20 additions & 15 deletions zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
View file
Expand Up @@ -146,26 +146,31 @@
<h3 class="list__title">#{version.slug}</h3>
</div>

<s:div styleClass="list__item__stats"
rendered="#{projectHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{projectHomeAction.getStatisticFigureForVersion(projectHomeAction.versionSortingList.selectedSortOption, version)}"/>
<span class="#{displayUnit.cssClass}"
title="#{displayUnit.title}">
<span class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit txt--lowercase">
#{displayUnit.unit}
</span>
</span>
</s:div>
<div class="list__item__stats">
<a4j:status name="statistic-loader">
<f:facet name="start">
<zanata:loader type="loader--small" layout="inline"/>
</f:facet>
</a4j:status>

<s:fragment rendered="#{projectHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{projectHomeAction.getStatisticFigureForVersion(projectHomeAction.versionSortingList.selectedSortOption, version)}"/>
<span class="#{displayUnit.cssClass}"
title="#{displayUnit.title}">
<span
class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit txt--lowercase">
#{displayUnit.unit}
</span>
</span>
</s:fragment>
</div>
</div>
<zanata:statistic
value="#{projectHomeAction.getStatisticForVersion(version.slug)}"
rendered="#{projectHomeAction.pageRendered}"/>

<a4j:status name="statistic-loader">
<f:facet name="start"><zanata:loader/></f:facet>
</a4j:status>
</s:link>
</li>
</ui:repeat>
Expand Down
39 changes: 21 additions & 18 deletions zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
View file
Expand Up @@ -81,9 +81,10 @@
value="#{versionGroupHomeAction.languageTabLanguageFilter.pagedFilteredList}"
var="hLocale">
<li class="progress-bar__expander">
<a4j:commandLink oncomplete="zanata.loader.deactivate('.loader--small')"
<a4j:commandLink
oncomplete="zanata.loader.deactivate('#languagesTab-language-label-loader')"
action="#{versionGroupHomeAction.setSelectedLocale(hLocale)}"
onbegin="clearHTML('#{rich:clientId('languages-project_list')}');clearHTML('#{rich:clientId('language-label')}');zanata.loader.activate('.loader--small')"
onbegin="clearHTML('#{rich:clientId('languages-project_list')}');clearHTML('#{rich:clientId('language-label')}');zanata.loader.activate('#languagesTab-language-label-loader')"
status="languageTab-projectsLoader"
render="languages-project_list, language-label, languageTabVersionFilter-pager, languageTabVersionFilter-page-info, languageTabVersionFilterBottom-pager, languageTabVersionFilterBottom-page-info"
onclick="updateUrl('/version-group/view/#{versionGroupHomeAction.slug}', '/languages/#{hLocale.localeId}')"
Expand All @@ -99,26 +100,28 @@
</s:span>
</span>
</div>
<s:div styleClass="list__item__stats"
rendered="#{versionGroupHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionGroupHomeAction.getStatisticFigureForLocale(versionGroupHomeAction.languageSortingList.selectedSortOption, hLocale.localeId)}"/>
<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 class="list__item__stats">
<a4j:status name="statistic-loader">
<f:facet name="start">
<zanata:loader type="loader--small" layout="inline"/>
</f:facet>
</a4j:status>

<s:fragment rendered="#{versionGroupHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionGroupHomeAction.getStatisticFigureForLocale(versionGroupHomeAction.languageSortingList.selectedSortOption, hLocale.localeId)}"/>
<span class="#{displayUnit.cssClass}"
title="#{displayUnit.title}">
<span class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit">#{displayUnit.unit}</span>
</span>
</s:fragment>
</div>
</div>

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

<a4j:status name="statistic-loader">
<f:facet name="start"><zanata:loader/></f:facet>
</a4j:status>

</a4j:commandLink>
</li>
</ui:repeat>
Expand Down Expand Up @@ -151,7 +154,7 @@
</a>

<h2 class="panel__heading">
<span class="loader--small loader--inline js-loader"></span>
<zanata:loader jsHandle="true" layout="inline" type="loader--small" id="languagesTab-language-label-loader"/>
<s:span id="language-label">
#{versionGroupHomeAction.selectedLocale.retrieveDisplayName()}
</s:span>
Expand Down
44 changes: 24 additions & 20 deletions zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
View file
Expand Up @@ -83,10 +83,11 @@
var="version">
<li class="progress-bar__expander"
id="#{version.project.slug}[#{version.slug}]">
<a4j:commandLink oncomplete="zanata.loader.deactivate('.loader--small')"
<a4j:commandLink
oncomplete="zanata.loader.deactivate('#projectsTab-project-label-loader')"
action="#{versionGroupHomeAction.setSelectedVersion(version)}"
status="projectsTab-languagesLoader"
onbegin="clearHTML('#{rich:clientId('projects-language_list')}');clearHTML('#{rich:clientId('project-label')}');zanata.loader.activate('.loader--small')"
onbegin="clearHTML('#{rich:clientId('projects-language_list')}');clearHTML('#{rich:clientId('project-label')}');zanata.loader.activate('#projectsTab-project-label-loader')"
render="projects-language_list, project-label, projectTabLanguageFilter-pager, projectTabLanguageFilter-page-info, projectTabLanguageFilterBottom-pager, projectTabLanguageFilterBottom-page-info"
onclick="updateUrl('/version-group/view/#{versionGroupHomeAction.slug}', '/projects/#{version.project.slug}/#{version.slug}')"
styleClass="bx--block">
Expand All @@ -104,28 +105,30 @@
</s:fragment>
</span>
</div>
<s:div styleClass="list__item__stats"
rendered="#{versionGroupHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionGroupHomeAction.getStatisticFigureForProject(versionGroupHomeAction.projectSortingList.selectedSortOption, version.id)}"/>
<span class="stats--small #{displayUnit.cssClass}">
<span class="stats__figure">
#{displayUnit.figure}
</span>
<span class="stats__unit txt--lowercase">
#{displayUnit.unit}
<div class="list__item__stats">
<a4j:status name="statistic-loader">
<f:facet name="start">
<zanata:loader type="loader--small" layout="inline"/>
</f:facet>
</a4j:status>

<s:fragment rendered="#{versionGroupHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionGroupHomeAction.getStatisticFigureForProject(versionGroupHomeAction.projectSortingList.selectedSortOption, version.id)}"/>
<span class="stats--small #{displayUnit.cssClass}">
<span class="stats__figure">
#{displayUnit.figure}
</span>
<span class="stats__unit txt--lowercase">
#{displayUnit.unit}
</span>
</span>
</span>
</s:div>
</s:fragment>
</div>
</div>
<zanata:statistic
value="#{versionGroupHomeAction.getStatisticForProject(version.id)}"
rendered="#{versionGroupHomeAction.pageRendered}"/>

<a4j:status name="statistic-loader">
<f:facet name="start"><zanata:loader/></f:facet>
</a4j:status>

</a4j:commandLink>
</li>
</ui:repeat>
Expand Down Expand Up @@ -159,7 +162,8 @@
</a>

<h2 class="panel__heading">
<span class="loader--small loader--inline js-loader"></span>
<zanata:loader jsHandle="true" layout="inline" type="loader--small"
id="projectsTab-project-label-loader"/>

<s:span id="project-label" styleClass="i__text--right">
#{versionGroupHomeAction.selectedVersion.project.slug}
Expand Down
47 changes: 27 additions & 20 deletions zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
View file
Expand Up @@ -186,36 +186,41 @@
</ul>
</div>
</s:div>
<a4j:commandLink oncomplete="zanata.loader.deactivate('.loader--small')"
<a4j:commandLink
oncomplete="zanata.loader.deactivate('#documentsTab-document-label-loader')"
action="#{versionHomeAction.setSelectedDocument(document)}"
status="documentsTab-languagesLoader"
onbegin="clearHTML('#{rich:clientId('documents-language_list')}');clearHTML('#{rich:clientId('document-label')}');zanata.loader.activate('.loader--small')"
onbegin="clearHTML('#{rich:clientId('documents-language_list')}');clearHTML('#{rich:clientId('document-label')}');zanata.loader.activate('#documentsTab-document-label-loader')"
render="documents-language_list, document-label, documents-language-size, documentsTabLanguageSearch-pager, documentsTabLanguageSearch-page-info, documentsTabLanguageSearchBottom-pager, documentsTabLanguageSearchBottom-page-info"
onclick="updateActiveRow(this);toggleColumn('documents_content')">
<div class="list__item__content">
<div class="list__item__info">
<h3 class="list__title">#{document.name}</h3>
<span class="list__item__meta">#{document.path}</span>
</div>
<s:div styleClass="list__item__stats"
rendered="#{versionHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.sourceDocumentSortingList.selectedSortOption, document)}"/>
<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 class="list__item__stats">
<a4j:status name="statistic-loader">
<f:facet name="start">
<zanata:loader type="loader--small" layout="inline"/>
</f:facet>
</a4j:status>

<s:fragment rendered="#{versionHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.sourceDocumentSortingList.selectedSortOption, document)}"/>
<span class="#{displayUnit.cssClass}"
title="#{displayUnit.title}">
<span
class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit">#{displayUnit.unit}</span>
</span>
</s:fragment>
</div>
</div>
<zanata:statistic
value="#{versionHomeAction.getDocumentStatistic(document.id)}"
rendered="#{versionHomeAction.pageRendered}"/>

<a4j:status name="statistic-loader">
<f:facet name="start"><zanata:loader/></f:facet>
</a4j:status>

</a4j:commandLink>
</li>
</ui:repeat>
Expand Down Expand Up @@ -262,8 +267,8 @@
</s:fragment>
</div>
<h2 class="panel__heading">
<span class="loader--small loader--inline js-loader"></span>

<zanata:loader jsHandle="true" layout="inline" type="loader--small"
id="documentsTab-document-label-loader"/>
<s:span id="document-label">
#{versionHomeAction.selectedDocument.name}
</s:span>
Expand Down Expand Up @@ -344,7 +349,8 @@
rendered="#{versionHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.languageSortingList.selectedSortOption, hLocale.localeId, versionHomeAction.selectedDocument)}"/>
<span class="#{displayUnit.cssClass}" title="#{displayUnit.title}">
<span class="#{displayUnit.cssClass}"
title="#{displayUnit.title}">
<span
class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit">#{displayUnit.unit}</span>
Expand Down Expand Up @@ -378,7 +384,8 @@
rendered="#{versionHomeAction.pageRendered}">
<ui:param name="displayUnit"
value="#{versionHomeAction.getStatisticFigureForDocument(versionHomeAction.languageSortingList.selectedSortOption, hLocale.localeId, versionHomeAction.selectedDocument)}"/>
<span class="#{displayUnit.cssClass}" title="#{displayUnit.title}">
<span class="#{displayUnit.cssClass}"
title="#{displayUnit.title}">
<span class="stats__figure">#{displayUnit.figure}</span>
<span class="stats__unit">#{displayUnit.unit}</span>
</span>
Expand Down

0 comments on commit 59ecf04

Please sign in to comment.