Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[871] trunk/treebase-web/src/main
|
From: <hs...@us...> - 2011-05-17 21:03:45
|
Revision: 871
http://treebase.svn.sourceforge.net/treebase/?rev=871&view=rev
Author: hshyket
Date: 2011-05-17 21:03:38 +0000 (Tue, 17 May 2011)
Log Message:
-----------
Changing search so that there are no longer multiple buttons but a dropdown of the list of options
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/matrixSimpleSearchForm.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/studyKeywordSearchForm.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeSimpleSearchForm.jsp
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2011-05-17 20:17:26 UTC (rev 870)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java 2011-05-17 21:03:38 UTC (rev 871)
@@ -378,6 +378,7 @@
protected void saveSearchResults(HttpServletRequest request, SearchResults<?> results) {
request.getSession().setAttribute("searchResults", results == null ? null : results.freeze());
request.getSession().setAttribute("searchTerm", request.getParameter("searchTerm"));
+ request.getSession().setAttribute("searchButton", request.getParameter("searchButton"));
}
abstract SearchResultsType currentSearchType() ;
@@ -477,6 +478,17 @@
return matches;
}
+ protected Map<String,Object> referenceData(HttpServletRequest pRequest) throws Exception {
+ LOGGER.info("in referenceData");
+
+ Map<String,Object> resultMap = new HashMap<String,Object>();
+
+ resultMap.put("buttonName", pRequest.getSession().getAttribute("searchButton"));
+
+ return resultMap;
+
+ }
+
public SearchService getSearchService() {
return searchService;
}
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/matrixSimpleSearchForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/matrixSimpleSearchForm.jsp 2011-05-17 20:17:26 UTC (rev 870)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/matrixSimpleSearchForm.jsp 2011-05-17 21:03:38 UTC (rev 871)
@@ -1,13 +1,26 @@
<%@ include file="/common/taglibs.jsp"%>
+<%
+ java.util.LinkedHashMap searchOptions = new java.util.LinkedHashMap();
+ searchOptions.put("matrixID", "Matrix ID");
+ searchOptions.put("matrixTitle", "Title");
+ searchOptions.put("matrixType", "Type");
+ searchOptions.put("matrixNTAX", "NTAX");
+ searchOptions.put("matrixNCHAR", "NCHAR");
+
+ pageContext.setAttribute("searchOptions", searchOptions);
+%>
<form id="searchSimple" method="post">
<fieldset>
Search: <input type="hidden" name="formName" value="matrixSimple"/>
<input type=text class="textCell" style="width:150px" name="searchTerm" id="keyword" value="${searchTerm}"/>
- <button type="submit" name="searchButton" value="matrixID">Matrix ID</button>
- <button type="submit" name="searchButton" value="matrixTitle">Title</button>
- <button type="submit" name="searchButton" value="matrixType">Type</button>
- <button type="submit" name="searchButton" value="matrixNTAX">NTAX</button>
- <button type="submit" name="searchButton" value="matrixNCHAR">NCHAR</button>
+ <select name="searchButton">
+ <c:forEach var="options" items="${searchOptions}">
+ <option value="${options.key}" <c:if test="${options.key == searchButton}">selected="selected"</c:if> />
+ ${options.value}
+ </option>
+ </c:forEach>
+ </select>
+ <button type="submit" name="submit" >Search</button>
<a href="#" class="openHelp" onclick="openHelp('matrixSimpleSearchForm')">
<img class="iconButton" src="<fmt:message key="icons.help"/>" />
</a>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/studyKeywordSearchForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/studyKeywordSearchForm.jsp 2011-05-17 20:17:26 UTC (rev 870)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/studyKeywordSearchForm.jsp 2011-05-17 21:03:38 UTC (rev 871)
@@ -1,16 +1,30 @@
<%@ include file="/common/taglibs.jsp"%>
+<%
+ java.util.LinkedHashMap searchOptions = new java.util.LinkedHashMap();
+ searchOptions.put("studyID", "Study ID");
+ searchOptions.put("legacyStudyID", "Legacy Study ID");
+ searchOptions.put("authorKeyword", "Author");
+ searchOptions.put("titleKeyword", "Title");
+ searchOptions.put("abstractKeyword", "Abstract");
+ searchOptions.put("citationKeyword", "Entire citation");
+ searchOptions.put("textKeyword", "All text");
+
+ pageContext.setAttribute("searchOptions", searchOptions);
+
+%>
<form id="searchSimple" method="post">
<fieldset>
For study IDs with values less than 3000, please search using the "Legacy Study ID" button.<br>
Search: <input type="hidden" name="formName" value="searchKeyword"/>
<input type="text" class="textCell" style="width:150px" name="searchTerm" id="keyword" value="${searchTerm}"/>
- <button type="submit" name="searchButton" value="studyID">Study ID</button>
- <button type="submit" name="searchButton" value="legacyStudyID">Legacy Study ID</button>
- <button type="submit" name="searchButton" value="authorKeyword">Author</button>
- <button type="submit" name="searchButton" value="titleKeyword">Title</button>
- <button type="submit" name="searchButton" value="abstractKeyword">Abstract</button>
- <button type="submit" name="searchButton" value="citationKeyword">Entire citation</button>
- <button type="submit" name="searchButton" value="textKeyword">All text</button>
+ <select name="searchButton">
+ <c:forEach var="options" items="${searchOptions}">
+ <option value="${options.key}" <c:if test="${options.key == searchButton}">selected="selected"</c:if> />
+ ${options.value}
+ </option>
+ </c:forEach>
+ </select>
+ <button type="submit" name="submit" >Search</button>
<a href="#" class="openHelp" onclick="openHelp('studyKeywordSearchForm')">
<img class="iconButton" src="<fmt:message key="icons.help"/>" />
</a>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeSimpleSearchForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeSimpleSearchForm.jsp 2011-05-17 20:17:26 UTC (rev 870)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeSimpleSearchForm.jsp 2011-05-17 21:03:38 UTC (rev 871)
@@ -1,14 +1,27 @@
<%@ include file="/common/taglibs.jsp"%>
+<%
+ java.util.LinkedHashMap searchOptions = new java.util.LinkedHashMap();
+ searchOptions.put("treeID", "Tree ID");
+ searchOptions.put("treeTitle", "Title");
+ searchOptions.put("treeType", "Type");
+ searchOptions.put("treeKind", "Kind");
+ searchOptions.put("treeQuality", "Quality");
+ searchOptions.put("treeNTAX", "NTAX");
+
+ pageContext.setAttribute("searchOptions", searchOptions);
+%>
<form id="searchSimple" method="post">
<fieldset>
Search: <input type="hidden" name="formName" value="treeSimple"/>
<input type="text" class="textCell" style="width:150px" name="searchTerm" id="keyword" value="${searchTerm}"/>
- <button type="submit" name="searchButton" value="treeID">Tree ID</button>
- <button type="submit" name="searchButton" value="treeTitle">Title</button>
- <button type="submit" name="searchButton" value="treeType">Type</button>
- <button type="submit" name="searchButton" value="treeKind">Kind</button>
- <button type="submit" name="searchButton" value="treeQuality">Quality</button>
- <button type="submit" name="searchButton" value="treeNTAX">NTAX</button>
+ <select name="searchButton">
+ <c:forEach var="options" items="${searchOptions}">
+ <option value="${options.key}" <c:if test="${options.key == searchButton}">selected="selected"</c:if> />
+ ${options.value}
+ </option>
+ </c:forEach>
+ </select>
+ <button type="submit" name="submit" >Search</button>
<a href="#" class="openHelp" onclick="openHelp('treeSimpleSearchForm')">
<img class="iconButton" src="<fmt:message key="icons.help"/>" />
</a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
