From 95f9830a64033723460c820d5b50199563d62a8b Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sat, 14 Dec 2013 15:03:35 +0100 Subject: [PATCH] harmonize js files naming under unfold/ --- plugins/form/__init__.py | 2 +- plugins/googlemap/__init__.py | 2 +- plugins/lists/simplelist.py | 2 +- plugins/maddash/__init__.py | 2 +- plugins/querycode/__init__.py | 2 +- plugins/querygrid/__init__.py | 2 +- plugins/querytable/__init__.py | 2 +- plugins/scheduler/__init__.py | 2 +- plugins/senslabmap/__init__.py | 2 +- plugins/tabs/static/js/tabs.js | 2 +- plugins/validatebutton/__init__.py | 2 +- ui/templates/base.html | 2 +- unfold/static/js/{plugin_helper.js => plugin-helper.js} | 0 unfold/static/js/{spin.presets.js => spin-presets.js} | 0 14 files changed, 12 insertions(+), 12 deletions(-) rename unfold/static/js/{plugin_helper.js => plugin-helper.js} (100%) rename unfold/static/js/{spin.presets.js => spin-presets.js} (100%) diff --git a/plugins/form/__init__.py b/plugins/form/__init__.py index ff569d5f..d4dce756 100644 --- a/plugins/form/__init__.py +++ b/plugins/form/__init__.py @@ -33,7 +33,7 @@ class CreateForm (Plugin): def requirements (self): # Some should be included by default by manifold - return { 'js_files' : ['js/manifold.js', 'js/spin.presets.js', 'js/spin.min.js', 'js/jquery.spin.js', + return { 'js_files' : ['js/manifold.js', 'js/spin-presets.js', 'js/spin.min.js', 'js/jquery.spin.js', 'js/form.js', 'js/jquery.validate.js', ], 'css_files' : ['css/form.css'] } diff --git a/plugins/googlemap/__init__.py b/plugins/googlemap/__init__.py index 583b8dd5..a769f7f8 100644 --- a/plugins/googlemap/__init__.py +++ b/plugins/googlemap/__init__.py @@ -35,7 +35,7 @@ class GoogleMap (Plugin): "/js/googlemap.js", "/js/markerclusterer.js", "js/manifold.js", "js/manifold-query.js", - "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", "js/unfold-helper.js", ], 'css_files' : [ "css/googlemap.css", diff --git a/plugins/lists/simplelist.py b/plugins/lists/simplelist.py index 26510303..c817d9bf 100644 --- a/plugins/lists/simplelist.py +++ b/plugins/lists/simplelist.py @@ -27,7 +27,7 @@ class SimpleList (Plugin) : reqs = { 'js_files' : [ "js/simplelist.js", "js/manifold.js", "js/manifold-query.js", - "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", "js/unfold-helper.js", ] , 'css_files': [ "css/simplelist.css" ], diff --git a/plugins/maddash/__init__.py b/plugins/maddash/__init__.py index 0447ff4d..9de64bc0 100644 --- a/plugins/maddash/__init__.py +++ b/plugins/maddash/__init__.py @@ -26,7 +26,7 @@ class MadDash (Plugin): 'js/jquery.tipsy.js', 'js/buffer.js', 'js/maddash.js', 'js/manifold.js', 'js/manifold-query.js', - 'js/spin.presets.js', 'js/spin.min.js', 'js/jquery.spin.js', + 'js/spin-presets.js', 'js/spin.min.js', 'js/jquery.spin.js', 'js/unfold-helper.js', ], 'css_files' : [ diff --git a/plugins/querycode/__init__.py b/plugins/querycode/__init__.py index d46a8421..0a2391fb 100644 --- a/plugins/querycode/__init__.py +++ b/plugins/querycode/__init__.py @@ -14,7 +14,7 @@ class QueryCode (Plugin): 'js_files' : [ "js/querycode.js", "js/manifold.js", "js/manifold-query.js", - "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", "js/shAutoloader.js","js/shCore.js","js/shBrushPython.js","js/shBrushRuby.js", ] , # thierry: see this file for details of why we turn this off for now diff --git a/plugins/querygrid/__init__.py b/plugins/querygrid/__init__.py index 5b0c4662..22a2aabd 100644 --- a/plugins/querygrid/__init__.py +++ b/plugins/querygrid/__init__.py @@ -87,7 +87,7 @@ Current implementation makes the following assumptions def requirements (self): reqs = { 'js_files' : [ - "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", # this one was in the slickgrid demo # http://mleibman.github.io/SlickGrid/examples/example-checkbox-row-select.html # but triggers js errors when included - probably/maybe because of the jquery version ? diff --git a/plugins/querytable/__init__.py b/plugins/querytable/__init__.py index b435b38e..0b1d29df 100644 --- a/plugins/querytable/__init__.py +++ b/plugins/querytable/__init__.py @@ -84,7 +84,7 @@ Current implementation makes the following assumptions def requirements (self): reqs = { - 'js_files' : [ "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + 'js_files' : [ "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", "js/dataTables.js", "js/dataTables.bootstrap.js", "js/with-datatables.js", "js/manifold.js", "js/manifold-query.js", "js/unfold-helper.js", diff --git a/plugins/scheduler/__init__.py b/plugins/scheduler/__init__.py index c21e96b6..caaaa521 100644 --- a/plugins/scheduler/__init__.py +++ b/plugins/scheduler/__init__.py @@ -27,7 +27,7 @@ class Scheduler(Plugin): #"//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js", "js/raphael.js", "js/manifold.js", "js/manifold-query.js", - "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", "js/unfold-helper.js", "js/jquery-ui-timepicker-addon.js", "js/jquery-ui-sliderAccess.js", ], diff --git a/plugins/senslabmap/__init__.py b/plugins/senslabmap/__init__.py index 03b06a4d..8b8075cc 100644 --- a/plugins/senslabmap/__init__.py +++ b/plugins/senslabmap/__init__.py @@ -21,7 +21,7 @@ class SensLabMap (Plugin): def requirements (self): reqs = { 'js_files' : [ "js/senslabmap.js", - "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", "js/three.min.js", "js/jquery-mousewheel.min.js", "js/map.js", ], 'css_files': [ "css/senslabmap.css", diff --git a/plugins/tabs/static/js/tabs.js b/plugins/tabs/static/js/tabs.js index 4612dd25..7c7f159c 100644 --- a/plugins/tabs/static/js/tabs.js +++ b/plugins/tabs/static/js/tabs.js @@ -1,6 +1,6 @@ // storing tabs active component in localStorage // -// based on plugin_helper.js, extended to store the domid of an active tab +// based on plugin-helper.js, extended to store the domid of an active tab // var tabs_helper = { diff --git a/plugins/validatebutton/__init__.py b/plugins/validatebutton/__init__.py index c12733f8..69dddf37 100644 --- a/plugins/validatebutton/__init__.py +++ b/plugins/validatebutton/__init__.py @@ -28,7 +28,7 @@ Query.get('ple:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_author def requirements (self): return { 'js_files': [ 'js/validatebutton.js', 'js/manifold-query.js', - "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js", ], } def json_settings_list (self): diff --git a/ui/templates/base.html b/ui/templates/base.html index 908f0f40..49a57ad1 100644 --- a/ui/templates/base.html +++ b/ui/templates/base.html @@ -14,7 +14,7 @@ {% insert_str prelude "js/jquery.html5storage.min.js" %} {% insert_str prelude "js/messages-runtime.js" %} {% insert_str prelude "js/class.js" %} -{% insert_str prelude "js/plugin_helper.js" %} +{% insert_str prelude "js/plugin-helper.js" %} {% insert_str prelude "js/mustache.js" %} {% insert_str prelude "js/plugin.js" %} {% insert_str prelude "js/manifold.js" %} diff --git a/unfold/static/js/plugin_helper.js b/unfold/static/js/plugin-helper.js similarity index 100% rename from unfold/static/js/plugin_helper.js rename to unfold/static/js/plugin-helper.js diff --git a/unfold/static/js/spin.presets.js b/unfold/static/js/spin-presets.js similarity index 100% rename from unfold/static/js/spin.presets.js rename to unfold/static/js/spin-presets.js -- 2.43.0