fix null jsf messages, fix version group request action link

zanata · Oct 15, 2012 · f8845c9 · f8845c9
1 parent edc8a8a
commit f8845c9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml b/zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
@@ -11,7 +11,7 @@
 
    <ui:param name="showGlobalMessages" value="true"/>
 
-   <ui:define name="page_title">#{messages['jsf.RequestToJoinVersionGroupTitle']}</ui:define>
+   <ui:define name="page_title">#{messages['jsf.RequestToJoinVersionGroup']}</ui:define>
 
    <ui:define name="center_content">
 

diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -224,7 +224,6 @@
                         <h:outputText id="noResultsMessage" rendered="#{empty viewAllStatusAction.searchResults}" value="#{messages['jsf.NoResultToDisplay']}" />
                         <a4j:outputPanel layout="block" style="overflow:auto;height:320px" rendered="#{not empty viewAllStatusAction.searchResults}">
                             <rich:dataTable id="resultTable" value="#{viewAllStatusAction.searchResults}" var="group">
-                                <f:facet name="header">#{messages['jsf.SearchResults']}</f:facet>
 
                                 <rich:column sortBy="#{group.name}">
                                     <f:facet name="header">#{messages['jsf.GroupName']}</f:facet>

diff --git a/zanata-war/src/main/webapp/version-group/request_to_join.xhtml b/zanata-war/src/main/webapp/version-group/request_to_join.xhtml
@@ -9,7 +9,7 @@
 
    <ui:param name="showGlobalMessages" value="true"/>
 
-   <ui:define name="page_title">#{messages['jsf.RequestToJoinVersionGroupTitle']}</ui:define>
+   <ui:define name="page_title">#{messages['jsf.RequestToJoinVersionGroup']}</ui:define>
 
    <ui:define name="center_content">
        <ui:include src="../WEB-INF/layout/version_group_join.xhtml" />

diff --git a/zanata-war/src/main/webapp/version-group/version_group.xhtml b/zanata-war/src/main/webapp/version-group/version_group.xhtml
@@ -12,6 +12,9 @@
 <ui:define name="page_title">#{messages['jsf.Groups']}:#{versionGroupHome.instance.name}</ui:define>
 
 <ui:define name="head">
+		<!-- Load jQuery -->
+        <rich:jQuery query="jquery"/>
+
     <script type="text/javascript">
         function submitSearchOnEnter(e)
         {