From 18fe74727bebbb89a1a35d0db42f51067659f662 Mon Sep 17 00:00:00 2001
From: HD Moore <hd_moore@rapid7.com>
Date: Mon, 16 Oct 2006 03:44:15 +0000
Subject: [PATCH] Cleaned up the search

git-svn-id: file:///home/svn/framework3/trunk@4032 4d416f70-5f16-0410-b530-b9f4589650da
---
 data/msfweb/app/views/auxiliaries/list.rhtml | 12 +++++++-----
 data/msfweb/app/views/encoders/list.rhtml    | 12 +++++++-----
 data/msfweb/app/views/exploits/list.rhtml    | 12 +++++++-----
 data/msfweb/app/views/nops/list.rhtml        | 12 +++++++-----
 data/msfweb/app/views/payloads/list.rhtml    | 12 +++++++-----
 data/msfweb/public/stylesheets/msfweb.css    |  2 +-
 data/msfweb/public/stylesheets/windows.css   | 20 ++++++++++++++++++--
 7 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/data/msfweb/app/views/auxiliaries/list.rhtml b/data/msfweb/app/views/auxiliaries/list.rhtml
index aea9e0f5d5..0dfb30e4d5 100644
--- a/data/msfweb/app/views/auxiliaries/list.rhtml
+++ b/data/msfweb/app/views/auxiliaries/list.rhtml
@@ -1,10 +1,12 @@
     <div id="module-search-box">
-        Search auxiliary modules:
-        <input id="auxiliary_search" name="terms" type="text" size="40" value=""/>
-        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+		
+        <span>Search</span>
+        <input id="module_search" name="terms" type="text" size="55" value=""/>
+		<img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
         <div id="search_results"></div>
     </div>
     
     <script type="text/javascript">
-        generic_live_search('auxiliary_search', 'auxiliaries', 'search_spinner', 0);
-    </script>
\ No newline at end of file
+		document.getElementById('module_search').focus();
+        generic_live_search('module_search', 'auxiliaries', 'search_spinner', 0);
+    </script>
diff --git a/data/msfweb/app/views/encoders/list.rhtml b/data/msfweb/app/views/encoders/list.rhtml
index e0da1c4aa6..ed4c115bd9 100644
--- a/data/msfweb/app/views/encoders/list.rhtml
+++ b/data/msfweb/app/views/encoders/list.rhtml
@@ -1,10 +1,12 @@
     <div id="module-search-box">
-        Search encoder modules:
-        <input id="encoder_search" name="terms" type="text" size="40" value=""/>
-        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+		
+        <span>Search</span>
+        <input id="module_search" name="terms" type="text" size="55" value=""/>
+		<img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
         <div id="search_results"></div>
     </div>
     
     <script type="text/javascript">
-        generic_live_search('encoder_search', 'encoders', 'search_spinner', 0);
-    </script>
\ No newline at end of file
+		document.getElementById('module_search').focus();
+        generic_live_search('module_search', 'encoders', 'search_spinner', 0);
+    </script>
diff --git a/data/msfweb/app/views/exploits/list.rhtml b/data/msfweb/app/views/exploits/list.rhtml
index 4a120ea28b..d17be01c72 100644
--- a/data/msfweb/app/views/exploits/list.rhtml
+++ b/data/msfweb/app/views/exploits/list.rhtml
@@ -1,10 +1,12 @@
     <div id="module-search-box">
-        Search exploit modules:
-        <input id="exploit_search" name="terms" type="text" size="40" value=""/>
-        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+		
+        <span>Search</span>
+        <input id="module_search" name="terms" type="text" size="55" value=""/>
+		<img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
         <div id="search_results"></div>
     </div>
     
     <script type="text/javascript">
-        generic_live_search('exploit_search', 'exploits', 'search_spinner', 0);
-    </script>
\ No newline at end of file
+		document.getElementById('module_search').focus();
+        generic_live_search('module_search', 'exploits', 'search_spinner', 0);
+    </script>
diff --git a/data/msfweb/app/views/nops/list.rhtml b/data/msfweb/app/views/nops/list.rhtml
index e45b5e0234..ce634c0ae4 100644
--- a/data/msfweb/app/views/nops/list.rhtml
+++ b/data/msfweb/app/views/nops/list.rhtml
@@ -1,10 +1,12 @@
     <div id="module-search-box">
-        Search NOP (No-Op) modules:
-        <input id="nop_search" name="terms" type="text" size="40" value=""/>
-        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+		
+        <span>Search</span>
+        <input id="module_search" name="terms" type="text" size="55" value=""/>
+		<img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
         <div id="search_results"></div>
     </div>
     
     <script type="text/javascript">
-        generic_live_search('nop_search', 'nops', 'search_spinner', 0);
-    </script>
\ No newline at end of file
+		document.getElementById('module_search').focus();
+        generic_live_search('module_search', 'nops', 'search_spinner', 0);
+    </script>
diff --git a/data/msfweb/app/views/payloads/list.rhtml b/data/msfweb/app/views/payloads/list.rhtml
index 22d253ef1b..579061d1bb 100644
--- a/data/msfweb/app/views/payloads/list.rhtml
+++ b/data/msfweb/app/views/payloads/list.rhtml
@@ -1,10 +1,12 @@
     <div id="module-search-box">
-        Search payload modules:
-        <input id="payload_search" name="terms" type="text" size="40" value=""/>
-        <img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
+		
+        <span>Search</span>
+        <input id="module_search" name="terms" type="text" size="55" value=""/>
+		<img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
         <div id="search_results"></div>
     </div>
     
     <script type="text/javascript">
-        generic_live_search('payload_search', 'payloads', 'search_spinner', 0);
-    </script>
\ No newline at end of file
+		document.getElementById('module_search').focus();
+        generic_live_search('module_search', 'payloads', 'search_spinner', 0);
+    </script>
diff --git a/data/msfweb/public/stylesheets/msfweb.css b/data/msfweb/public/stylesheets/msfweb.css
index 8bee884bb0..6d2c933db9 100644
--- a/data/msfweb/public/stylesheets/msfweb.css
+++ b/data/msfweb/public/stylesheets/msfweb.css
@@ -84,4 +84,4 @@ body {
     float: right;
     border-left: 1px solid #ddd;
     padding: 3px;
-}
\ No newline at end of file
+}
diff --git a/data/msfweb/public/stylesheets/windows.css b/data/msfweb/public/stylesheets/windows.css
index ab3c11d597..2f015dde19 100644
--- a/data/msfweb/public/stylesheets/windows.css
+++ b/data/msfweb/public/stylesheets/windows.css
@@ -60,14 +60,30 @@ table .itemDescription:hover {
     color: #000;
 }
 
+#module-search-box span {
+	font-variant: small-caps;
+	font-weight: bold;
+	font-size: 18px;
+	text-align: center;
+	color: #444444;
+	padding-left: 25px;
+}
+
 #module-search-box input {
+/*
     background-image: url(/images/zoom.png);
     background-position: 5px;
     background-repeat: no-repeat;
     padding-left: 2em;
     height: 18px;
+*/
+	padding: 2px 2px 2px 6px;
     border: 1px solid #444;
-    margin-bottom: 0.2em;
+	background: #eeeeee;
+}
+
+#search_results {
+	padding-top: 1em;
 }
 
 table.moduleInfo tr td {
@@ -100,4 +116,4 @@ th.moduleOptionsHeader {
     background: #ddd;
     color: #000;
     text-transform: uppercase;
-}
\ No newline at end of file
+}