Merge branch 'master' of github.com:zanata/zanata

carlosmunoz · Oct 27, 2011 · 876884e · 876884e
2 parents 2e0a2e9 + 59e63ff
commit 876884e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/server/zanata-war/src/main/resources/messages.properties b/server/zanata-war/src/main/resources/messages.properties
@@ -268,6 +268,7 @@ jsf.RegisterUrl=Register URL
 jsf.RegisterUrlExample=eg /zanata/account/register or http://example.com/register
 jsf.RegisterUrlToolTip=The user registration URL for the server
 jsf.ReindexFullTextSearchDatabase=Re-index full text search database
+jsf.ReindexingInProgress=Re-indexing...
 jsf.RememberMe=Remember me
 jsf.Remove=Remove
 jsf.RemoveLocale=< Remove

diff --git a/server/zanata-war/src/main/webapp/admin/search.xhtml b/server/zanata-war/src/main/webapp/admin/search.xhtml
@@ -15,10 +15,17 @@
 
         <a4j:form>
             <s:token allowMultiplePosts="true" />
-	        <a4j:commandButton id="reindex"
-	       		value="#{messages['jsf.ReindexFullTextSearchDatabase']}"
-	      		action="#{adminAction.reindexDatabase}"/>
-	    </a4j:form>
+            <a4j:commandButton id="reindex"
+                value="#{messages['jsf.ReindexFullTextSearchDatabase']}"
+                action="#{adminAction.reindexDatabase}"
+                status="reindexStatus"/>
+        </a4j:form>
+
+        <a4j:region>
+            <a4j:status id="reindexStatus" layout="block" startStyleClass="reindexStatusIndicator"
+                        startText="#{messages['jsf.ReindexingInProgress']}" stopText="" />
+        </a4j:region>
+
     </ui:define>
 
 </ui:composition>
diff --git a/server/zanata-war/src/main/webapp/stylesheet/zanata.css b/server/zanata-war/src/main/webapp/stylesheet/zanata.css
@@ -150,6 +150,12 @@ h1, h2, h3, h4, h5, h6 {
 	width: 680px !important;
 }
 
+.reindexStatusIndicator {
+    margin-top: 10px;
+    font-weight: bold;
+    font-style: italic;
+    margin-left: 20px;
+}
 
 /** theme.css **/