From 17e4063ae342f06de7e8e6c957334380ca7ff906 Mon Sep 17 00:00:00 2001
From: "mike.morgan%oregonstate.edu"
 <mike.morgan%oregonstate.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 24 Jul 2005 02:05:49 +0000
Subject: [PATCH] updated some search items.

git-svn-id: svn://10.0.0.236/trunk@176493 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../webtools/addons/css/cavendish/content.css |  4 ++
 mozilla/webtools/addons/tpl/search.tpl        | 39 ++++++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/mozilla/webtools/addons/css/cavendish/content.css b/mozilla/webtools/addons/css/cavendish/content.css
index c99a2d0f2ae..f1b75b9a063 100755
--- a/mozilla/webtools/addons/css/cavendish/content.css
+++ b/mozilla/webtools/addons/css/cavendish/content.css
@@ -73,6 +73,10 @@
     margin-top: 15px;
 }
 
+#search-side {
+    padding: 10px;
+}
+
 .popularlist {
 	font-size: 85%;
 }
diff --git a/mozilla/webtools/addons/tpl/search.tpl b/mozilla/webtools/addons/tpl/search.tpl
index 32537bf00ff..286abb9694f 100644
--- a/mozilla/webtools/addons/tpl/search.tpl
+++ b/mozilla/webtools/addons/tpl/search.tpl
@@ -1,13 +1,14 @@
 
+<div id="side">
 {* @todo fix the javascript hide/show so it's not n00bl3t1z3t3d *}
-<h2>Find an Addon</h2>
 
-<form action="{$smarty.server.PHP_SELF}" method="get">
+<div id="nav">
+
+<form id="search-side" action="{$smarty.server.PHP_SELF}" method="get">
 
-<div class="key-point">
 <input type="text" name="q">
-<div id="advanced-search" style="display:none;">
-<a href="#" onclick="getElementById('advanced-search').style.display='none';getElementById('toggle-advanced-search').style.display='inline';">Hide Search Options</a>
+<input type="submit" value="Search"><br><br>
+
 <fieldset>
     <legend>Search Options</legend>
 
@@ -29,7 +30,7 @@
     </div>
 
     <div class="search-option">
-    <label for="app">Application:</label>
+    <label for="app">App:</label>
     <select id="app" name="app">
     <option>Any</option>
     <option>Firefox</option>
@@ -39,7 +40,7 @@
     </div>
 
     <div class="search-option">   
-    <label for="os">Operating System:</label>
+    <label for="os">Platform:</label>
     <select id="os" name="os">
     <option>Windows</option>
     <option>Linux</option>
@@ -48,7 +49,7 @@
     </div>
 
     <div class="search-option">
-    <label for="date">Date Modified:</label>
+    <label for="date">Date:</label>
     <select id="date" name="date">
     <option>Any</option>
     <option>Today</option>
@@ -70,12 +71,22 @@
 
     </fieldset>
 
-</div>
-<input type="submit" value="Search"><br>
-
-<a id="toggle-advanced-search" href="#" onclick="this.style.display='none';getElementById('advanced-search').style.display='block';">Show Search Options</a>
-</div>
-
+<input type="submit" value="Search"><br><br>
 
 </form>
 
+</div>
+<!-- end nav -->
+
+</div>
+<!-- end side -->
+
+<div id="mainContent">
+<h2>Addon Search</h2>
+{if $results}
+{else}
+<p class="first">There are currently no results.  Please use the options at the left to begin a search or try adjusting your search terms.</p>
+{/if}
+
+</div>
+