Search Projects- search box should be labelled, and possibly moved:ht…

…tps://bugzilla.redhat.com/show_bug.cgi?id=729556
zanata · Oct 20, 2011 · 31d60d1 · 31d60d1
1 parent 4c7f0e7
commit 31d60d1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 473 deletions.
diff --git a/server/zanata-war/src/main/resources/messages.properties b/server/zanata-war/src/main/resources/messages.properties
@@ -279,6 +279,7 @@ jsf.RoleManager=Role Manager
 jsf.RunningVersionInfo=Zanata version #{zanataInit.version} (#{zanataInit.buildTimestamp}).
 jsf.Save=Save
 jsf.Search=Search
+jsf.SearchProjects=Search Projects
 jsf.SearchResults=Search Results
 jsf.SelectedLocales=Enabled Locales
 jsf.ServerConfiguration=Server Configuration

diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
@@ -8,7 +8,7 @@
 
   <form method="get" action="#{request.contextPath}/search.seam">
      <h:inputText id="q" styleClass="with_icon search_icon"  value="#{projectSearch.searchQuery}"/>
-     <input type="submit" value="#{messages['jsf.Search']}"/>
+     <input type="submit" value="#{messages['jsf.SearchProjects']}"/>
   </form>
 
 </div>
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
@@ -55,16 +55,19 @@
 					</f:facet>
 					</a:status>
 				</div>
-				<ui:include src="search_panel.xhtml" />
+
 			</div>
 
 			<div id="tabs-menu">
         		<ui:include src="menu.xhtml">
 				<ui:param name="projectName" value="zanata" />
 				</ui:include>
 			</div>
+
+
 
 			<div id="bd">
+			    <ui:include src="search_panel.xhtml" />
 				<div id="yui-main">
 					<div class="yui-b">
 						<a:outputPanel ajaxRendered="true">