rewrite simplelist to use a table (thus datatable-ready) instead of <ul> -- ctd

diff --git a/engine/static/js/manifold-async.js b/engine/static/js/manifold-async.js
index fe04d89..9843377 100644 (file)
--- a/engine/static/js/manifold-async.js
+++ b/engine/static/js/manifold-async.js
@@ -1,4 +1,4 @@
-manifold_async_debug=true;
+manifold_async_debug=false;
 
 // Helper functions for asynchronous requests
 

diff --git a/plugins/simplelist.py b/plugins/simplelist.py
index 371e5d6..d3ec876 100644 (file)
--- a/plugins/simplelist.py
+++ b/plugins/simplelist.py
@@ -10,7 +10,14 @@ class SimpleList (Plugin) :
         self.with_datatables = with_datatables
 
     # SimpleList is useless per se anyways
-    def template_file (self): return "simplelist.html"
+    def template_file (self): 
+        return "simplelist.html"
+    
+    def template_env (self, request):
+        env={}
+        header=getattr(self,'header',None)
+        if header: env['header']=header
+        return env
 
     def requirements (self):
         reqs = { 'js_files' : [ "js/simplelist.js", "js/plugin.js", "js/query.js", "js/onavail.js",

diff --git a/plugins/static/css/simplelist.css b/plugins/static/css/simplelist.css
index 9953a25..9ec9073 100644 (file)
--- a/plugins/static/css/simplelist.css
+++ b/plugins/static/css/simplelist.css
@@ -4,10 +4,13 @@ select {
 div.dataTables_filter input[type=text] {
     width: 60;
 }
-li.slice-hrn, li.network-hrn {
+td.simplelist {
     padding: 0;
     list-style: none;
 }
-li.slice-hrn>a {
+td.simplelist>a {
     padding-left: 8px;
 }
+th.simplelist {
+    font-size: 150%;
+}

diff --git a/plugins/static/js/simplelist.js b/plugins/static/js/simplelist.js
index c49456b..d7f1d92 100644 (file)
--- a/plugins/static/js/simplelist.js
+++ b/plugins/static/js/simplelist.js
@@ -54,41 +54,52 @@ simplelist_debug=false;
 
     /* Private methods */
     function update_list(e, rows) {
+       // e.data is what we passed in second argument to subscribe
+       var $this=e.data;
+       // locate the <tbody>, expected layout being
+       // <div class='plugin'> <table> <thead /> <tbody /tbody> </table> </div>
+       // -- or, if we don't have a header --
+       // <div class='plugin'> <table> <tbody /tbody> </table> </div>
+       var $tbody=$this.find("tbody.simplelist").first();
+       if (simplelist_debug) console.log("$tbody goes with "+$tbody.get(0));
+
         if (rows.length == 0) {
-            e.data.html('No result !');
+            $tbody.html("<tr><td class='simplelist-empty'>No result !</tr></td>");
             return;
         }
         if (typeof rows[0].error != 'undefined') {
-            e.data.html('ERROR: ' + rows[0].error);
+            e.data.html("<tr><td class='simplelist-error'>ERROR: " + rows[0].error + "</td></tr>");
             return;
         }
         var options = e.data.data().SimpleList.options;
         var is_cached = options.query.timestamp != 'now' ? true : false;
        // here is where we use 'key' and 'value' from the SimpleList (python) constructor
-       html_code=myslice_html_ul(rows, options.key, options.value, is_cached)+"<br/>";
-        e.data.html(html_code);
+       html_code=myslice_html_tbody(rows, options.key, options.value, is_cached);
+       // locate the tbody from the template, set its text
+        $tbody.html(html_code);
+       // clear the spinning wheel
        var $elt = e.data;
        if (simplelist_debug) console.log("about to unspin with elt #" + $elt.attr('id') + " class " + $elt.attr('class'));
        $elt.closest('.need-spin').spin(false);
     }
 
-    function myslice_html_ul(data, key, value, is_cached) {
-        var out = "<ul>";
+    function myslice_html_tbody(data, key, value, is_cached) {
+//     return $.map (...)
+        var out = "";
         for (var i = 0; i < data.length; i++) {
-            out += myslice_html_li(key, data[i][value], is_cached);
+            out += myslice_html_tr(key, data[i][value], is_cached);
         }
-        out += "</ul>";
         return out;
     }
     
-    function myslice_html_li(key, value,is_cached) {
+    function myslice_html_tr(key, value,is_cached) {
         var cached = is_cached ? "(cached)" : "";
         if (key == 'slice_hrn') {
-            return "<li class='slice-hrn'><i class='icon-play-circle'></i><a href='/slice/" + value + "'>" + value + cached + "</a></li>";
+            return "<tr><td class='simplelist'><i class='icon-play-circle'></i><a href='/slice/" + value + "'>" + value + cached + "</a></td></tr>";
         } else if (key == 'network_hrn') {
-            return "<li class='network-hrn'><i class='icon-play-circle'></i>" + value + cached + "</li>";
+            return "<tr><td class='simplelist'><i class='icon-play-circle'></i>" + value + cached + "</td></tr>";
         } else {
-            return "<li>" + value + "</li>";
+            return "<tr><td class='simplelist'>" + value + "</td></tr>";
         }
     }
     

diff --git a/plugins/templates/simplelist.html b/plugins/templates/simplelist.html
index d214332..4132c4c 100644 (file)
--- a/plugins/templates/simplelist.html
+++ b/plugins/templates/simplelist.html
@@ -1,8 +1,8 @@
 <table class='simplelist{%if with_datatables %} with-datatables{% endif %}'>
 {% if header %}
-<thead><tr><th>{{ header }}</th></tr></thead>
+<thead><tr><th class='simplelist'>{{ header }}</th></tr></thead>
 {% endif %}
-<tbody>
+<tbody class='simplelist'>
 {% for item in list %}
 <tr><td>{{ item|safe }}</td></tr>
 {% endfor %}

diff --git a/trash/dashboard.py b/trash/dashboard.py
index 8dc2dbe..0d4de1d 100644 (file)
--- a/trash/dashboard.py
+++ b/trash/dashboard.py
@@ -14,7 +14,6 @@ from plugins.slicelist import SliceList
 
 # 
 from myslice.viewutils import topmenu_items, the_user
-# from myslice.viewutils import hard_wired_slice_names, hard_wired_list, lorem_p, lorem, quickfilter_criterias
 
 @login_required
 def dashboard_view (request):