merge

gazetteer/static/css/main.css

@@ -240,7 +240,9 @@ padding-bottom:22px;
 padding-left: 4px;
 padding-right: 4px;
 cursor:pointer;
-clear:both;}
+clear:both;
+list-style:none;
+position: relative;}
 
 .first, .last
 {border:1px solid #e5e5e5;
@@ -251,25 +253,34 @@ color:#999;
 box-shadow:2px 3px 4px #c6c0c0;
 font-weight:bold;}
 
-.first, .previous, .next
+.firstLast li
+{display:inline;}
+
+/*.first, .previous, .next
 {float:left;}
 
 .next
 {margin-left:20px;}
 
 .first
-{margin-right:60px;}
+{margin-right:60px;}*/
 
 .last
-{float:right;
-}
+{/*float:right*/;
+position:absolute;
+right:4px;}
 
 .next, .previous
 {font-weight: bold;
 font-size: 10px;
-color: #999;
-padding-top: 4px;}
+color: #999;}
 
+.next
+{float:right;
+margin-right:33%;}
+
+.previous
+{margin-left:22%;}
 
 .next:hover, .previous:hover
 {color:#036;}

gazetteer/templates/search.html

@@ -29,8 +29,8 @@
     
     <div id="user-tools"> 
  
-    <!--Welcome,<strong> admin.</strong><a href="/admin/password_change/"> Change password</a> /
-     <a href="/admin/logout/">Log out</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>
              
@@ -62,12 +62,19 @@
     <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>
         
-        <div class="firstLast">
+        <ul class="firstLast"> 
+            <li class="first">First </li> 
+            <li class="previous"> Previous</li> 
+            <li class="next"> Next </li> 
+            <li class="last"> Last</li>
+        </ul>
+         
+<!--<div class="firstLast">
             <div class="first">First </div>
             <div class="previous"> Previous &nbsp; &nbsp; &nbsp;</div>
             <div class="next"> Next </div>
             <div class="last"> Last</div>
-        </div>
+        </div>-->
         
         <div class="clear"></div>