Initial draft for this interface. Does not hook up with backend curre…

…ntly. Issue #488.
cfe-lab · Mar 5, 2016 · 7668c9b · 7668c9b
1 parent 55791ad
commit 7668c9b
Show file tree

Hide file tree

Showing 5 changed files with 691 additions and 91 deletions.
diff --git a/kive/portal/static/portal/moment.min.js b/kive/portal/static/portal/moment.min.js
diff --git a/kive/portal/static/portal/permissions.js b/kive/portal/static/portal/permissions.js
@@ -463,9 +463,11 @@ var permissions = (function() {
         var $filter,
             $duplicates;
         $filter = $('<div class="filter"/>').data({ key: key, val: value });
-        $filter.append(
-                $('<span class="field"/>').text(key + ':'),
-                $('<span class="value"/>').text(value));
+
+        if (key != "smart") {
+            $filter.append($('<span class="field"/>').text(key + ':'));
+        }
+        $filter.append($('<span class="value"/>').text(value));
         $duplicates = $('div.filter', filterSet.$active).filter(function() {
             var $f = $(this);
             return $f.data('key') === key && $f.data('val') === value;
@@ -475,11 +477,28 @@ var permissions = (function() {
                 $filter.detach();
                 filterSet.onChange();
             }));
-            filterSet.$active.prepend($filter);
+            filterSet.$active.append($filter);
         }
 
         return $filter;
     }
+
+    my.FilterSet.prototype.remove = function(key, value, skip_trigger) {
+        var $filters = this.$active.children();
+        if (typeof value == 'undefined') {
+            $filters.filter(function() {
+                return $(this).data('key') == key;
+            }).detach();
+        } else {
+            $filters.filter(function() {
+                return $(this).data('key') == key && $(this).data('val') == value;
+            }).detach();
+        }
+
+        if (skip_trigger === undefined) {
+            this.onChange();
+        }
+    }
 
     my.FilterSet.prototype.add = function(key, value, skip_trigger) {
         var $filter = addFilter(this, key, value);

diff --git a/kive/portal/static/portal/search.css b/kive/portal/static/portal/search.css
@@ -20,14 +20,17 @@
     margin: .25em 0 .5em;
 }
 .filter_ctrl input[type='submit'],
-.filter_ctrl input.ctrl {
+.filter_ctrl input.ctrl,
+.dataset-search-dlg input[type='submit'],
+.dataset-search-dlg input.ctrl {
     background-repeat: no-repeat;
     background-position: 3px 3px;
     text-indent: -999em; overflow: hidden;
 	font-size: 1.5em;
 	margin: .5em 0;
 }
-.filter_ctrl input[type='submit'] {
+.filter_ctrl input[type='submit'],
+.dataset-search-dlg input[type='submit'] {
     display: block;
     background-position: .6em 4px;
     background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABhQTFRFREVJBAYL7Ozso6SmzM3Ob3BzgYKE////8GOoMQAAAAh0Uk5T/////////wDeg71ZAAAAaklEQVR42lSO0RbAMARDo6j//+ORtDubF1wRUFUOM+xVDNTqlhEHzDj3UGrg3U81mQDKVSlJS1MgzFxgC6wD3hXXHaQGI5BpF5YRbscMY3ZjE1TwVUAa7oV78JEm58R9zfILSH6gST4CDAA1OgRo8O828AAAAABJRU5ErkJggg==');

diff --git a/kive/sandbox/static/sandbox/choose_inputs.js b/kive/sandbox/static/sandbox/choose_inputs.js
@@ -2,20 +2,23 @@ var choose_inputs = (function() {
     "use strict";
     var my = {};
 
-    function buildRadioButton($td, row, table) {
-        var name = row.name;
-        $td.append(
-                $('<label>').text(row.name).prepend($(
-                        '<input>',
-                        {
-                            type: 'radio',
-                            value: row.id,
-                            name: 'input_' + table.input_index
-                        })));
-    }
+    // function buildRadioButton($td, row, table) {
+    //     var name = row.name;
+    //     $td.append(
+    //             $('<label>').text(row.name).prepend($(
+    //                     '<input>',
+    //                     {
+    //                         type: 'radio',
+    //                         value: row.id,
+    //                         name: 'input_' + table.input_index
+    //                     })));
+    // }
 
+    function buildName($td, row) {
+        $td.text(row.name).addClass('primary').data('id', row.id);
+    }
     function buildDateCreated($td, row) {
-        $td.text(permissions.formatDate(row.date_created));
+        $td.text(permissions.formatDate(row.date_created)).addClass('date');
     }
 
     my.DatasetsTable = function(
@@ -38,7 +41,7 @@ var choose_inputs = (function() {
                     datasetsTable.page = 1;
                     datasetsTable.reloadTable();
                 });
-        this.registerColumn("Name", buildRadioButton, this);
+        this.registerColumn("Name", buildName);
         this.registerColumn("Date", buildDateCreated);
         this.registerColumn("File Size (B)", "filesize");