Merge pull request #613 from okfn/613-bulk-update-sorting

Bulk processing - add sort lastmodified
ckan · Mar 14, 2013 · bea4276 · bea4276
2 parents 6a5d5c4 + 7c7a2f5
commit bea4276
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 12 deletions.
diff --git a/ckan/public/base/less/dataset.less b/ckan/public/base/less/dataset.less
@@ -104,6 +104,11 @@
   position: relative;
 }
 
+.search-normal {
+  display: block;
+  margin-bottom: 0;
+}
+
 .search-giant input {
   .box-sizing(border-box);
   font-size: 16px;
@@ -152,7 +157,7 @@
 
 .control-order-by {
   position: absolute;
-  bottom: -65px;
+  bottom: -73px;
   right: 0;
 }
 
@@ -165,6 +170,32 @@
   width: 160px;
 }
 
+.search-aside {
+  .control-order-by {
+    clear: both;
+    overflow: hidden;
+    display: block;
+    position: relative;
+    bottom: 0;
+    label {
+      float: left;
+      font-weight: normal;
+      font-size: 12px;
+      line-height: 20px;
+    }
+    select {
+      float: left;
+      padding: 2px 4px;
+      margin: 0;
+      width: inherit;
+      font-size: 12px;
+      height: 20px;
+      line-height: 20px;
+      width: 120px;
+    }
+  }
+}
+
 // Resource List
 
 .resource-list {

diff --git a/ckan/templates/organization/bulk_process.html b/ckan/templates/organization/bulk_process.html
@@ -84,12 +84,7 @@ <h3 class="dataset-heading">
       {% endif %}
     </div>
     <aside class="tertiary">
-      <form method="GET">
-        <span class="control-group search-normal">
-          <input type="text" class="search" name="q" value="{{ c.q }}" autocomplete="off" placeholder="{{ _('Search datasets...') }}" />
-          <button type="submit"><i class="icon-search"></i> <span>{{ _('Search') }}</span></button>
-        </span>
-      </form>
+      {% snippet 'snippets/simple_search.html', q=c.q, sort=c.sort_by_selected, placeholder=_('Search datasets...'), extra_sort=[(_('Last Modified'), 'data_modified asc')], input_class='search-normal', form_class='search-aside' %}
       {% for facet in c.facet_titles %}
         {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }}
       {% endfor %}

diff --git a/ckan/templates/snippets/simple_search.html b/ckan/templates/snippets/simple_search.html
@@ -1,13 +1,16 @@
-<form class="dataset-search clearfix" method="GET" data-module="select-switch">
-  <span class="control-group search-giant">
+{% set input_class = input_class or 'search-giant' %}
+<form class="dataset-search {{ form_class }}" method="GET" data-module="select-switch">
+  <span class="control-group {{ input_class }}">
     <input type="text" class="search" name="q" value="{{ q }}" autocomplete="off" placeholder="{{ placeholder }}" />
-    <button type="submit">{{ _('Search') }}</button>
+    <button type="submit"><i class="icon-search"></i> <span>{{ _('Search') }}</span></button>
   </span>
   <span class="form-select control-group control-order-by">
     <label for="field-order-by">{{ _('Order by') }}</label>
     <select id="field-order-by" name="sort">
-      <option value="name asc"{% if sort=='name asc' %} selected="selected"{% endif %}>{{ _('Name Ascending') }}</option>
-      <option value="name desc"{% if sort=='name desc' %} selected="selected"{% endif %}>{{ _('Name Descending') }}</option>
+      {% set sort_items = [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %}
+      {% for item in sort_items + (extra_sort or []) %}
+        <option value="{{ item[1] }}"{% if sort==item[1] %} selected="selected"{% endif %}>{{ item[0] }}</option>
+      {% endfor %}
     </select>
     <button class="btn js-hide" type="submit">{{ _('Go') }}</button>
   </span>