Merge branch 'master' into EnableChat

zanata · Jun 5, 2012 · 87fea6e · 87fea6e
2 parents cb05ffe + 325f354
commit 87fea6e
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 22 deletions.
diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
@@ -222,6 +222,7 @@ jsf.GenerateProjectConfig=Generate project configuration file (zanata.xml)
 jsf.Glossary=Glossary
 jsf.GlossaryEntries=Glossary entries
 jsf.GlossaryStatistics=Glossary Statistics
+jsf.GroupName=Group Name
 jsf.GroupId=Group ID
 jsf.GroupIdExample=Example: my-group
 jsf.GroupMaintainers=Group Maintainers
@@ -291,7 +292,7 @@ jsf.ManufacturerInfo=Red Hat, Inc
 jsf.ServerMonitoring=Server Monitoring
 jsf.MyProfile=My Profile
 jsf.Name=Name
-jsf.NameCreateANewVersion=#{projectIterationHome.instance.project.name}: Create a New Version
+jsf.CreateANewVersion=Create a New Version
 jsf.NameToolTip=The name should be first letter capitalized.
 jsf.NativeName=Native Name
 jsf.NeedReview=Need Review

diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -15,7 +15,7 @@
 
 		<h1>
 	       #{messages['jsf.ProjectId']}:&nbsp;
-	       <s:link view="/project/view/#{viewAllStatusAction.projectSlug}">
+	       <s:link view="/project/view/#{viewAllStatusAction.projectSlug}" styleClass="table_link">
 	           #{viewAllStatusAction.projectSlug}
 	       </s:link>
 	    </h1>

diff --git a/zanata-war/src/main/webapp/language/language.xhtml b/zanata-war/src/main/webapp/language/language.xhtml
@@ -10,6 +10,20 @@
     template="../WEB-INF/layout/template.xhtml">
 
     <ui:define name="page_title">#{languageTeamAction.locale.retrieveDisplayName()} Team</ui:define>
+
+    <ui:define name="head">
+        <script type="text/javascript">
+            function submitSearchOnEnter(e)
+            {
+                if(e.keyCode == 13 )
+                {
+                    #{rich:element('searchBtn')}.click();
+                    return false;
+                }
+            }
+        </script>
+    </ui:define>
+
     <ui:define name="center_content">
         <rich:jQuery selector="#tab_tribes" query="addClass('ui-tabs-selected')" />
         <a4j:form>
@@ -77,14 +91,6 @@
             <s:conversationId name="id" value="#{languageTeamAction.language}"/>
           </a4j:commandLink>
           <s:link styleClass="action_link" value="#{messages['jsf.RequestToJoinLanguageTeam']}" view="/language/join/#{languageTeamAction.language}" rendered="#{identity.loggedIn and not languageTeamAction.isUserInTeam()}" />
-            <!--
-          <s:link styleClass="action_link" value="#{messages['jsf.contactLanguageTeamCoordinator']}" view="/language/contact_coordinator.xhtml" propagation="none"  rendered="#{identity.loggedIn}">
-            using this param is not as clean as I'd like, but seems to be the only way to get a literal
-                 value into a bean. Ideally this should be inserted in pages.xml somehow
-            <f:param name="emailType" value="contact_coordinator" />
-            <f:param name="id" value="#{languageTeamAction.language}" />
-          </s:link>
-                 -->
           <s:link styleClass="action_link" value="#{messages['jsf.contactLanguageTeamCoordinator']}" view="/language/contact/#{languageTeamAction.language}" propagation="none"  rendered="#{identity.loggedIn}" />
           <h:outputText rendered="#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}">
             <a href="#" class="action_link" onclick="#{rich:component('userAddPanel')}.show()">#{messages['jsf.AddTeamMember']}</a>
@@ -97,8 +103,10 @@
           <a4j:form>
             <h1>Find Users To Add</h1>
             <p>
-              <h:inputText value="#{languageTeamAction.searchTerm}" />
-              <a4j:commandButton value="#{messages['jsf.Search']}"
+              <h:inputText value="#{languageTeamAction.searchTerm}"
+                           onkeydown="return submitSearchOnEnter(event);"/>
+              <a4j:commandButton id="searchBtn"
+                                 value="#{messages['jsf.Search']}"
                                  action="#{languageTeamAction.searchForTeamMembers}"
                                  reRender="searchResults"
                                  status="searchStatus" />

diff --git a/zanata-war/src/main/webapp/project/add_iteration.xhtml b/zanata-war/src/main/webapp/project/add_iteration.xhtml
@@ -8,11 +8,17 @@
     xmlns:rich="http://richfaces.org/rich"
     template="../WEB-INF/layout/template.xhtml">
 
-<ui:define name="page_title">#{projectHome.instance.name} - Add Version</ui:define>
+<ui:define name="page_title">#{projectIterationHome.instance.project.name} - Add Version</ui:define>
 <ui:define name="center_content">
     <rich:jQuery selector="#tab_projects" query="addClass('ui-tabs-selected')" />
-    <h1>#{messages['jsf.NameCreateANewVersion']}</h1>
-
+	<h1>
+	      #{messages['jsf.ProjectName']}:&nbsp;
+	      <s:link id="project" styleClass="table_link" value="#{projectIterationHome.instance.project.name}" view="/project/project.xhtml"> 
+          	<f:param name="slug" value="#{projectIterationHome.instance.project.slug}"/>
+          </s:link>
+	  </h1>
+
+
     <ui:include src="../WEB-INF/layout/iteration_edit_form.xhtml" />
 
 </ui:define>

diff --git a/zanata-war/src/main/webapp/project/assign_maintainer.xhtml b/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
@@ -26,6 +26,15 @@
           return confirm("#{messages['jsf.AreYouSureYouWishToRemoveThisPersonAsProjectMaintainer']}");
         }
       </script>
+
+      <h1>
+	      #{messages['jsf.ProjectName']}:&nbsp;
+	      <s:link id="project" styleClass="table_link" value="#{projectHome.instance.name}" view="/project/project.xhtml"> 
+          	<f:param name="slug" value="#{projectHome.instance.slug}"/>
+          </s:link>
+	  </h1>
+
+
       <rich:panel rendered="#{s:hasPermission(projectMaintainerManageAction.project, 'update')}">
         <f:facet name="header">#{messages['jsf.ProjectMaintainerManager']}</f:facet>
 		<h:messages />

diff --git a/zanata-war/src/main/webapp/project/edit.xhtml b/zanata-war/src/main/webapp/project/edit.xhtml
@@ -11,7 +11,13 @@
 <ui:define name="page_title">#{projectHome.instance.name} - Edit</ui:define>
 <ui:define name="center_content">
     <rich:jQuery selector="#tab_projects" query="addClass('ui-tabs-selected')" />
-    <h1>#{projectHome.instance.name}</h1>
+
+    <h1>
+	      #{messages['jsf.ProjectName']}:&nbsp;
+	      <s:link id="project" styleClass="table_link" value="#{projectHome.instance.name}" view="/project/project.xhtml"> 
+          	<f:param name="slug" value="#{projectHome.instance.slug}"/>
+          </s:link>
+	</h1>
 
     <ui:include src="../WEB-INF/layout/project_edit_form.xhtml" />
 

diff --git a/zanata-war/src/main/webapp/project/homepage_edit.xhtml b/zanata-war/src/main/webapp/project/homepage_edit.xhtml
@@ -11,7 +11,13 @@
    <ui:define name="page_title">#{projectHome.instance.name} - Edit Home</ui:define>
 	<ui:define name="center_content">
 	    <rich:jQuery selector="#tab_projects" query="addClass('ui-tabs-selected')" />
-	    <h1>#{projectHome.instance.name}</h1>
+
+		<h1>
+	      #{messages['jsf.ProjectName']}:&nbsp;
+	      <s:link id="project" styleClass="table_link" value="#{projectHome.instance.name}" view="/project/project.xhtml"> 
+          	<f:param name="slug" value="#{projectHome.instance.slug}"/>
+          </s:link>
+		</h1>
 
 	    <h:form>
 		    <rich:panel>

diff --git a/zanata-war/src/main/webapp/stylesheet/zanata.css b/zanata-war/src/main/webapp/stylesheet/zanata.css
@@ -232,12 +232,12 @@ a.table_link {
 	font-size: 14px;
 	font-weight: bold;
 	padding: 4px;
-	-moz-border-radius: 5px;
 	border-radius: 5px;
 	color: #7092C3;
 	text-decoration: none;
 	margin: 1px;
 	text-align: right;
+	outline:none;
 }
 
 a.table_link:hover {

diff --git a/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml b/zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
@@ -9,7 +9,7 @@
     xmlns:a4j="http://richfaces.org/a4j"
     template="../WEB-INF/layout/template.xhtml">
 
-    <ui:define name="page_title">#{messages['jsf.Groups']}:#{messages['jsf.AddGroupMaintainer']}</ui:define>
+    <ui:define name="page_title">#{messages['jsf.Groups']}:#{versionGroupHome.instance.name}:#{messages['jsf.AddGroupMaintainer']}</ui:define>
     <ui:define name="left_content">
 		<rich:panel>
             <f:facet name="header">#{messages['jsf.Actions']}</f:facet>
@@ -27,6 +27,14 @@
           return confirm("#{messages['jsf.AreYouSureYouWishToRemoveThisPersonAsVersionGroupMaintainer']}");
         }
       </script>
+
+      	<h1>
+	      #{messages['jsf.GroupName']}:&nbsp;
+	      <s:link id="versionGroup" styleClass="table_link" value="#{versionGroupHome.instance.name}" view="/version-group/version_group.xhtml"> 
+          	<f:param name="slug" value="#{versionGroupHome.instance.slug}"/>
+          </s:link>
+	    </h1>
+
       <rich:panel rendered="#{s:hasPermission(versionGroupMaintainerManageAction.iterationGroup, 'update')}">
         <f:facet name="header">#{messages['jsf.GroupMaintainers']}</f:facet>
 		<h:messages />

diff --git a/zanata-war/src/main/webapp/version-group/edit.xhtml b/zanata-war/src/main/webapp/version-group/edit.xhtml
@@ -11,7 +11,15 @@
 <ui:define name="page_title">#{messages['jsf.Groups']}:#{versionGroupHome.instance.name} - Edit</ui:define>
 <ui:define name="center_content">
     <rich:jQuery selector="#tab_version_groups" query="addClass('ui-tabs-selected')" />
-    <h1>#{versionGroupHome.instance.name}</h1>
+
+    <h1>
+	      #{messages['jsf.GroupName']}:&nbsp;
+	      <s:link id="versionGroup" styleClass="table_link" value="#{versionGroupHome.instance.name}" view="/version-group/version_group.xhtml"> 
+          	<f:param name="slug" value="#{versionGroupHome.instance.slug}"/>
+          </s:link>
+	</h1>
+
+
 
     <ui:include src="../WEB-INF/layout/version_group_edit_form.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
@@ -10,11 +10,26 @@
     template="../WEB-INF/layout/template.xhtml">
 
 <ui:define name="page_title">#{messages['jsf.Groups']}:#{versionGroupHome.instance.name}</ui:define>
+
+<ui:define name="head">
+    <script type="text/javascript">
+        function submitSearchOnEnter(e)
+        {
+            if(e.keyCode == 13 )
+            {
+                #{rich:element('searchBtn')}.click();
+                return false;
+            }
+        }
+    </script>
+</ui:define>
+
 <ui:define name="center_content">
     <a4j:form>
     	<rich:jQuery selector="#tab_version_groups" query="addClass('ui-tabs-selected')" />
 
     	 <h1>#{messages['jsf.GroupId']}: #{versionGroupHome.instance.slug}</h1>
+    	 <h1>#{messages['jsf.Name']}: #{versionGroupHome.instance.name}</h1>
 
     	 <s:formattedText value="#{versionGroupHome.instance.description}" rendered="#{!empty versionGroupHome.instance.description}"/>
 
@@ -72,8 +87,10 @@
             <a4j:form>
                 <h1>Find Project Version</h1>
                 <p>
-                    <h:inputText value="#{versionGroupAction.searchTerm}" />
-                    <a4j:commandButton value="#{messages['jsf.Search']}"
+                    <h:inputText value="#{versionGroupAction.searchTerm}"
+                                 onkeydown="return submitSearchOnEnter(event)"/>
+                    <a4j:commandButton id="searchBtn"
+                                       value="#{messages['jsf.Search']}"
                                        action="#{versionGroupAction.searchProjectAndVersion}"
                                        reRender="searchResults"
                                        status="searchStatus" />