[Treebase-guts] SF.net SVN: treebase:[1086] trunk/treebase-web/src/main/webapp/WEB-INF/ pages/search

[<rv...@us...>]

Revision: 1086
          http://treebase.svn.sourceforge.net/treebase/?rev=1086&view=rev
Author:   rvos
Date:     2012-02-22 19:24:32 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Deploying simple search box for all searches.

Modified Paths:
--------------
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/matrixSearch.jsp
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/studySearch.jsp
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/taxonSearch.jsp
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeSearch.jsp

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/matrixSearch.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/matrixSearch.jsp	2012-02-21 22:38:31 UTC (rev 1085)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/matrixSearch.jsp	2012-02-22 19:24:32 UTC (rev 1086)
@@ -15,16 +15,25 @@
       'integer' : [ 'tb.identifier.matrix', 'tb.identifier.matrix.tb1', 'tb.ntax.matrix', 'tb.nchar.matrix' ],
       'id' : [ 'tb.identifier.matrix', 'tb.identifier.matrix.tb1' ],
       'word' : [ 'tb.title.matrix', 'tb.type.matrix' ],
-      'doi' : [ 'prism.doi' ] // this doesn't work yet, we have no search on doi
     };
     
- 	// purlBase is assigned in /common/search-nav.jsp
+    // purlBase is assigned in /common/search-nav.jsp
     var phyloWSURI = purlBase + 'matrix/find?query=';
   //]]>
 </script>
 
-<jsp:include page="matrixSimpleSearchForm.jsp"/>
+<%-- jsp:include page="matrixSimpleSearchForm.jsp"/ --%>
 
+<fieldset>
+	<legend>
+	  	Matrix search
+		<a href="#" class="openHelp" onclick="openHelp('matrixSimpleSearchForm')">
+			<img class="iconButton" src="<fmt:message key="icons.help"/>" />
+		</a>	  		
+	</legend>
+<jsp:include page="simpleSearchForm.jsp"/>
+</fieldset>
+
 <c:set var="searchType" value="matrix" scope="request"/>
 
 <div id="s-clear"></div>

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/studySearch.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/studySearch.jsp	2012-02-21 22:38:31 UTC (rev 1085)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/studySearch.jsp	2012-02-22 19:24:32 UTC (rev 1086)
@@ -20,15 +20,25 @@
       'doi' : [ 'prism.doi' ]
     };
     
- 	// purlBase is assigned in /common/search-nav.jsp
+    // purlBase is assigned in /common/search-nav.jsp
     var phyloWSURI = purlBase + 'study/find?query=';
   //]]>
 </script>
 
 <c:set var="searchType" value="study" scope="request"/>
 
-<jsp:include page="studyKeywordSearchForm.jsp"/>
+<%-- jsp:include page="studyKeywordSearchForm.jsp"/ --%>
 
+<fieldset>
+	<legend>
+	  	Study search
+		<a href="#" class="openHelp" onclick="openHelp('studyKeywordSearchForm')">
+			<img class="iconButton" src="<fmt:message key="icons.help"/>" />
+		</a>	  		
+	</legend>
+<jsp:include page="simpleSearchForm.jsp"/>
+</fieldset>
+
 <div id="s-clear"></div>
 
 <jsp:include page="searchMessages.jsp"/>

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/taxonSearch.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/taxonSearch.jsp	2012-02-21 22:38:31 UTC (rev 1085)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/taxonSearch.jsp	2012-02-22 19:24:32 UTC (rev 1086)
@@ -15,10 +15,9 @@
       'integer' : [ 'tb.identifier.ncbi', 'tb.identifier.ubio', 'tb.identifier.taxon', 'tb.identifier.taxon.tb1' ],
       'id' : [ 'tb.identifier.taxon', 'tb.identifier.taxon.tb1' ],
       'word' : [ 'tb.title.taxon', 'tb.title.taxonLabel', 'tb.title.taxonVariant' ],
-      'doi' : [ 'prism.doi' ] // this doesn't work yet, we have no search on doi
     };
     
- 	// purlBase is assigned in /common/search-nav.jsp
+    // purlBase is assigned in /common/search-nav.jsp
     var phyloWSURI = purlBase + 'taxon/find?query=';
   //]]>
 </script>

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeSearch.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeSearch.jsp	2012-02-21 22:38:31 UTC (rev 1085)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeSearch.jsp	2012-02-22 19:24:32 UTC (rev 1086)
@@ -19,13 +19,23 @@
       'word' : [ 'tb.title.tree', 'tb.type.tree', 'tb.kind.tree', 'tb.quality.tree' ],
     };
     
- 	// purlBase is assigned in /common/search-nav.jsp
+    // purlBase is assigned in /common/search-nav.jsp
     var phyloWSURI = purlBase + 'tree/find?query=';
   //]]>
 </script>
 
-<jsp:include page="treeSimpleSearchForm.jsp"/>
+<%-- jsp:include page="treeSimpleSearchForm.jsp"/ --%>
 
+<fieldset>
+	<legend>
+	  	Tree search
+		<a href="#" class="openHelp" onclick="openHelp('treeSimpleSearchForm')">
+			<img class="iconButton" src="<fmt:message key="icons.help"/>" />
+		</a>	  		
+	</legend>
+<jsp:include page="simpleSearchForm.jsp"/>
+</fieldset>
+
 <c:set var="searchType" value="tree" scope="request"/>
 
 <div id="s-clear"></div>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.