- Fix jsf messages - 'more actions'

- hide 'more actions' drop down if its empty list - add comments to deprecated dao method
zanata · Feb 14, 2014 · 895f7df · 895f7df
1 parent 5c53092
commit 895f7df
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 58 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java b/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
@@ -252,8 +252,11 @@ public ContainerTranslationStatistics getStatistics(long docId,
     }
 
     /**
-     * Returns document statistics for multiple locales.
-     *
+     * 
+     * This method is currently returning wrong statistics -
+     * https://bugzilla.redhat.com/show_bug.cgi?id=1064737 Returns document
+     * statistics for multiple locales.
+     * 
      * @see DocumentDAO#getStatistics(long, org.zanata.common.LocaleId)
      * @param docId
      * @param localeIds
@@ -322,14 +325,17 @@ public Map<LocaleId, ContainerTranslationStatistics> getStatistics(
             transUnitWords.set(state, wordCount.intValue());
         }
 
-
         for (TransUnitCount stat : transUnitCountMap.values()) {
-            stat.set(ContentState.New,
-                    StatisticsUtil.calculateUntranslated(new Long(stat.getTotal()), stat));
+            stat.set(
+                    ContentState.New,
+                    StatisticsUtil.calculateUntranslated(
+                            new Long(stat.getTotal()), stat));
         }
         for (TransUnitWords stat : transUnitWordsMap.values()) {
-            stat.set(ContentState.New,
-                    StatisticsUtil.calculateUntranslated(new Long(stat.getTotal()), stat));
+            stat.set(
+                    ContentState.New,
+                    StatisticsUtil.calculateUntranslated(
+                            new Long(stat.getTotal()), stat));
         }
 
         // Merge into a single Stats object
@@ -412,7 +418,7 @@ public List<HDocument> getAllByProjectIteration(final String projectSlug,
 
     /**
      * Calculates a translated document's hash.
-     *
+     * 
      * @param projectSlug
      *            Project identifier
      * @param iterationSlug
@@ -497,7 +503,7 @@ public List transformList(List collection) {
     /**
      * Do not use this method when adding a new raw document, instead use
      * {@link #addRawDocument(HDocument, HRawDocument)}
-     *
+     * 
      * @see AbstractDAOImpl#makePersistent(Object)
      */
     @Override
@@ -512,7 +518,7 @@ public HDocument makePersistent(HDocument entity) {
     /**
      * Add a raw document to a document, cleanly removing any existing raw
      * document associated with the document.
-     *
+     * 
      * @param doc
      * @param rawDoc
      * @return

diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
@@ -250,6 +250,7 @@ jsf.iteration.CopyTrans.Help.reject=Skip the translation and do not copy it.
 jsf.iteration.CopyTrans.Action.downgradeToFuzzy=Copy as Fuzzy
 jsf.iteration.CopyTrans.Help.downgradeToFuzzy=The translation is still considered for reuse, but it will be reused as fuzzy. Subsequent conditions will be checked.
 ! used in coloured display tiles
+jsf.tooltip.MoreActions=More Actions
 #FIXME this is actually longer, may not be necessary or should be named better
 jsf.iteration.CopyTrans.Action.short.downgradeToFuzzy=Copy as Fuzzy
 jsf.iteration.CopyTrans.Action.ignore=Next Condition

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
@@ -16,29 +16,29 @@
         render="languages-language_form"
         sortingList="#{versionGroupHomeAction.languageSortingList}"/>
 
-      <div
-        class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
-        <a class="dropdown__toggle js-dropdown__toggle" href="#"
-          title="#{messages['jsf.tooltip.MoreActions']}"
-          data-original-title="#{messages['jsf.tooltip.MoreActions']}"><i
-          class="i i--ellipsis"></i></a>
-        <ul class="dropdown__content js-dropdown__content" role="content"
-          aria-labelledby="dropdownContent">
-          <s:fragment
-            rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
+      <s:fragment
+        rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
+        <div
+          class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
+          <a class="dropdown__toggle js-dropdown__toggle" href="#"
+            title="#{messages['jsf.tooltip.MoreActions']}"
+            data-original-title="#{messages['jsf.tooltip.MoreActions']}"><i
+            class="i i--ellipsis"></i></a>
+          <ul class="dropdown__content js-dropdown__content" role="content"
+            aria-labelledby="dropdownContent">
             <li>
               <a
-                href="#settings-languages" onclick="updateHashAndGotoUrl(this)">
+                href="#settings-languages"
+                onclick="updateHashAndGotoUrl(this)">
                 #{messages['jsf.ManageLanguage']} <i
                 class="i i--settings i__item__icon"></i>
               </a>
             </li>
-          </s:fragment>
-        </ul>
-      </div>
-
-
+          </ul>
+        </div>
+      </s:fragment>
     </div>
+
     <h2 class="panel__heading">
       <i class="i--language i--left"></i>#{messages['jsf.Languages']}
     </h2>
@@ -113,7 +113,8 @@
                 value="#{versionGroupHomeAction.getStatisticsForLocale(hLocale.localeId)}"
                 rendered="#{versionGroupHomeAction.pageRendered}"/>
 
-              <zanata:loader rendered="#{!versionGroupHomeAction.pageRendered}"/>
+              <zanata:loader
+                rendered="#{!versionGroupHomeAction.pageRendered}"/>
             </a4j:commandLink>
           </li>
         </ui:repeat>

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
@@ -16,27 +16,28 @@
         render="projects-project_form"
         sortingList="#{versionGroupHomeAction.projectSortingList}"/>
 
-      <div
-        class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
-        <a class="dropdown__toggle js-dropdown__toggle" href="#"
-          title="#{messages['jsf.tooltip.MoreActions']}"
-          data-original-title="#{messages['jsf.tooltip.MoreActions']}"><i
-          class="i i--ellipsis"></i>
-        </a>
-        <ul class="dropdown__content js-dropdown__content" role="content"
-          aria-labelledby="dropdownContent">
-          <s:fragment
-            rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
+      <s:fragment
+        rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">
+        <div
+          class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown">
+          <a class="dropdown__toggle js-dropdown__toggle" href="#"
+            title="#{messages['jsf.tooltip.MoreActions']}"
+            data-original-title="#{messages['jsf.tooltip.MoreActions']}"><i
+            class="i i--ellipsis"></i>
+          </a>
+          <ul class="dropdown__content js-dropdown__content" role="content"
+            aria-labelledby="dropdownContent">
             <li>
               <a
-                href="#settings-projects" onclick="updateHashAndGotoUrl(this)">
+                href="#settings-projects"
+                onclick="updateHashAndGotoUrl(this)">
                 #{messages['jsf.ManageProjects']} <i
                 class="i i--settings i__item__icon"></i>
               </a>
             </li>
-          </s:fragment>
-        </ul>
-      </div>
+          </ul>
+        </div>
+      </s:fragment>
 
     </div>
     <h2 class="panel__heading">

diff --git a/zanata-war/src/main/webapp/version-group/version_group.xhtml b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -131,18 +131,18 @@
               </a>
             </li>
 
-            <li class="tab__end">
-              <div
-                class="dropdown dropdown--tab dropdown--small dropdown--right dropdown--inline js-dropdown">
-                <a class="dropdown__toggle js-dropdown__toggle" href="#"
-                  title="#{messages['jsf.tooltip.MoreActions']}"
-                  data-original-title="#{messages['jsf.tooltip.MoreActions']}"><i
-                  class="i i--ellipsis"></i></a>
-                <ul class="dropdown__content js-dropdown__content"
-                  role="content"
-                  aria-labelledby="dropdownContent">
-                  <s:fragment
-                    rendered="#{versionGroupHomeAction.isUserProjectMaintainer()}">
+            <s:fragment
+              rendered="#{versionGroupHomeAction.isUserProjectMaintainer()}">
+              <li class="tab__end">
+                <div
+                  class="dropdown dropdown--tab dropdown--small dropdown--right dropdown--inline js-dropdown">
+                  <a class="dropdown__toggle js-dropdown__toggle" href="#"
+                    title="#{messages['jsf.tooltip.MoreActions']}"
+                    data-original-title="#{messages['jsf.tooltip.MoreActions']}"><i
+                    class="i i--ellipsis"></i></a>
+                  <ul class="dropdown__content js-dropdown__content"
+                    role="content"
+                    aria-labelledby="dropdownContent">
                     <li>
                       <s:link view="/version-group/request_to_join.xhtml"
                         styleClass="i__item--right"
@@ -158,10 +158,10 @@
                         <i class="i i--project i__item__icon"></i>
                       </s:link>
                     </li>
-                  </s:fragment>
-                </ul>
-              </div>
-            </li>
+                  </ul>
+                </div>
+              </li>
+            </s:fragment>
 
             <s:fragment
               rendered="#{s:hasPermission(versionGroupHome.instance, 'update')}">