From 0426cdd4479234df3498deb8675511cd26e866c2 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 19 Mar 2013 16:47:45 +0100 Subject: [PATCH] renamings of js stuff --- Makefile | 2 +- devel/server-loop.sh | 3 +-- unfold/js/{plugin-init.js => init-all-plugins.js} | 0 unfold/plugin.py | 2 +- unfold/templates/{plugin-setenv.js => plugin-init.js} | 0 views/templates/layout-myslice.html | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) rename unfold/js/{plugin-init.js => init-all-plugins.js} (100%) rename unfold/templates/{plugin-setenv.js => plugin-init.js} (100%) diff --git a/Makefile b/Makefile index 85b5d09a..c5c98a37 100644 --- 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 a108f93d..1eacb71a 100755 --- 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/js/plugin-init.js b/unfold/js/init-all-plugins.js similarity index 100% rename from unfold/js/plugin-init.js rename to unfold/js/init-all-plugins.js diff --git a/unfold/plugin.py b/unfold/plugin.py index 17931b67..c5ce3a0a 100644 --- 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/unfold/templates/plugin-setenv.js b/unfold/templates/plugin-init.js similarity index 100% rename from unfold/templates/plugin-setenv.js rename to unfold/templates/plugin-init.js diff --git a/views/templates/layout-myslice.html b/views/templates/layout-myslice.html index 80070936..1d148123 100644 --- a/views/templates/layout-myslice.html +++ b/views/templates/layout-myslice.html @@ -10,7 +10,7 @@ {# 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" %} {% block container %} -- 2.43.0