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

Commit

Permalink
Change url in group project tab to version link
Browse files Browse the repository at this point in the history 
https://bugzilla.redhat.com/show_bug.cgi?id=1128954

Squashed commit of the following:

commit 3ee9c62
Author: Alex Eng <aeng@redhat.com>
Date:   Thu Aug 14 15:04:44 2014 +1000

    Change url in group project tab to version link

commit a9a0735
Author: Alex Eng <aeng@redhat.com>
Date:   Thu Aug 14 13:40:27 2014 +1000

    Make link a selected locale url in group page:
    https://bugzilla.redhat.com/show_bug.cgi?id=1128954
  • Loading branch information
Alex Eng committed Aug 20, 2014
1 parent 6ab883a commit 49a9dfa
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 52 deletions.
20 changes: 11 additions & 9 deletions zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
View file
Expand Up @@ -28,7 +28,8 @@
<ul class="dropdown__content js-dropdown__content" role="content"
aria-labelledby="dropdownContent">
<li>
<a href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/settings/languages"
<a
href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/settings/languages"
onclick="changeBrowserUrl(this.href, true);return false;">
#{msgs['jsf.ManageLanguage']} <i
class="i i--settings i__item__icon"></i>
Expand Down Expand Up @@ -65,7 +66,8 @@
<s:fragment
rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
<p>
<a class="button--primary" href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/settings/languages"
<a class="button--primary"
href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/settings/languages"
onclick="changeBrowserUrl(this.href, true);return false;">
#{msgs['jsf.AddLanguages']}
</a>
Expand All @@ -85,7 +87,8 @@
value="#{versionGroupHomeAction.languageTabLanguageFilter.currentPage}"
var="hLocale">
<li class="progress-bar__expander panels__panel__item">
<a href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/languages/#{hLocale.localeId}"
<a
href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/languages/#{hLocale.localeId}"
onclick="changeBrowserUrl(this.href, true);return false;"
class="#{hLocale.localeId}">
<div class="list__item">
Expand Down Expand Up @@ -194,7 +197,8 @@
<s:fragment
rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
<p>
<a class="button--primary" href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/settings/projects"
<a class="button--primary"
href="#{request.contextPath}/version-group/view/#{versionGroupHomeAction.slug}/settings/projects"
onclick="changeBrowserUrl(this.href, true);return false;">
#{msgs['jsf.AddProjectVersions']}
</a>
Expand All @@ -214,10 +218,8 @@
value="#{versionGroupHomeAction.languageTabVersionFilter.currentPage}"
var="version">
<li class="progress-bar__expander">
<s:link view="/iteration/view.xhtml">
<f:param name="projectSlug" value="#{version.project.slug}"/>
<f:param name="iterationSlug" value="#{version.slug}"/>

<a
href="#{request.contextPath}/iteration/view/#{version.project.slug}/#{version.slug}/languages/#{versionGroupHomeAction.selectedLocale.localeId}">
<div class="list__item">
<div class="list__item__info">
<h3 class="list__title">#{version.project.name}</h3>
Expand Down Expand Up @@ -247,7 +249,7 @@

<zanata:statistic
value="#{versionGroupHomeAction.getSelectedLocaleStatistic(version.id)}"/>
</s:link>
</a>
</li>
</ui:repeat>
</ul>
Expand Down
48 changes: 5 additions & 43 deletions zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
View file
Expand Up @@ -219,20 +219,14 @@
value="#{versionGroupHomeAction.projectTabLanguageFilter.currentPage}"
var="hLocale">
<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}"/>

<a
href="#{request.contextPath}/iteration/view/#{versionGroupHomeAction.selectedVersion.project.slug}/#{versionGroupHomeAction.selectedVersion.slug}/languages/#{hLocale.localeId}">
<div class="list__item">
<div class="list__item__info">
<h3 class="list__title">
#{hLocale.retrieveDisplayName()}
<s:span rendered="#{!versionGroupHomeAction.isLocaleActivatedInVersion(versionGroupHomeAction.selectedVersion, hLocale.localeId)}"
styleClass="label--danger">#{msgs['jsf.Missing']}</s:span>
</h3>
<span class="list__item__meta">#{hLocale.localeId}</span>
</div>
Expand All @@ -247,39 +241,7 @@
</div>
<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">#{msgs['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>
</a>
</li>
</ui:repeat>
</ul>
Expand Down

0 comments on commit 49a9dfa

Please sign in to comment.