Display all locales in the project version page.

Also make the highliting stronger when showing the user's language teams on that same page. Reinstate chaching at the component level for methods that are called multiple times in a single page render.
zanata · Aug 8, 2012 · a2616fa · a2616fa
1 parent d3f3f90
commit a2616fa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 38 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java b/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
@@ -38,6 +38,8 @@
 import org.joda.time.Period;
 import org.joda.time.format.PeriodFormatter;
 import org.joda.time.format.PeriodFormatterBuilder;
+import org.zanata.annotation.CachedMethodResult;
+import org.zanata.annotation.CachedMethods;
 import org.zanata.common.EntityStatus;
 import org.zanata.common.TransUnitWords;
 import org.zanata.dao.ProjectIterationDAO;
@@ -60,6 +62,7 @@
 
 @Name("viewAllStatusAction")
 @Scope(ScopeType.PAGE)
+@CachedMethods
 public class ViewAllStatusAction implements Serializable
 {
    private static final long serialVersionUID = 1L;
@@ -111,8 +114,6 @@ public class ViewAllStatusAction implements Serializable
 
    private String searchTerm;
 
-   private boolean showAllLocales = false;
-
    private HProjectIteration projectIteration;
 
    private List<HIterationGroup> searchResults;
@@ -195,6 +196,7 @@ public void validateIteration()
       }
    }
 
+   @CachedMethodResult
    public List<Status> getAllStatus()
    {
       List<Status> result = new ArrayList<Status>();
@@ -240,17 +242,6 @@ public List<Status> getAllStatus()
       return result;
    }
 
-
-   public boolean getShowAllLocales()
-   {
-      return showAllLocales;
-   }
-
-   public void setShowAllLocales(boolean showAllLocales)
-   {
-      this.showAllLocales = showAllLocales;
-   }
-
    public HProjectIteration getProjectIteration()
    {
       if (this.projectIteration == null)
@@ -419,14 +410,7 @@ private String formatTimePeriod( long durationInMillis )
 
    private List<HLocale> getDisplayLocales()
    {
-      if (this.showAllLocales || authenticatedAccount == null)
-      {
-         return localeServiceImpl.getSupportedLangugeByProjectIteration(this.projectSlug, this.iterationSlug);
-      }
-      else
-      {
-         return localeServiceImpl.getTranslation(projectSlug, iterationSlug, authenticatedAccount.getUsername());
-      }
+      return localeServiceImpl.getSupportedLangugeByProjectIteration(this.projectSlug, this.iterationSlug);
    }
 
    public List<HIterationGroup> getSearchResults()

diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
@@ -266,8 +266,7 @@ jsf.ImportJavaLocales=Import Java Locales
 jsf.InvalidActivationKey=Invalid activation key
 jsf.Version=Version
 
-jsf.iteration.ShowAllLocales=Show All Locales
-jsf.iteration.ShowAllLocales.title=Shows all available locales for this version (Teams for which you belong will be higlighted in yellow).
+jsf.iteration.ShowAllLocales.title=Your teams will be <span class='highlighted_datatable_row'>highlighted</span> below.
 jsf.iteration.CopyTrans=Copy Translations
 jsf.iteration.CopyTrans.inProgress=Copy Trans in progress...
 jsf.iteration.CopyTrans.noDocuments=Please add documents to this version first.

diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -57,15 +57,7 @@
 				<a4j:region id="langTableRegion">
 					<s:token allowMultiplePosts="true" />
 
-					<h:selectBooleanCheckbox id="show_all_locales" 
-						value="#{viewAllStatusAction.showAllLocales}"
-						title="#{messages['jsf.iteration.ShowAllLocales.title']}"
-						rendered="#{identity.loggedIn}">
-						<a4j:support event="onclick"
-	                            ajaxSingle="true"
-	                            reRender="data_table"/>
-					</h:selectBooleanCheckbox>
-					<h:outputText value="#{messages['jsf.iteration.ShowAllLocales']}" rendered="#{identity.loggedIn}"/>
+					<h:outputText escape="false" value="#{messages['jsf.iteration.ShowAllLocales.title']}" rendered="#{identity.loggedIn}"/>
 					<rich:spacer width="10px;"/>
 					<br/>
 					<rich:spacer height="10px;"/>
@@ -74,7 +66,7 @@
 						value="#{viewAllStatusAction.getAllStatus().toArray()}" var="stats"
 						styleClass="iteration_inline_tribes" rowClasses="odd,even">
 						<rich:column sortBy="#{stats.locale}"
-							styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
+							styleClass="#{stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
 							<f:facet name="header">#{messages['jsf.Language']}</f:facet>
 							<h:outputLink rendered="#{identity.loggedIn}"
 								value="#{request.contextPath}/webtrans/Application.html"
@@ -89,7 +81,7 @@
 								rendered="#{not identity.loggedIn}" />
 						</rich:column>
 						<rich:column sortBy="#{stats.nativeName}"
-							styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
+							styleClass="#{stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
 							<f:facet name="header">#{messages['jsf.Name']}</f:facet>
 							<h:outputLink rendered="#{identity.loggedIn}"
 								value="#{request.contextPath}/webtrans/Application.html"
@@ -105,7 +97,7 @@
 						</rich:column>
 						<rich:column id="translate" 
 							rendered="#{identity.loggedIn and not viewAllStatusAction.isIterationObsolete()}"
-							styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
+							styleClass="#{stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
 							<h:outputLink
 								rendered="#{not applicationConfiguration.debug and not viewAllStatusAction.isUserAllowedToTranslate(stats.locale) }"
 								value="#{request.contextPath}/webtrans/Application.html" styleClass="iteration_link">
@@ -150,7 +142,7 @@
 						</rich:column>
 						<rich:column id="files"
 							rendered="#{identity.loggedIn}"
-							styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
+							styleClass="#{stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
 							<s:link
 								view="/iteration/files.xhtml" propagation="none"
 								value="#{messages['jsf.Files']}" styleClass="iteration_link">
@@ -160,7 +152,7 @@
 							</s:link>
 						</rich:column>
 						<rich:column sortBy="#{stats.per}"
-							styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
+							styleClass="#{stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
 							<f:facet name="header">#{messages['jsf.iteration.stats.Percentage']}</f:facet>
 							<ui:param name="tstatus" value="#{stats.wordStats}" />
 							<ui:include src="../WEB-INF/layout/statsbar.xhtml">

diff --git a/zanata-war/src/main/webapp/stylesheet/zanata.css b/zanata-war/src/main/webapp/stylesheet/zanata.css
@@ -1014,7 +1014,7 @@ a.version_link:hover {
 }
 
 .highlighted_datatable_row {
-	background-color: lightYellow;
+	background-color: #ffff00;
 }
 /* -----------------------  End project iteration CSS  -------------------------*/