merged

itf/static/css/noel/home.css

@@ -149,7 +149,7 @@ margin-right:6px;
 font-weight:bold;}
 
 #contentTab 
-{padding:6px 18px 10px 6px;
+{padding:0px 18px 10px 6px;
 clear:both;
 height:172px;
 overflow:hidden;} /*we may need to do some JAVASCRIPT for this*/

itf/static/css/noel/inner.css

@@ -29,9 +29,9 @@ margin-bottom:20px;
 -moz-border-radius:8px; 
 -webkit-border-radius:8px; 
 border-radius:8px;
--moz-box-shadow:2px 3px 20px #252425;
--webkit-box-shadow:2px 3px 20px #252425;
-box-shadow:2px 3px 20px #252425;  
+-moz-box-shadow:2px 3px 16px #252425;
+-webkit-box-shadow:2px 3px 16px #252425;
+box-shadow:2px 3px 16px #252425;  
 border-top:1px solid #d3d3d3;
 border-bottom:1px solid #d3d3d3;
 position:relative;
@@ -116,7 +116,7 @@ border-bottom:1px solid #f0dfdf;}
 
 #selection
 {padding-left:6px;
-border-top:1px solid #f0dfdf;
+/*border-top:1px solid #f0dfdf;*/
 }
 
 .tabCategory 
@@ -280,6 +280,28 @@ cursor:pointer;
 display:block;
 }
 
+
+#prevSearch
+{font-size:12px;
+color:#f7bd00;
+float:left;
+margin-bottom: 8px;
+cursor:pointer;
+font-weight:bold;
+text-decoration:none;
+margin-top:6px;} 
+
+#nextSearch
+{font-size:12px;
+color:#f7bd00;
+cursor:pointer;
+font-weight:bold;
+float:right;
+margin-bottom: 8px;
+text-decoration:none;
+margin-top:6px;}
+
+
 #triangleUp
 {font-size:12px;
 color:#f7bd00;
@@ -293,7 +315,8 @@ margin-left:16px;
 /*position: absolute;
 top: 136px;
 left: 20px;*/
-font-weight:bold;} 
+font-weight:bold;
+text-decoration:none;} 
 
 #triangleDown
 {font-size:12px;
@@ -306,6 +329,7 @@ cursor:pointer;
 font-weight:bold;
 float:right;
 margin-bottom: 8px;
+text-decoration:none;
 /*position: absolute;
 right:12px;
 top:130px;*/} /*SANJ, see what happens to the list when i do ctrl minus, and the triangles as well*/
@@ -334,9 +358,9 @@ background-color:#FFF;
 -moz-border-radius:8px; 
 -webkit-border-radius:8px; 
 border-radius:8px;
--moz-box-shadow:2px 3px 20px #252425;
--webkit-box-shadow:2px 3px 20px #252425;
-box-shadow:2px 3px 20px #252425;
+-moz-box-shadow:2px 3px 16px #252425;
+-webkit-box-shadow:2px 3px 16px #252425;
+box-shadow:2px 3px 16px #252425;
 position:relative;}
 
 #imageLeft
@@ -520,9 +544,9 @@ margin-bottom:20px;
 margin:0 auto;
 border-top:1px solid #d3d3d3;
 border-bottom:1px solid #d3d3d3;
--moz-box-shadow:2px 3px 20px #252425;
--webkit-box-shadow:2px 3px 20px #252425;
-box-shadow:2px 3px 20px #252425;}
+-moz-box-shadow:2px 3px 16px #252425;
+-webkit-box-shadow:2px 3px 16px #252425;
+box-shadow:2px 3px 16px #252425;}
 
 
 #searchContent {	
@@ -602,13 +626,12 @@ border: 1px solid transparent;
 margin-top: 7px;
 margin-bottom:24px;
 font-family:'Century Gothic', Helvetica, Arial, 'DejaVu Sans', sans-serif;
-}
-
 cursor:pointer;}
 
 #searchItf table th
 {width:40%;
-text-align:left;}
+text-align:left;
+}
 
 .id_models_0
 {color:#F7BD00;
@@ -620,3 +643,4 @@ font-size:12px;
 
 .id_q
 {text-align:left;}
+

itf/templates/search/search.html

@@ -38,17 +38,21 @@
                 <p class="noResults">No results found.</p>
             {% endfor %}
 
-            {% if page.has_previous or page.has_next %}
-                <div id="prevNext">
-                    {% if page.has_previous %}<a id="triangleUp" href="?q={{ query }}&amp;page={{ page.previous_page_number }}">Previous</a>{% endif %}
-                    
-                    {% if page.has_next %}<a id="triangleDown" href="?q={{ query }}&amp;page={{ page.next_page_number }}">Next</a>{% endif %}
-                </div>
-            {% endif %}
         {% else %}
             {# Show some example queries to run, maybe query syntax, something else? #}
         {% endif %}
     </form>
+            {% if page.has_previous or page.has_next %}
+                <div id="prevNext">
+
+
+                    {% if page.has_previous %}<a id="prevSearch" href="?q={{ query }}&amp;page={{ page.previous_page_number }}">Prev</a>{% endif %}
+                    
+                    {% if page.has_next %}<a id="nextSearch" href="?q={{ query }}&amp;page={{ page.next_page_number }}">Next</a>{% endif %}
+
+                </div>
+            {% endif %}
+
 </div><!-- SEARCH CONTENT CLOSING -->
 </div><!-- SEARCH CONTAINER CLOSING -->
 </div><!-- CENTER INNER -->