Author: oching
Date: Sat Mar 14 04:16:34 2009
New Revision: 753598
URL: http://svn.apache.org/viewvc?rev=753598&view=rev
Log:
[MRM-1117]
o move advanced search out of the 'info' pop up, added a link of it's own
instead
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java?rev=753598&r1=753597&r2=753598&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
Sat Mar 14 04:16:34 2009
@@ -22,7 +22,7 @@
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 @@
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" );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp?rev=753598&r1=753597&r2=753598&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp
Sat Mar 14 04:16:34 2009
@@ -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
