[MRM-1117]

o move advanced search out of the 'info' pop up, added a link of it's own instead

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@753598 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
index c5d017bf7399deecd773a03c7d5f9c74d44e3131..dab1bf0ebc9daebb6cf3765678bb341d66080326 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.web.action;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -163,7 +163,7 @@ public class SearchAction
             managedRepositoryList.add( "all" );
         }
         
-        searchFields = new HashMap<String, String>();
+        searchFields = new LinkedHashMap<String, String>();
         searchFields.put( "groupId", "Group ID" );
         searchFields.put( "artifactId", "Artifact ID" );
         searchFields.put( "version", "Version" );

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 8d93fe90cb8b7e1cc54d09587724e2ca65bb8ef3..0fe76dcd0a223857c508898045d914fa37914c27 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
@@ -100,20 +100,8 @@
   <p>
     <s:actionerror/>
   </p>
-</div>
-
-<div id="searchHint">  
-  Enter your search terms. A variety of data will be searched for your keywords. <a class="expand" href="#"><img src="<c:url value="/images/icon_info_sml.gif"/>" /></a>
-  
-  <table class="settings">
-    <tr>
-      <td>
-        <b>*</b> To perform a boolean <code>NOT</code> search, use the keyword <code>NOT</code> after your search
-         term, followed by the term you want to exclude. For example, to exclude artifacts with 
-         a dependency on the artifact you are searching for from showing up in the search results:  
-         <code>myQueryTerm NOT dependency</code> 
-      </td>
-    </tr>
+  <a class="expand-search" href="#"><strong>Advanced Search >></strong></a>
+  <table class="settings-search">
     <tr>
       <td>
         <b>*</b> To do a filtered or advanced search, select the criteria from the list below and click the <img src="${iconCreateUrl}"/> icon. Specify the term you want to be matched in the created text field.
@@ -141,8 +129,23 @@
       </td>
     </tr>    
   </table>
+</div>
+
+<div id="searchHint">  
+  Enter your search terms. A variety of data will be searched for your keywords. <a class="expand" href="#"><img src="<c:url value="/images/icon_info_sml.gif"/>" /></a>
   
+  <table class="settings">
+    <tr>
+      <td>
+        <b>*</b> To perform a boolean <code>NOT</code> search, use the keyword <code>NOT</code> after your search
+         term, followed by the term you want to exclude. For example, to exclude artifacts with 
+         a dependency on the artifact you are searching for from showing up in the search results:  
+         <code>myQueryTerm NOT dependency</code> 
+      </td>
+    </tr>
+  </table>  
 </div>
+
 </div>
 </body>
 </html>
\ No newline at end of file