Merge branch '1.6' into integration/master

zanata · Jun 28, 2012 · 2a77a99 · 2a77a99
2 parents a8bff04 + 07ba3e6
commit 2a77a99
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 8 deletions.
diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
@@ -325,7 +325,26 @@ jsf.MaintainedProjects=Maintained Projects
 jsf.ManageRoles=Manage Roles
 jsf.ManageLanguage=Manage Languages
 jsf.ManageMaintainers=Manage Maintainers
+
 jsf.ManageSearch=Manage Search
+jsf.ManageSearch.PerformSelectedActions=Perform Selected Actions
+jsf.manageSearch.purge=Purge index
+jsf.manageSearch.purge.Description=Mark all existing index entries for the table obsolete.
+jsf.manageSearch.purge.ObsoletesOccupyDiskSpace=Obsolete entries still occupy disk space but are not returned in any searches.
+jsf.manageSearch.purge.RemoveByRunningOptimize=Obsolete entries can be completely removed by running Optimize any time after Purge.
+jsf.manageSearch.reindex=Reindex
+jsf.manageSearch.reindex.Description=Index all rows in the given table.
+jsf.manageSearch.reindex.OnlyWhenOutOfDate=Rows will be indexed automatically when data is persisted, so this operation is only necessary when the index is out-of-date (e.g. when the database has been restored from backup, after a failed reindex, if index files have been removed).
+jsf.manageSearch.reindex.AllRowsWillBeReindexed=All rows of the given table will be reindexed regardless whether they already have an entry in the index.
+jsf.manageSearch.reindex.IndexedRowsWillBeUpdated=Rows that have already been indexed will have their entries updated, which will usually have no effect on the entry.
+jsf.manageSearch.reindex.TimeAndMemoryWarning=Warning: this operation can take hours for large tables, and will increase memory use significantly above baseline.
+jsf.manageSearch.reindex.RunDuringOffPeak=It is strongly recommended to run this operation during off-peak times when average server memory use is at a minimum.
+jsf.manageSearch.optimize=Optimize
+jsf.manageSearch.optimize.Description=Arrange index entries to maximize search speed.
+jsf.manageSearch.optimize.WillNotInfluenceIndexTime=Will not influence indexing time.
+jsf.manageSearch.optimize.RemovesObsoleteEntries=Also removes any obsolete entries from the index.
+jsf.manageSearch.optimize.TempFileWarning=Warning: this operation uses a temp file that will require free disk space of approximately the current index size.
+
 jsf.ManageUsers=Manage Users
 jsf.Members=Members
 jsf.MemberOf=Member of
@@ -377,7 +396,6 @@ jsf.Register=Register
 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

diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
@@ -823,7 +823,7 @@ td.FuzzyStateDecoration div div pre, td.ApprovedStateDecoration div div pre
 	cursor: pointer;
 }
 
-.translationContainer pre {
+.translationContainer pre, .translationContainer textarea {
 	font-size: 14px;
 	font-family: sans-serif;
 	word-wrap: break-word;
@@ -899,4 +899,4 @@ td.FuzzyStateDecoration div div pre, td.ApprovedStateDecoration div div pre
 .boldFont
 {
 	font-weight:bold;
-}
+}
diff --git a/zanata-war/src/main/webapp/admin/search.xhtml b/zanata-war/src/main/webapp/admin/search.xhtml
@@ -46,25 +46,50 @@
                               rendered="#{!reindexAction.reindexing}"
                               reRender="reindexPanel">
                 <rich:column width="270px" sortBy="#{clazz.className}" sortOrder="ASCENDING" selfSorted="false">
-                  <f:facet name="header">Class</f:facet>
+                  <f:facet name="header">Table</f:facet>
                   <h:outputText value="#{clazz.className}" />
                 </rich:column>
                 <rich:column width="auto" styleClass="centered">
-                  <f:facet name="header">Purge index</f:facet>
+                  <f:facet name="header">
+                    #{messages['jsf.manageSearch.purge']}
+                  </f:facet>
+                  <rich:toolTip showDelay="800" styleClass="leftalign">
+                    <p>#{messages['jsf.manageSearch.purge.Description']}</p>
+                    <p>#{messages['jsf.manageSearch.purge.ObsoletesOccupyDiskSpace']}</p>
+                    <p>#{messages['jsf.manageSearch.purge.RemoveByRunningOptimize']}</p>
+                  </rich:toolTip>
                   <h:selectBooleanCheckbox value="#{clazz.purge}" />
                 </rich:column>
                 <rich:column width="auto" styleClass="centered">
-                  <f:facet name="header">Reindex</f:facet>
+                  <f:facet name="header">
+                    #{messages['jsf.manageSearch.reindex']}
+                  </f:facet>
+                  <rich:toolTip showDelay="800" styleClass="leftalign">
+                    <p>#{messages['jsf.manageSearch.reindex.Description']}</p>
+                    <p>#{messages['jsf.manageSearch.reindex.OnlyWhenOutOfDate']}</p>
+                    <p>#{messages['jsf.manageSearch.reindex.AllRowsWillBeReindexed']}</p>
+                    <p>#{messages['jsf.manageSearch.reindex.IndexedRowsWillBeUpdated']}</p>
+                    <p><em>#{messages['jsf.manageSearch.reindex.TimeAndMemoryWarning']}</em></p>
+                    <p><em>#{messages['jsf.manageSearch.reindex.RunDuringOffPeak']}</em></p>
+                  </rich:toolTip>
                   <h:selectBooleanCheckbox value="#{clazz.reindex}" />
                 </rich:column>
                 <rich:column width="auto" styleClass="centered">
-                  <f:facet name="header">Optimize</f:facet>
+                  <f:facet name="header">
+                    #{messages['jsf.manageSearch.optimize']}
+                  </f:facet>
+                  <rich:toolTip showDelay="800" styleClass="leftalign">
+                    <p>#{messages['jsf.manageSearch.optimize.Description']}</p>
+                    <p>#{messages['jsf.manageSearch.optimize.RemovesObsoleteEntries']}</p>
+                    <p>#{messages['jsf.manageSearch.optimize.WillNotInfluenceIndexTime']}</p>
+                    <p><em>#{messages['jsf.manageSearch.optimize.TempFileWarning']}</em></p>
+                  </rich:toolTip>
                   <h:selectBooleanCheckbox value="#{clazz.optimize}" />
                 </rich:column>
               </rich:dataTable>
 
               <a4j:commandButton id="reindex"
-                  value="#{messages['jsf.ReindexFullTextSearchDatabase']}"
+                  value="#{messages['jsf.ManageSearch.PerformSelectedActions']}"
                   action="#{reindexAction.reindexDatabase}"
                   rendered="#{!reindexAction.reindexing}"
                   reRender="reindexPanel"/>

diff --git a/zanata-war/src/main/webapp/stylesheet/base.css b/zanata-war/src/main/webapp/stylesheet/base.css
@@ -114,6 +114,15 @@ td.centered {
 	text-align: center;
 }
 
+.leftalign {
+	text-align: left;
+}
+
+.rich-tool-tip p {
+	margin-top: 3px;
+	margin-bottom: 3px;
+}
+
 /* -----------------------  Browser specific  ----------------------- */
 
 /* Additional IE specific bug fixes... */