Menu
▾
▴
treebase-guts
|
[Treebase-guts] SF.net SVN: treebase:[1077]
trunk/treebase-web/src/main/webapp/WEB-INF/ pages/search
From: <rv...@us...> - 2012-02-20 21:03:37
|
Revision: 1077
http://treebase.svn.sourceforge.net/treebase/?rev=1077&view=rev
Author: rvos
Date: 2012-02-20 21:03:30 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Testing out simple search form in place of taxon search form.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/taxonSearch.jsp
Added Paths:
-----------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/simpleSearchForm.jsp
Added: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/simpleSearchForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/simpleSearchForm.jsp (rev 0)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/simpleSearchForm.jsp 2012-02-20 21:03:30 UTC (rev 1077)
@@ -0,0 +1,11 @@
+<form onsubmit="return TreeBASE.redirect(phyloWSURI + escape($('expanded').value));">
+ <input type="text" id="query" onchange="return TreeBASE.expandQuery();"/>
+ <input type="submit" onclick="return TreeBASE.redirect(phyloWSURI + escape($('expanded').value));" value="Go"/><br/>
+ <input type="radio" name="join" onclick="TreeBASE.expandQuery(); return true;" id="all" value="and"/> All
+ <input type="radio" name="join" onclick="TreeBASE.expandQuery(); return true;" value="or" checked="checked"/> Any<br/>
+ <a onclick="TreeBASE.collapseExpand('expanded','block',this)" id="expander">
+ <img src="http://www.treebase.org/treebase-web/images/plus.gif"/>
+ <small style="color:silver">Advanced search</small>
+ </a>
+ <textarea id="expanded" style="display:none;width:500px;height:300px"></textarea><br/>
+</form>
\ No newline at end of file
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-20 20:32:40 UTC (rev 1076)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/taxonSearch.jsp 2012-02-20 21:03:30 UTC (rev 1077)
@@ -25,8 +25,9 @@
<c:set var="searchType" value="taxon" scope="request"/>
-<jsp:include page="taxonSearchForm.jsp"/>
+<%--jsp:include page="taxonSearchForm.jsp"/ --%>
+<jsp:include page="simpleSearchForm.jsp"/>
<div id="s-clear"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
[Treebase-guts] SF.net SVN: treebase:[1078]
trunk/treebase-web/src/main/webapp/WEB-INF/ pages/search
From: <rv...@us...> - 2012-02-20 21:24:38
|
Revision: 1078
http://treebase.svn.sourceforge.net/treebase/?rev=1078&view=rev
Author: rvos
Date: 2012-02-20 21:24:31 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Prettifying simple taxon search form
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/simpleSearchForm.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/taxonSearch.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/simpleSearchForm.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/simpleSearchForm.jsp 2012-02-20 21:03:30 UTC (rev 1077)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/simpleSearchForm.jsp 2012-02-20 21:24:31 UTC (rev 1078)
@@ -1,11 +1,12 @@
-<form onsubmit="return TreeBASE.redirect(phyloWSURI + escape($('expanded').value));">
- <input type="text" id="query" onchange="return TreeBASE.expandQuery();"/>
- <input type="submit" onclick="return TreeBASE.redirect(phyloWSURI + escape($('expanded').value));" value="Go"/><br/>
- <input type="radio" name="join" onclick="TreeBASE.expandQuery(); return true;" id="all" value="and"/> All
- <input type="radio" name="join" onclick="TreeBASE.expandQuery(); return true;" value="or" checked="checked"/> Any<br/>
- <a onclick="TreeBASE.collapseExpand('expanded','block',this)" id="expander">
- <img src="http://www.treebase.org/treebase-web/images/plus.gif"/>
- <small style="color:silver">Advanced search</small>
- </a>
- <textarea id="expanded" style="display:none;width:500px;height:300px"></textarea><br/>
-</form>
\ No newline at end of file
+
+ <form onsubmit="return TreeBASE.redirect(phyloWSURI + escape($('expanded').value));">
+ <input type="text" id="query" onchange="return TreeBASE.expandQuery();" class="textCell" style="width:150px" />
+ <input type="submit" onclick="return TreeBASE.redirect(phyloWSURI + escape($('expanded').value));" value="Go"/><br/>
+ <input type="radio" name="join" onclick="TreeBASE.expandQuery(); return true;" id="all" value="and"/> All
+ <input type="radio" name="join" onclick="TreeBASE.expandQuery(); return true;" value="or" checked="checked"/> Any<br/>
+ <a onclick="TreeBASE.collapseExpand('expanded','block',this)" id="expander">
+ <img src="http://www.treebase.org/treebase-web/images/plus.gif"/>
+ <small style="color:silver">Advanced search</small>
+ </a>
+ <textarea id="expanded" style="display:none;width:500px;height:300px"></textarea><br/>
+ </form>
\ No newline at end of file
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-20 21:03:30 UTC (rev 1077)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/taxonSearch.jsp 2012-02-20 21:24:31 UTC (rev 1078)
@@ -27,7 +27,15 @@
<%--jsp:include page="taxonSearchForm.jsp"/ --%>
+<fieldset>
+ <legend>
+ Taxon search
+ <a href="#" class="openHelp" onclick="openHelp('taxonSearchTextSearch')">
+ <img class="iconButton" src="<fmt:message key="icons.help"/>" />
+ </a>
+ </legend>
<jsp:include page="simpleSearchForm.jsp"/>
+</fieldset>
<div id="s-clear"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
[Treebase-guts] SF.net SVN: treebase:[1086]
trunk/treebase-web/src/main/webapp/WEB-INF/ pages/search
From: <rv...@us...> - 2012-02-22 19:24:39
|
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.
|
Thanks for helping keep SourceForge clean.
X