git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reworked slice page, added ResourcesSelected plugin
[myslice.git]
/
plugins
/
hazelnut
/
hazelnut.py
diff --git
a/plugins/hazelnut/hazelnut.py
b/plugins/hazelnut/hazelnut.py
index
26ce628
..
9dfebf1
100644
(file)
--- a/
plugins/hazelnut/hazelnut.py
+++ b/
plugins/hazelnut/hazelnut.py
@@
-5,7
+5,7
@@
class Hazelnut (Plugin):
# set checkboxes if a final column with checkboxes is desired
# pass columns as the initial set of columns
# if None then this is taken from the query's fields
# set checkboxes if a final column with checkboxes is desired
# pass columns as the initial set of columns
# if None then this is taken from the query's fields
- def __init__ (self, query, checkboxes=False, columns=None, **settings):
+ def __init__ (self, query, checkboxes=False, columns=None,
datatables_options={},
**settings):
Plugin.__init__ (self, **settings)
self.query=query
self.checkboxes=checkboxes
Plugin.__init__ (self, **settings)
self.query=query
self.checkboxes=checkboxes
@@
-13,6
+13,7
@@
class Hazelnut (Plugin):
self.columns=columns
else:
self.columns=self.query.fields
self.columns=columns
else:
self.columns=self.query.fields
+ self.datatables_options=datatables_options
def template_file (self):
return "hazelnut.html"
def template_file (self):
return "hazelnut.html"
@@
-27,16
+28,15
@@
class Hazelnut (Plugin):
reqs = {
'js_files' : [ "js/hazelnut.js",
"js/manifold.js", "js/manifold-query.js",
reqs = {
'js_files' : [ "js/hazelnut.js",
"js/manifold.js", "js/manifold-query.js",
- "js/dataTables.js", "js/
DT_
bootstrap.js", "js/with-datatables.js",
+ "js/dataTables.js", "js/
dataTables.
bootstrap.js", "js/with-datatables.js",
"js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js",
"js/unfold-helper.js",
] ,
'css_files': [ "css/hazelnut.css" ,
"js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js",
"js/unfold-helper.js",
] ,
'css_files': [ "css/hazelnut.css" ,
- "css/demo_table.css", "css/demo_table_jui.css",
-# "css/jquery-ui.css",
+ "css/dataTables.bootstrap.css",
],
}
return reqs
# the list of things passed to the js plugin
],
}
return reqs
# the list of things passed to the js plugin
- def json_settings_list (self): return ['plugin_uuid',
'query_uuid','checkboxe
s']
+ def json_settings_list (self): return ['plugin_uuid',
'domid', 'query_uuid','checkboxes','datatables_option
s']