archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r694535 - in /archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp: include/quickSearchForm.jspf quickSearch.jsp results.jsp
Date Thu, 11 Sep 2008 23:19:35 GMT
Author: brett
Date: Thu Sep 11 16:19:34 2008
New Revision: 694535

URL: http://svn.apache.org/viewvc?rev=694535&view=rev
Log:
[MRM-943] only show "search within results" on the results page, and improve the surrounding
text
Merged from: r694533 on trunk

Removed:
    archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
Modified:
    archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
    archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp

Modified: archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp?rev=694535&r1=694534&r2=694535&view=diff
==============================================================================
--- archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
(original)
+++ archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
Thu Sep 11 16:19:34 2008
@@ -33,8 +33,29 @@
 <h1>Search</h1>
 
 <div id="contentArea">
-  <%@ include file="/WEB-INF/jsp/include/quickSearchForm.jspf" %>
+<div id="searchBox">
+  <ww:form method="get" action="quickSearch" validate="true">
+    <ww:textfield label="Search for" size="50" name="q"/>
+    <ww:hidden name="completeQueryString" value="${completeQueryString}"/>        
+    <ww:submit label="Go!"/>
+  </ww:form>
+
+  <script type="text/javascript">
+    document.getElementById("quickSearch_q").focus();
+  </script>
+
+  <p>
+    <ww:actionerror/>
+  </p>
 </div>
 
+  <p>
+    Enter your search terms. A variety of data will be searched for your keywords.<br/>
+    To search for Java classes, packages or methods, use the keyword <code>bytecode:</code>
+    before the term. For example: 
+    <code>bytecode:MyClass</code>, or:
+    <code>bytecode:myMethod</code>
+  </p>
+</div>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp?rev=694535&r1=694534&r2=694535&view=diff
==============================================================================
--- archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
(original)
+++ archiva/branches/archiva-1.1.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
Thu Sep 11 16:19:34 2008
@@ -39,7 +39,20 @@
 
 <div id="contentArea">
   <div id="searchBox">
-    <%@ include file="/WEB-INF/jsp/include/quickSearchForm.jspf" %>
+  <ww:form method="get" action="quickSearch" validate="true">
+    <ww:textfield label="Search for" size="50" name="q"/>
+    <ww:checkbox label="Search within results" name="searchResultsOnly"/>        
+    <ww:hidden name="completeQueryString" value="${completeQueryString}"/>        
+    <ww:submit label="Go!"/>
+  </ww:form>
+
+  <script type="text/javascript">
+    document.getElementById("quickSearch_q").focus();
+  </script>
+
+  <p>
+    <ww:actionerror/>
+  </p>
   </div>
 
   <h1>Results</h1>



Mime
View raw message