[#1251] Add searching to recline grid

ckan · May 6, 2014 · 1a6e562 · 1a6e562
1 parent e00ef1b
commit 1a6e562
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/ckanext/reclinepreview/theme/public/css/recline.css b/ckanext/reclinepreview/theme/public/css/recline.css
@@ -20,15 +20,12 @@ body {
 }
 
 .recline-pager .pagination {
-  margin: 10px 0 0 0;
-}
-
-.recline-pager .pagination ul {
-  box-shadow: none;
+  margin: 0;
+  float: left;
 }
 
 .recline-pager .pagination a {
-  padding: 0 10px;
+  line-height: 26px;
 }
 
 .recline-pager .pagination input {
@@ -37,6 +34,10 @@ body {
   padding: 2px 4px;
 }
 
+.recline-query-editor {
+  float: right;
+}
+
 .loading-spinner {
   float: right;
   background-image: url('../img/ajaxload-circle.gif');

diff --git a/ckanext/reclinepreview/theme/public/preview_recline.js b/ckanext/reclinepreview/theme/public/preview_recline.js
@@ -103,7 +103,8 @@ this.ckan.module('reclinepreview', function (jQuery, _) {
         // default to Grid
         view = new recline.View.SlickGrid({model: dataset});
         controls = [
-          new recline.View.Pager({model: view.model.queryState})
+          new recline.View.Pager({model: view.model.queryState}),
+          new recline.View.QueryEditor({model: view.model.queryState})
         ];
       }
 
@@ -128,7 +129,7 @@ this.ckan.module('reclinepreview', function (jQuery, _) {
     },
 
     _renderControls: function (el, controls, className) {
-      var controlsEl = $("<div class=\"" + className + "\" />");
+      var controlsEl = $("<div class=\"clearfix " + className + "\" />");
       for (var i = 0; i < controls.length; i++) {
         controlsEl.append(controls[i].el);
       }