From c025814eadebf386f556f9af571d3f04e2124a80 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 4 Nov 2013 11:46:16 +0100 Subject: [PATCH] renamed hazelnut into querytable --- plugins/debug_platform/__init__.py | 4 +- .../static/js/debug_platform.js | 4 +- plugins/googlemap/static/js/googlemap.js | 4 +- plugins/myplugin/static/js/myplugin.js | 2 +- plugins/{hazelnut => querytable}/__init__.py | 14 +++--- .../static/css/querytable.css} | 28 ++++++------ .../static/img/README | 0 .../static/img/tablesort-bullet1.png | Bin .../static/img/tablesort-bullet2.png | Bin .../static/img/tablesort-col-alt.png | Bin .../static/img/tablesort-gradient.png | Bin .../static/img/tablesort-header-down.png | Bin .../static/img/tablesort-header-sortable.png | Bin .../static/img/tablesort-header-up.png | Bin .../static/img/tablesort-header.png | Bin .../static/img/tablesort-td-alt.png | Bin .../static/img/toggle-hidden.png | Bin .../static/img/toggle-visible.png | Bin .../static/js/querytable.js} | 42 +++++++++--------- .../templates/querytable.html} | 2 +- .../static/js/resources_selected.js | 4 +- plugins/slicestat/static/js/slicestat.js | 2 +- portal/platformsview.py | 4 +- portal/platformview.py | 4 +- portal/resourceview.py | 4 +- portal/sliceview.py | 10 ++--- .../code_editor/static/js/code_editor.js | 10 ++--- trash/pluginview.py | 8 ++-- unfold/static/css/onelab_marko.css | 10 ++--- 29 files changed, 78 insertions(+), 78 deletions(-) rename plugins/{hazelnut => querytable}/__init__.py (89%) rename plugins/{hazelnut/static/css/hazelnut.css => querytable/static/css/querytable.css} (60%) rename plugins/{hazelnut => querytable}/static/img/README (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-bullet1.png (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-bullet2.png (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-col-alt.png (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-gradient.png (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-header-down.png (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-header-sortable.png (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-header-up.png (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-header.png (100%) rename plugins/{hazelnut => querytable}/static/img/tablesort-td-alt.png (100%) rename plugins/{hazelnut => querytable}/static/img/toggle-hidden.png (100%) rename plugins/{hazelnut => querytable}/static/img/toggle-visible.png (100%) rename plugins/{hazelnut/static/js/hazelnut.js => querytable/static/js/querytable.js} (93%) rename plugins/{hazelnut/templates/hazelnut.html => querytable/templates/querytable.html} (92%) diff --git a/plugins/debug_platform/__init__.py b/plugins/debug_platform/__init__.py index e14a478e..fa76ba40 100644 --- a/plugins/debug_platform/__init__.py +++ b/plugins/debug_platform/__init__.py @@ -1,7 +1,7 @@ from unfold.plugin import Plugin from unfold.page import Page #from plugins.code_editor import CodeEditor -from plugins.hazelnut import Hazelnut +from plugins.querytable import QueryTable class DebugPlatform(Plugin): @@ -29,6 +29,6 @@ class DebugPlatform(Plugin): # This part should be moved to a Layout env = {} env['topleft'] = CodeEditor(page=self.page, lineNumbers=True).render(request) - env['bottomleft'] = Hazelnut(page=self.page, columns=['dummy']).render(request) + env['bottomleft'] = QueryTable(page=self.page, columns=['dummy']).render(request) return env diff --git a/plugins/debug_platform/static/js/debug_platform.js b/plugins/debug_platform/static/js/debug_platform.js index cbbd0b75..dda946c3 100644 --- a/plugins/debug_platform/static/js/debug_platform.js +++ b/plugins/debug_platform/static/js/debug_platform.js @@ -79,13 +79,13 @@ return this.each(function() { var $this = $(this); - var hazelnut = $this.data('Manifold'); + var querytable = $this.data('Manifold'); // Unbind all events using namespacing $(window).unbind('Manifold'); // Remove associated data - hazelnut.remove(); + querytable.remove(); $this.removeData('Manifold'); }); }, // destroy diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js index 424b3aad..9a56d379 100644 --- a/plugins/googlemap/static/js/googlemap.js +++ b/plugins/googlemap/static/js/googlemap.js @@ -35,7 +35,7 @@ googlemap_debug_detailed=false; /* XXX Events */ this.elmt().on('show', this, this.on_show); // TODO in destructor - // $(window).unbind('Hazelnut'); + // $(window).unbind('QueryTable'); var query = manifold.query_store.find_analyzed_query(this.options.query_uuid); this.object = query.object; @@ -105,7 +105,7 @@ googlemap_debug_detailed=false; //return this.escape_id(key_value).replace(/\\/g, ''); // however this sequence removes backslashes from hrn's and as a result // resources_selected was getting all mixed up - // hazelnut does publish hrn's with backslashes and that seems like the thing to do + // querytable does publish hrn's with backslashes and that seems like the thing to do return key_value; }, diff --git a/plugins/myplugin/static/js/myplugin.js b/plugins/myplugin/static/js/myplugin.js index 20f85734..26a29922 100644 --- a/plugins/myplugin/static/js/myplugin.js +++ b/plugins/myplugin/static/js/myplugin.js @@ -44,7 +44,7 @@ }, /* PLUGIN EVENTS */ - // on_show like in hazelnut + // on_show like in querytable /* GUI EVENTS */ diff --git a/plugins/hazelnut/__init__.py b/plugins/querytable/__init__.py similarity index 89% rename from plugins/hazelnut/__init__.py rename to plugins/querytable/__init__.py index eab50049..96456f56 100644 --- a/plugins/hazelnut/__init__.py +++ b/plugins/querytable/__init__.py @@ -1,6 +1,6 @@ from unfold.plugin import Plugin -class Hazelnut (Plugin): +class QueryTable (Plugin): # set checkboxes if a final column with checkboxes is desired # pass columns as the initial set of columns @@ -37,16 +37,16 @@ class Hazelnut (Plugin): if self.checkboxes: # we use aoColumnDefs rather than aoColumns -- ignore user-provided aoColumns if 'aoColumns' in self.datatables_options: - print 'WARNING: hazelnut uses aoColumnDefs, your aoColumns spec. is discarded' + print 'WARNING: querytable uses aoColumnDefs, your aoColumns spec. is discarded' del self.datatables_options['aoColumns'] # set aoColumnDefs in datatables_options - might already have stuff in there aoColumnDefs = self.datatables_options.setdefault ('aoColumnDefs',[]) # here 'checkbox' is the class that we give to the dom elem - # dom-checkbox is a sorting type that we define in hazelnut.js + # dom-checkbox is a sorting type that we define in querytable.js aoColumnDefs.append ( {'aTargets': ['checkbox'], 'sSortDataType': 'dom-checkbox' } ) def template_file (self): - return "hazelnut.html" + return "querytable.html" def template_env (self, request): env={} @@ -60,15 +60,15 @@ class Hazelnut (Plugin): "js/dataTables.js", "js/dataTables.bootstrap.js", "js/with-datatables.js", "js/manifold.js", "js/manifold-query.js", "js/unfold-helper.js", - # hazelnut.js needs to be loaded after dataTables.js as it extends + # querytable.js needs to be loaded after dataTables.js as it extends # dataTableExt.afnSortData - "js/hazelnut.js", + "js/querytable.js", ] , 'css_files': [ "css/dataTables.bootstrap.css", # hopefully temporary, when/if datatables supports sPaginationType=bootstrap3 # for now we use full_numbers, with our own ad hoc css "css/dataTables.full_numbers.css", - "css/hazelnut.css" , + "css/querytable.css" , ], } return reqs diff --git a/plugins/hazelnut/static/css/hazelnut.css b/plugins/querytable/static/css/querytable.css similarity index 60% rename from plugins/hazelnut/static/css/hazelnut.css rename to plugins/querytable/static/css/querytable.css index 31c11846..edbc683e 100644 --- a/plugins/hazelnut/static/css/hazelnut.css +++ b/plugins/querytable/static/css/querytable.css @@ -1,7 +1,7 @@ /* the bottom of the datatable needs more space */ -div.hazelnut-spacer { padding: 8px 4px 15px 4px; } +div.querytable-spacer { padding: 8px 4px 15px 4px; } -div.Hazelnut table.dataTable th { +div.QueryTable table.dataTable th { font: bold 12px/22px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; color: #4f6b72; border-right: 1px solid #C1DAD7; @@ -15,25 +15,25 @@ div.Hazelnut table.dataTable th { /* background: #CAE8EA url(../img/tablesort-header.jpg) no-repeat; */ } -div.Hazelnut table.dataTable th.checkbox { +div.QueryTable table.dataTable th.checkbox { padding-left: 14px; } -div.Hazelnut table.dataTable td, div.Hazelnut table.dataTable textarea, div.Hazelnut table.dataTable input [type="text"] { +div.QueryTable table.dataTable td, div.QueryTable table.dataTable textarea, div.QueryTable table.dataTable input [type="text"] { font: normal 12px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; border-right: 1px solid #C1DAD7; border-bottom: 1px solid #C1DAD7; } -div.Hazelnut table.dataTable td { +div.QueryTable table.dataTable td { padding: 4px 8px 4px 8px; /* this applies on even rows only, odd ones have a setting in bootstrap of rbg 249.249.249 */ background-color: #f4f4f4; } -div.Hazelnut table.dataTable td a { +div.QueryTable table.dataTable td a { font-weight:normal; } /* these come from bootstrap */ -div.Hazelnut div.dataTables_info { +div.QueryTable div.dataTables_info { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; } @@ -43,20 +43,20 @@ div.Hazelnut div.dataTables_info { * which would look less conspicuous in case of overflow */ -div.Hazelnut table.dataTable thead .sorting { background: url('../img/tablesort-header-sortable.png') no-repeat; } -div.Hazelnut table.dataTable thead .sorting_asc { background: url('../img/tablesort-header-up.png') no-repeat; } -div.Hazelnut table.dataTable thead .sorting_desc { background: url('../img/tablesort-header-down.png') no-repeat; } +div.QueryTable table.dataTable thead .sorting { background: url('../img/tablesort-header-sortable.png') no-repeat; } +div.QueryTable table.dataTable thead .sorting_asc { background: url('../img/tablesort-header-up.png') no-repeat; } +div.QueryTable table.dataTable thead .sorting_desc { background: url('../img/tablesort-header-down.png') no-repeat; } /* this icons set does not have that exact equivalent - using an approximation for now */ -div.Hazelnut table.dataTable thead .sorting_asc_disabled { background: url('../img/tablesort-header.png') repeat-x; } -div.Hazelnut table.dataTable thead .sorting_desc_disabled { background: url('../img/tablesort-header.png') repeat-x; } +div.QueryTable table.dataTable thead .sorting_asc_disabled { background: url('../img/tablesort-header.png') repeat-x; } +div.QueryTable table.dataTable thead .sorting_desc_disabled { background: url('../img/tablesort-header.png') repeat-x; } /* the footers are not active */ -div.Hazelnut table.dataTable tfoot { +div.QueryTable table.dataTable tfoot { background: url('../img/tablesort-header.png') repeat-x; background-color: #caebea; } /* and when sorting is turned off it's useful to set this on header too */ -div.Hazelnut table.dataTable thead { +div.QueryTable table.dataTable thead { background: url('../img/tablesort-header.png') repeat-x; background-color: #caebea; } diff --git a/plugins/hazelnut/static/img/README b/plugins/querytable/static/img/README similarity index 100% rename from plugins/hazelnut/static/img/README rename to plugins/querytable/static/img/README diff --git a/plugins/hazelnut/static/img/tablesort-bullet1.png b/plugins/querytable/static/img/tablesort-bullet1.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-bullet1.png rename to plugins/querytable/static/img/tablesort-bullet1.png diff --git a/plugins/hazelnut/static/img/tablesort-bullet2.png b/plugins/querytable/static/img/tablesort-bullet2.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-bullet2.png rename to plugins/querytable/static/img/tablesort-bullet2.png diff --git a/plugins/hazelnut/static/img/tablesort-col-alt.png b/plugins/querytable/static/img/tablesort-col-alt.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-col-alt.png rename to plugins/querytable/static/img/tablesort-col-alt.png diff --git a/plugins/hazelnut/static/img/tablesort-gradient.png b/plugins/querytable/static/img/tablesort-gradient.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-gradient.png rename to plugins/querytable/static/img/tablesort-gradient.png diff --git a/plugins/hazelnut/static/img/tablesort-header-down.png b/plugins/querytable/static/img/tablesort-header-down.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-header-down.png rename to plugins/querytable/static/img/tablesort-header-down.png diff --git a/plugins/hazelnut/static/img/tablesort-header-sortable.png b/plugins/querytable/static/img/tablesort-header-sortable.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-header-sortable.png rename to plugins/querytable/static/img/tablesort-header-sortable.png diff --git a/plugins/hazelnut/static/img/tablesort-header-up.png b/plugins/querytable/static/img/tablesort-header-up.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-header-up.png rename to plugins/querytable/static/img/tablesort-header-up.png diff --git a/plugins/hazelnut/static/img/tablesort-header.png b/plugins/querytable/static/img/tablesort-header.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-header.png rename to plugins/querytable/static/img/tablesort-header.png diff --git a/plugins/hazelnut/static/img/tablesort-td-alt.png b/plugins/querytable/static/img/tablesort-td-alt.png similarity index 100% rename from plugins/hazelnut/static/img/tablesort-td-alt.png rename to plugins/querytable/static/img/tablesort-td-alt.png diff --git a/plugins/hazelnut/static/img/toggle-hidden.png b/plugins/querytable/static/img/toggle-hidden.png similarity index 100% rename from plugins/hazelnut/static/img/toggle-hidden.png rename to plugins/querytable/static/img/toggle-hidden.png diff --git a/plugins/hazelnut/static/img/toggle-visible.png b/plugins/querytable/static/img/toggle-visible.png similarity index 100% rename from plugins/hazelnut/static/img/toggle-visible.png rename to plugins/querytable/static/img/toggle-visible.png diff --git a/plugins/hazelnut/static/js/hazelnut.js b/plugins/querytable/static/js/querytable.js similarity index 93% rename from plugins/hazelnut/static/js/hazelnut.js rename to plugins/querytable/static/js/querytable.js index 7c042b18..30c727b7 100644 --- a/plugins/hazelnut/static/js/hazelnut.js +++ b/plugins/querytable/static/js/querytable.js @@ -9,7 +9,7 @@ var debug=false; // debug=true - var Hazelnut = Plugin.extend({ + var QueryTable = Plugin.extend({ init: function(options, element) { @@ -36,7 +36,7 @@ this.elmt().on('show', this, this.on_show); // Unbind all events using namespacing // TODO in destructor - // $(window).unbind('Hazelnut'); + // $(window).unbind('QueryTable'); var query = manifold.query_store.find_analyzed_query(this.options.query_uuid); this.method = query.object; @@ -64,9 +64,9 @@ /* temp disabled... useful ? -- jordan $(this).each(function(i,elt) { if (jQuery(elt).hasClass('dataTables')) { - var myDiv=jQuery('#hazelnut-' + this.id).parent(); + var myDiv=jQuery('#querytable-' + this.id).parent(); if(myDiv.height()==0) { - var oTable=$('#hazelnut-' + this.id).dataTable(); + var oTable=$('#querytable-' + this.id).dataTable(); oTable.fnDraw(); } } @@ -96,7 +96,7 @@ // WARNING: this one causes tables in a 'tabs' that are not exposed at the time this is run to show up empty // sScrollX: '100%', /* Horizontal scrolling */ bProcessing: true, /* Loading */ - fnDrawCallback: function() { self._hazelnut_draw_callback.call(self); } + fnDrawCallback: function() { self._querytable_draw_callback.call(self); } // XXX use $.proxy here ! }; // the intention here is that options.datatables_options as coming from the python object take precedence @@ -131,7 +131,7 @@ /* No filtering if the table does not match */ if (oSettings.nTable.id != self.options.plugin_uuid + '__table') return true; - return self._hazelnut_filter.call(self, oSettings, aData, iDataIndex); + return self._querytable_filter.call(self, oSettings, aData, iDataIndex); }); /* Processing hidden_columns */ @@ -156,7 +156,7 @@ var result=""; // Prefix id with plugin_uuid result += " +
diff --git a/plugins/resources_selected/static/js/resources_selected.js b/plugins/resources_selected/static/js/resources_selected.js index 9a064476..0e710a49 100644 --- a/plugins/resources_selected/static/js/resources_selected.js +++ b/plugins/resources_selected/static/js/resources_selected.js @@ -31,7 +31,7 @@ var self = this; this.table = this.elmt('table').dataTable({ -// the original hazelnut layout was +// the original querytable layout was // sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>", // however the bottom line with 'showing blabla...' and the navigation widget are not really helpful sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t>", @@ -178,7 +178,7 @@ button ]; if (!row) { - // XXX second parameter refresh = false can improve performance. todo in hazelnut also + // XXX second parameter refresh = false can improve performance. todo in querytable also this.table.fnAddData(newline); row = this.find_row(data.value); } else { diff --git a/plugins/slicestat/static/js/slicestat.js b/plugins/slicestat/static/js/slicestat.js index 0e3dc532..da177222 100644 --- a/plugins/slicestat/static/js/slicestat.js +++ b/plugins/slicestat/static/js/slicestat.js @@ -51,7 +51,7 @@ }, /* PLUGIN EVENTS */ - // on_show like in hazelnut + // on_show like in querytable /* GUI EVENTS */ diff --git a/portal/platformsview.py b/portal/platformsview.py index 0a6677e3..12e9485e 100644 --- a/portal/platformsview.py +++ b/portal/platformsview.py @@ -4,7 +4,7 @@ from unfold.page import Page from unfold.loginrequired import FreeAccessView from ui.topmenu import topmenu_items, the_user -from plugins.hazelnut import Hazelnut +from plugins.querytable import QueryTable # View for platforms class PlatformsView(FreeAccessView): @@ -19,7 +19,7 @@ class PlatformsView(FreeAccessView): page.expose_js_metadata() page.expose_queries() - platformlist = Hazelnut( + platformlist = QueryTable( page = page, title = 'List', domid = 'checkboxes', diff --git a/portal/platformview.py b/portal/platformview.py index 69fd1b02..a81ba871 100644 --- a/portal/platformview.py +++ b/portal/platformview.py @@ -4,7 +4,7 @@ from unfold.page import Page from unfold.loginrequired import FreeAccessView from ui.topmenu import topmenu_items, the_user -from plugins.hazelnut import Hazelnut +from plugins.querytable import QueryTable # View for 1 platform and its details class PlatformView(FreeAccessView): @@ -25,7 +25,7 @@ class PlatformView(FreeAccessView): page.expose_js_metadata() page.expose_queries() - networklist = Hazelnut( + networklist = QueryTable( page = page, title = 'List', domid = 'checkboxes', diff --git a/portal/resourceview.py b/portal/resourceview.py index c9fa5ba8..f0f856ae 100644 --- a/portal/resourceview.py +++ b/portal/resourceview.py @@ -5,7 +5,7 @@ from unfold.loginrequired import FreeAccessView from ui.topmenu import topmenu_items, the_user from plugins.googlemap import GoogleMap -from plugins.hazelnut import Hazelnut +from plugins.querytable import QueryTable from plugins.lists.simplelist import SimpleList from plugins.slicestat import SliceStat @@ -31,7 +31,7 @@ class ResourceView(FreeAccessView): page.expose_js_metadata() page.expose_queries() - resourcelist = Hazelnut( + resourcelist = QueryTable( page = page, title = 'List', domid = 'checkboxes', diff --git a/portal/sliceview.py b/portal/sliceview.py index 8461b1a6..96bb2184 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -11,7 +11,7 @@ from ui.topmenu import topmenu_items, the_user from plugins.raw import Raw from plugins.stack import Stack from plugins.tabs import Tabs -from plugins.hazelnut import Hazelnut +from plugins.querytable import QueryTable from plugins.resources_selected import ResourcesSelected from plugins.googlemap import GoogleMap from plugins.senslabmap import SensLabMap @@ -160,7 +160,7 @@ class SliceView (LoginRequiredAutoLogoutView): zoom = 4, ) - resources_as_list = Hazelnut( + resources_as_list = QueryTable( page = page, domid = 'resources-list', title = 'List view', @@ -175,7 +175,7 @@ class SliceView (LoginRequiredAutoLogoutView): }, ) - # with the new 'Filter' stuff on top, no need for anything but the hazelnut + # with the new 'Filter' stuff on top, no need for anything but the querytable resources_as_list_area = resources_as_list resources_area = Tabs ( page=page, @@ -202,7 +202,7 @@ class SliceView (LoginRequiredAutoLogoutView): ) main_stack.insert(tab_users) - tab_users.insert(Hazelnut( + tab_users.insert(QueryTable( page = page, title = 'Users List', domid = 'users-list', @@ -287,7 +287,7 @@ class SliceView (LoginRequiredAutoLogoutView): # ) # main_stack.insert(tab_measurements) # -# tab_measurements.insert(Hazelnut( +# tab_measurements.insert(QueryTable( # page = page, # title = 'Measurements', # domid = 'measurements-list', diff --git a/to-be-integrated/plugins/code_editor/static/js/code_editor.js b/to-be-integrated/plugins/code_editor/static/js/code_editor.js index 664bbdc7..48111018 100644 --- a/to-be-integrated/plugins/code_editor/static/js/code_editor.js +++ b/to-be-integrated/plugins/code_editor/static/js/code_editor.js @@ -78,13 +78,13 @@ return this.each(function() { var $this = $(this); - var hazelnut = $this.data('Manifold'); + var querytable = $this.data('Manifold'); // Unbind all events using namespacing $(window).unbind('Manifold'); // Remove associated data - hazelnut.remove(); + querytable.remove(); $this.removeData('Manifold'); }); }, // destroy @@ -93,16 +93,16 @@ var $this=$(this); // xxx wtf. why [1] ? would expect 0... if (debug) - messages.debug("Hitting suspicious line in hazelnut.show"); + messages.debug("Hitting suspicious line in querytable.show"); var oTable = $($('.dataTable', $this)[1]).dataTable(); oTable.fnAdjustColumnSizing() /* Refresh dataTabeles if click on the menu to display it : fix dataTables 1.9.x Bug */ $(this).each(function(i,elt) { if (jQuery(elt).hasClass('dataTables')) { - var myDiv=jQuery('#hazelnut-' + this.id).parent(); + var myDiv=jQuery('#querytable-' + this.id).parent(); if(myDiv.height()==0) { - var oTable=$('#hazelnut-' + this.id).dataTable(); + var oTable=$('#querytable-' + this.id).dataTable(); oTable.fnDraw(); } } diff --git a/trash/pluginview.py b/trash/pluginview.py index 0b22e119..491900af 100644 --- a/trash/pluginview.py +++ b/trash/pluginview.py @@ -17,7 +17,7 @@ from plugins.quickfilter import QuickFilter from plugins.querycode import QueryCode from plugins.raw import Raw from plugins.messages import Messages -from plugins.hazelnut import Hazelnut +from plugins.querytable import QueryTable from ui.topmenu import topmenu_items, the_user from trash.trashutils import hard_wired_slice_names, hard_wired_list, lorem_p, lorem, quickfilter_criterias @@ -35,7 +35,7 @@ def test_plugin_view (request): slicename='ple.inria.heartbeat' main_query = Query.get('resource').filter_by('slice_hrn', '=', slicename).select(['network','type','hrn','hostname','sliver']) - # without an hazelnut, this would use use : run_it=False as nothing would listen to the results + # without an querytable, this would use use : run_it=False as nothing would listen to the results page.enqueue_query (main_query, # run_it=False ) @@ -53,11 +53,11 @@ def test_plugin_view (request): domid="messages-transient", levels='ALL', ), - Hazelnut ( + QueryTable ( page=page, title="Slice %s - checkboxes"%slicename, query=main_query, - domid="hazelnut", + domid="querytable", checkboxes=True, togglable=True, ), diff --git a/unfold/static/css/onelab_marko.css b/unfold/static/css/onelab_marko.css index 8fa53dd7..edb95ecd 100644 --- a/unfold/static/css/onelab_marko.css +++ b/unfold/static/css/onelab_marko.css @@ -270,9 +270,9 @@ div.dataTables_info { -/* HAZELNUT */ +/* QUERYTABLE */ -div.Hazelnut table.dataTable th { +div.QueryTable table.dataTable th { font: bold 12px/22px Ubuntu, Arial, sans-serif; color: #333 !important; border-right: 0px solid #333 !important; @@ -286,18 +286,18 @@ div.Hazelnut table.dataTable th { background: url('../img/tablesort-header.jpg') no-repeat !important; } -div.Hazelnut table.dataTable td, div.Hazelnut table.dataTable textarea, div.Hazelnut table.dataTable input [type="text"] { +div.QueryTable table.dataTable td, div.QueryTable table.dataTable textarea, div.QueryTable table.dataTable input [type="text"] { font: normal 12px Ubuntu, Arial, Helvetica, sans-serif; border-right: 0px solid #fff !important; border-bottom: 1px solid #fff !important; } -div.Hazelnut table.dataTable thead { +div.QueryTable table.dataTable thead { background: url('../img/tablesort-header.png') repeat-x !important; background-color: #caebea; } -div.Hazelnut table.dataTable tfoot { +div.QueryTable table.dataTable tfoot { background: url('../img/tablesort-header.png') repeat-x !important; /* background-color: # !important; */ } -- 2.43.0