git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 928d9b6)
renamings of js stuff
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 19 Mar 2013 15:47:45 +0000 (16:47 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 19 Mar 2013 15:47:45 +0000 (16:47 +0100)
Makefile patch | blob | history
devel/server-loop.sh patch | blob | history
unfold/js/init-all-plugins.js [moved from unfold/js/plugin-init.js with 100% similarity] patch | blob | history
unfold/plugin.py patch | blob | history
unfold/templates/plugin-init.js [moved from unfold/templates/plugin-setenv.js with 100% similarity] patch | blob | history
views/templates/layout-myslice.html patch | blob | history

diff --git a/Makefile b/Makefile
index 85b5d09..c5c98a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ thirdparty-css:
 thirdparty-img:
        @find $(THIRD-PARTY-RESOURCES) -name '*.png'
 
-# we might have any of these as templates - e.g. ./unfold/templates/plugin-setenv.js
+# we might have any of these as templates - e.g. ./unfold/templates/plugin-init.js
 # so if there's a /templates/ in the path ignore the file
 local-js: force
        @find . -type f -name '*.js' | egrep -v '/all-(static|templates)/|/third-party/|/templates/'
diff --git a/devel/server-loop.sh b/devel/server-loop.sh
index a108f93..1eacb71 100755 (executable)
--- a/devel/server-loop.sh
+++ b/devel/server-loop.sh
@@ -6,8 +6,7 @@ cd $DIRNAME/..
 hostname | grep -q '^z' && port=8080 || port=80
 [[ -n "$@" ]] && port=$1
 
-make all-static all-templates
 while true; do 
+    make all-static all-templates
     ./manage.py runserver 0.0.0.0:$port
-    make static templates
 done
diff --git a/unfold/plugin.py b/unfold/plugin.py
index 17931b6..c5ce3a0 100644 (file)
--- a/unfold/plugin.py
+++ b/unfold/plugin.py
@@ -150,7 +150,7 @@ class Plugin:
         if self.export_json_settings():
             env ['settings_json' ] = self.settings_json()
             # compute plugin-specific initialization
-            js_init = render_to_string ( 'plugin-setenv.js', env )
+            js_init = render_to_string ( 'plugin-init.js', env )
             self.add_js_chunks (js_init)
         
         # interpret the result of requirements ()
diff --git a/views/templates/layout-myslice.html b/views/templates/layout-myslice.html
index 8007093..1d14812 100644 (file)
--- a/views/templates/layout-myslice.html
+++ b/views/templates/layout-myslice.html
@@ -10,7 +10,7 @@
 </head>{# let's add these ones no matter what #}
 {% insert_str prelude "js/jquery.js" %}
 {# {% insert prelude_js %} jQuery.noConflict(); {% endinsert %} #}
-{% insert_str prelude "js/plugin-init.js" %}
+{% insert_str prelude "js/init-all-plugins.js" %}
 {% insert_str prelude "css/myslice.css" %}
 <body>
 {% block container %}
myslice (django)