From 292a0babb578b89f737fd777aedbb9ae9e6c8dc2 Mon Sep 17 00:00:00 2001 From: Josue Kouka Date: Tue, 5 Dec 2017 10:38:28 +0100 Subject: [PATCH] statics: restructure statics folder properly (#20436) --- mandayejs/mandaye/static/{ => css}/mandaye.css | 0 mandayejs/mandaye/static/{ => js}/force.redirect.js | 0 mandayejs/mandaye/static/{ => js}/mandaye.js | 2 +- mandayejs/mandaye/static/{ => js}/mandaye.post.js | 0 mandayejs/mandaye/static/{ => js}/single.logout.js | 0 mandayejs/mandaye/templates/mandaye/association_styles.html | 2 +- mandayejs/mandaye/templates/mandaye/panel.html | 4 ++-- mandayejs/mandaye/templates/mandaye/panel_styles.html | 2 +- 8 files changed, 5 insertions(+), 5 deletions(-) rename mandayejs/mandaye/static/{ => css}/mandaye.css (100%) rename mandayejs/mandaye/static/{ => js}/force.redirect.js (100%) rename mandayejs/mandaye/static/{ => js}/mandaye.js (83%) rename mandayejs/mandaye/static/{ => js}/mandaye.post.js (100%) rename mandayejs/mandaye/static/{ => js}/single.logout.js (100%) diff --git a/mandayejs/mandaye/static/mandaye.css b/mandayejs/mandaye/static/css/mandaye.css similarity index 100% rename from mandayejs/mandaye/static/mandaye.css rename to mandayejs/mandaye/static/css/mandaye.css diff --git a/mandayejs/mandaye/static/force.redirect.js b/mandayejs/mandaye/static/js/force.redirect.js similarity index 100% rename from mandayejs/mandaye/static/force.redirect.js rename to mandayejs/mandaye/static/js/force.redirect.js diff --git a/mandayejs/mandaye/static/mandaye.js b/mandayejs/mandaye/static/js/mandaye.js similarity index 83% rename from mandayejs/mandaye/static/mandaye.js rename to mandayejs/mandaye/static/js/mandaye.js index 6ceb0f1..e543eee 100644 --- a/mandayejs/mandaye/static/mandaye.js +++ b/mandayejs/mandaye/static/js/mandaye.js @@ -1,5 +1,5 @@ $(function() { - $('head').append(''); + $('head').append(''); $('body').prepend('
Chargement en cours...
'); $('#mandaye-js').load('/_mandaye/panel'); }); diff --git a/mandayejs/mandaye/static/mandaye.post.js b/mandayejs/mandaye/static/js/mandaye.post.js similarity index 100% rename from mandayejs/mandaye/static/mandaye.post.js rename to mandayejs/mandaye/static/js/mandaye.post.js diff --git a/mandayejs/mandaye/static/single.logout.js b/mandayejs/mandaye/static/js/single.logout.js similarity index 100% rename from mandayejs/mandaye/static/single.logout.js rename to mandayejs/mandaye/static/js/single.logout.js diff --git a/mandayejs/mandaye/templates/mandaye/association_styles.html b/mandayejs/mandaye/templates/mandaye/association_styles.html index 6cb4588..a797cc8 100644 --- a/mandayejs/mandaye/templates/mandaye/association_styles.html +++ b/mandayejs/mandaye/templates/mandaye/association_styles.html @@ -1,2 +1,2 @@ {% load static %} - + diff --git a/mandayejs/mandaye/templates/mandaye/panel.html b/mandayejs/mandaye/templates/mandaye/panel.html index 6af1be7..e1cf077 100644 --- a/mandayejs/mandaye/templates/mandaye/panel.html +++ b/mandayejs/mandaye/templates/mandaye/panel.html @@ -6,8 +6,8 @@ var mandaye_logout_locator = '{{logout_locator}}'; - - + + {% if site_scripts %} {%for script in site_scripts%} diff --git a/mandayejs/mandaye/templates/mandaye/panel_styles.html b/mandayejs/mandaye/templates/mandaye/panel_styles.html index 6cb4588..a797cc8 100644 --- a/mandayejs/mandaye/templates/mandaye/panel_styles.html +++ b/mandayejs/mandaye/templates/mandaye/panel_styles.html @@ -1,2 +1,2 @@ {% load static %} - + -- 2.11.0