Move the search button inline with input

This has restructured the HTML used in the search_form.html which may
break extensions. Particularly the spacial extension which uses this
hook.

ckan/public/css/style.css

@@ -737,25 +737,28 @@ body.package.search #menusearch {
 }
 .dataset-search {
   margin-bottom: 35px;
+  padding-right: 100px;
 }
 input.search {
   width: 100%;
+  float: left;
   font-size: 1.2em;
   margin: 0px;
   border: 1px solid #ccc;
-  padding: 0.5em;
+  padding: 0.6em 0.5em 0.6em 5px;
   font-weight: bold;
-     -moz-border-radius: 5px;
+  -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
-          border-radius: 5px;
- -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+  border-radius: 5px;
+  -moz-background-clip: padding;
+  -webkit-background-clip: padding-box;
+  background-clip: padding-box;
 }
 .dataset-search input.button {
     display: inline-block;
-    float: right;
-    margin-top: 5px;
-    margin-right: 10px !important;
-    margin-bottom: 1px !important;
+    float: left;
+    margin-left: 9px;
+    margin-right: -100px;
 }
 
 

ckan/templates/package/search_form.html

@@ -5,15 +5,15 @@
   py:strip=""
   >
 
-<form id="dataset-search" class="dataset-search" method="GET">
+<form id="dataset-search" class="dataset-search clearfix" method="GET">
   <input type="search" class="search" name="q" value="${c.q}" autocomplete="off" results="0" placeholder="${_('Search...')}" />
+  <input type="submit" value="${_('Search')}" class="btn btn-large button" />
   <span py:if="c.fields">
   <py:for each="(k, v) in c.fields"> 
     <input type="hidden" name="${k}" value="${v}" />  
   </py:for>
   </span>
   <div id="dataset-search-ext"></div>
-  <input type="submit" value="${_('Search')}" class="btn primary button" />
 </form>
 
 </html>