Merge branch 'master' of github.com:zanata/zanata into integration/ma…

…ster
zanata · Apr 23, 2012 · 79c6af8 · 79c6af8
2 parents adbea18 + 41d8a4b
commit 79c6af8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/server/zanata-war/src/main/webapp/admin/search.xhtml b/server/zanata-war/src/main/webapp/admin/search.xhtml
@@ -9,17 +9,31 @@
     xmlns:a4j="http://richfaces.org/a4j"
     template="../WEB-INF/layout/template.xhtml">
 
-    <ui:define name="page_title">Manage Search</ui:define>
+    <ui:define name="page_title">#{messages['jsf.ManageSearch']}</ui:define>
     <ui:define name="center_content">
       <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />
       <rich:panel>
-        <h1>#{messages['jsf.Search']}</h1>
+        <h1>#{messages['jsf.ManageSearch']}</h1>
 
         <!-- TODO reformat indentation, change button label id to match progress message id -->
         <a4j:form>
           <s:token allowMultiplePosts="true" />
           <a4j:region>
             <a4j:outputPanel id="reindexPanel">
+
+              <!-- minValue is -1 because of a bug when 0 is used -->
+              <!-- reRender expression is present as reRenderAfterComplete fails sometimes -->
+              <rich:progressBar id="reindexProgressBar"
+                    value="#{reindexAction.reindexProgress}"
+                    interval="1000"
+                    label="#{messages['jsf.search.reindex.ProgressMessage']}"
+                    minValue="-1"
+                    maxValue="#{reindexAction.reindexCount - 1}"
+                    enabled="#{reindexAction.reindexing}"
+                    reRender="#{reindexAction.reindexing ? reindex : reindexPanel}"
+                    reRenderAfterComplete="reindexPanel">
+              </rich:progressBar>
+
               <h:outputText rendered="#{reindexAction.reindexError}" escape="false">
                 <p>#{messages['jsf.search.reindex.ErrorMessage']}</p>
               </h:outputText>
@@ -28,8 +42,10 @@
               </h:outputText>
 
               <rich:dataTable id="classList" rows="#{reindexAction.classes.size}"
-                              value="#{reindexAction.classes.toArray()}" var="clazz">
-                <rich:column width="270px" sortBy="#{clazz.className}">
+                              value="#{reindexAction.classes.toArray()}" var="clazz"
+                              rendered="#{!reindexAction.reindexing}"
+                              reRender="reindexPanel">
+                <rich:column width="270px" sortBy="#{clazz.className}" sortOrder="ASCENDING" selfSorted="false">
                   <f:facet name="header">Class</f:facet>
                   <h:outputText value="#{clazz.className}" />
                 </rich:column>
@@ -52,16 +68,7 @@
                   action="#{reindexAction.reindexDatabase}"
                   rendered="#{!reindexAction.reindexing}"
                   reRender="reindexPanel"/>
-              <!-- minValue is -1 because of a bug when 0 is used -->
-              <rich:progressBar id="reindexProgressBar"
-                    value="#{reindexAction.reindexProgress}"
-                    interval="1000"
-                    label="#{messages['jsf.search.reindex.ProgressMessage']}"
-                    minValue="-1"
-                    maxValue="#{reindexAction.reindexCount - 1}"
-                    enabled="#{reindexAction.reindexing}"
-                    reRenderAfterComplete="reindexPanel">
-              </rich:progressBar>
+
             </a4j:outputPanel>
           </a4j:region>
         </a4j:form>

diff --git a/server/zanata-war/src/main/webapp/project/project.xhtml b/server/zanata-war/src/main/webapp/project/project.xhtml
@@ -32,11 +32,9 @@
         <h1>#{messages['jsf.Name']}: <span class="obsolete">#{projectHome.instance.name}</span></h1>
     </s:fragment>
 
-    <s:formattedText id="project-home-content" value="#{projectHome.instance.homeContent}"></s:formattedText>
-    <h:outputText value="#{projectHome.instance.description}" rendered="#{empty projectHome.instance.homeContent}"/>
+    <s:formattedText id="project-home-content" value="#{projectHome.instance.homeContent}"/>
+    <s:formattedText value="#{projectHome.instance.description}" rendered="#{empty projectHome.instance.homeContent}"/>
 
-    <rich:spacer height="10px" />
-
     <s:fragment rendered="#{projectHome.activeIterations.size > 0}">
     	<div class="iterations">
             <rich:tabPanel switchType="client">

diff --git a/server/zanata-war/src/main/webapp/stylesheet/zanata.css b/server/zanata-war/src/main/webapp/stylesheet/zanata.css
@@ -646,7 +646,7 @@ a.readonly_link,a.readonly_link:visited,a.readonly_link:link {
 }
 
 .version_header {
-    padding:10px;
+    padding:8px;
     font-weight:bold;
     background-image:none;
     width:200px;

diff --git a/server/zanata-war/src/main/webapp/version-group/version_group.xhtml b/server/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -16,11 +16,8 @@
 
     	 <h1>#{messages['jsf.GroupId']}: #{versionGroupHome.instance.slug}</h1>
 
-    	 <h:outputText value="#{versionGroupHome.instance.description}" rendered="#{!empty versionGroupHome.instance.description}"/>
+    	 <s:formattedText value="#{versionGroupHome.instance.description}" rendered="#{!empty versionGroupHome.instance.description}"/>
 
-    	 <rich:spacer height="10px" />
-
-
         <rich:dataTable id="iterationsDataTable" value="#{versionGroupHome.instance.projectIterations.toArray()}"
                         var="_iteration">
             <rich:column sortBy="#{_iteration.project.slug}">