[MRM-943] only show "search within results" on the results page, and improve the...

Merged from: r694533 on trunk

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.1.x@694535 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
deleted file mode 100644 (file)
index 14693aa..0000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf
+++ /dev/null
@@ -1,40 +0,0 @@
-<%--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  --%>
-
-<%@ taglib prefix="ww" uri="/webwork" %>
-
-<div id="searchBox">
-  <ww:form method="get" action="quickSearch" validate="true">
-    <ww:textfield label="Search for" size="50" name="q"/>
-    <ww:checkbox label="Search Results Only" 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>
-    Enter your search terms. A variety of data will be searched for your keywords.<br/>
-    To search for java classes, packages or methods, append the keyword "<i>bytecode:</i>" 
-    to your query. Example, bytecode:MyClass or bytecode:myMethod 
-    <ww:actionerror/>
-  </p>
-</div>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
index 690ea4f257a03f1f64d81cb5f516f479fa5db07a..537bc6c84cf5f55b1dd285c34619ad3be60a5ca1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
@@ -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>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
index 8d490bae975891c5e35cddd0f05143e9cb6dee64..889fa75ddd27db64ed5723a71ed447b1241207ae 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
@@ -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>