From 0745f7f01da1b0041d5f19083dd8c1ca9f65425e Mon Sep 17 00:00:00 2001
From: Karen <karen.menezes@gmail.com>
Date: Thu, 1 Sep 2011 02:28:05 +0530
Subject: [PATCH 1/4] nav menu

---
 gazetteer/static/css/main.css   | 11 ++++++++---
 gazetteer/templates/search.html | 11 +++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/gazetteer/static/css/main.css b/gazetteer/static/css/main.css
index deacc38..b99498d 100644
--- a/gazetteer/static/css/main.css
+++ b/gazetteer/static/css/main.css
@@ -77,7 +77,7 @@ font-weight:bold;
 font-size:16px;
 text-transform:uppercase;
 color:#838383;
-padding-top:4px;}
+padding-top:8px;}
 
 #entropyLink
 {text-decoration:none;
@@ -85,10 +85,15 @@ margin-top:-10px;}
 
 .content
 {/*padding-bottom: 100px;*/
-margin-bottom:2%;
-height:71%;
+margin-bottom:1%;
+height:68%;
 }
 
+#navMenu li
+{float:left;
+height:4%;
+width:100%;}
+
 .mapListSection
 {float:left;
 width:33%;
diff --git a/gazetteer/templates/search.html b/gazetteer/templates/search.html
index 26e80eb..83a0ac2 100644
--- a/gazetteer/templates/search.html
+++ b/gazetteer/templates/search.html
@@ -29,7 +29,7 @@
     
     <div id="user-tools"> 
  
-        <!--Welcome,<strong> admin.</strong><a href="/admin/password_change/"> Change password</a> /
+        Welcome,<strong> admin.</strong><a href="/admin/password_change/"> Change password</a> /
      <a href="/admin/logout/">Log out</a>--> 
         <p id="logoText">Digital Gazetteer Demo</p>
         <p id="entropyLink"><a href="http://entropyfree.com">by Entropy Free LLC</a></p>
@@ -48,7 +48,14 @@
 
 <div class="content">
 
-
+    <div class="nav module">
+        <ul id="navMenu">
+        <li>Dummy Link A</li>
+        <li>Dummy Link B</li>
+        <li>Dummy Link C</li>
+        <li>Dummy Link D</li>
+        </ul>
+    </div>
     <div class="mapListSection module">
         <p class="resultsList" id="totalResults">Total Results: <span id="noOfResults">21 </span></p><p class="resultsList" id="showingResults">Showing Page: <span id="currPageNo">1</span> <span id="of">of</span> <span id="totalPages"> 10</span></p>
         

From 8f6e8d72463824a95b0c97464b0a8605d3599302 Mon Sep 17 00:00:00 2001
From: Karen <karen.menezes@gmail.com>
Date: Thu, 1 Sep 2011 02:42:43 +0530
Subject: [PATCH 2/4] list nav

---
 gazetteer/static/css/main.css   | 11 +++++++----
 gazetteer/templates/search.html |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gazetteer/static/css/main.css b/gazetteer/static/css/main.css
index b99498d..5fb1460 100644
--- a/gazetteer/static/css/main.css
+++ b/gazetteer/static/css/main.css
@@ -89,10 +89,13 @@ margin-bottom:1%;
 height:68%;
 }
 
-#navMenu li
-{float:left;
-height:4%;
-width:100%;}
+.nav ul li
+{height:4%;
+width:100%;
+padding-right: 60px;
+list-style:none;
+display:inline;
+cursor:pointer;}
 
 .mapListSection
 {float:left;
diff --git a/gazetteer/templates/search.html b/gazetteer/templates/search.html
index 83a0ac2..b68a519 100644
--- a/gazetteer/templates/search.html
+++ b/gazetteer/templates/search.html
@@ -56,6 +56,7 @@
         <li>Dummy Link D</li>
         </ul>
     </div>
+    
     <div class="mapListSection module">
         <p class="resultsList" id="totalResults">Total Results: <span id="noOfResults">21 </span></p><p class="resultsList" id="showingResults">Showing Page: <span id="currPageNo">1</span> <span id="of">of</span> <span id="totalPages"> 10</span></p>
         

From d96f3bdf69a471771727dad87989aa884e5e294f Mon Sep 17 00:00:00 2001
From: Karen <karen.menezes@gmail.com>
Date: Thu, 1 Sep 2011 02:48:17 +0530
Subject: [PATCH 3/4] bg image for nav menu

---
 gazetteer/static/css/main.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gazetteer/static/css/main.css b/gazetteer/static/css/main.css
index 5fb1460..14891c7 100644
--- a/gazetteer/static/css/main.css
+++ b/gazetteer/static/css/main.css
@@ -95,6 +95,7 @@ width:100%;
 padding-right: 60px;
 list-style:none;
 display:inline;
+background: #7CA0C7 url(../img/admin/default-bg.gif);
 cursor:pointer;}
 
 .mapListSection

From 52d259cb9f919bfa691f30a5f28e6dee150b3def Mon Sep 17 00:00:00 2001
From: Karen <karen.menezes@gmail.com>
Date: Thu, 1 Sep 2011 02:51:04 +0530
Subject: [PATCH 4/4] nav

---
 gazetteer/static/css/main.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gazetteer/static/css/main.css b/gazetteer/static/css/main.css
index 14891c7..3e8fcec 100644
--- a/gazetteer/static/css/main.css
+++ b/gazetteer/static/css/main.css
@@ -89,13 +89,18 @@ margin-bottom:1%;
 height:68%;
 }
 
+.nav ul
+{background-image:url(../img/admin/default-bg.gif);
+background-color:#7CA0C7;} 
+
 .nav ul li
 {height:4%;
 width:100%;
 padding-right: 60px;
 list-style:none;
 display:inline;
-background: #7CA0C7 url(../img/admin/default-bg.gif);
+color:#FFF;
+font-weight:bold;
 cursor:pointer;}
 
 .mapListSection