From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 23 Sep 2013 12:14:15 +0000 (+0200)
Subject: definitely get rid of all-static
X-Git-Tag: myslice-0.2-4~57
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=00196996cc9202821b9ab982031760aa1513f9d4

definitely get rid of all-static
---

diff --git a/Makefile b/Makefile
index 0cf14438..31ee234b 100644
--- a/Makefile
+++ b/Makefile
@@ -141,18 +141,6 @@ local-templates: force
 
 list-templates: plugins-templates local-templates
 
-### #################### manage static contents (extract from all the modules into the single all-static location)
-### static run-static static-run: force
-### 	mkdir -p ./all-static/js all-static/css all-static/img
-### 	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-js),../../$(x)) ./all-static/js
-### 	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-css),../../$(x)) ./all-static/css
-### 	ln -sf $(foreach x,$(shell $(MAKE-SILENT) list-img),../../$(x)) ./all-static/img
-### 
-### clean-static static-clean: force
-### 	rm -rf ./all-static
-### 
-### all-static: clean-static run-static
-
 #################### manage templates for the plugin area
 templates: force
 	mkdir -p templates
diff --git a/apache/myslice.conf b/apache/myslice.conf
index a3d1d32b..8f3ff2ba 100644
--- a/apache/myslice.conf
+++ b/apache/myslice.conf
@@ -5,14 +5,14 @@
 # XXX this is very rough, was just pasted from the (wrong) web page
 # and never tested, so feel free to rewrite completely if that sounds right
 #
-#Alias /robots.txt /usr/share/myslice/all-static/robots.txt
-Alias /favicon.ico /usr/share/myslice/all-static/favicon.ico
+#Alias /robots.txt /usr/share/myslice/static/robots.txt
+Alias /favicon.ico /usr/share/myslice/static/favicon.ico
 
-#AliasMatch ^/([^/]*\.css) /usr/share/myslice/all-static/styles/$1
+#AliasMatch ^/([^/]*\.css) /usr/share/myslice/static/styles/$1
 
-Alias /all-static/ /usr/share/myslice/all-static/
+Alias /static/ /usr/share/myslice/static/
 
-<Directory /usr/share/myslice/all-static/>
+<Directory /usr/share/myslice/static/>
 Order deny,allow
 Allow from all
 </Directory>
diff --git a/plugins/active_filters/templates/active_filters.html b/plugins/active_filters/templates/active_filters.html
index 7fa3883f..24c48097 100644
--- a/plugins/active_filters/templates/active_filters.html
+++ b/plugins/active_filters/templates/active_filters.html
@@ -12,7 +12,7 @@
 	{% for filter in filters %}
 	<div id='{{domid}}__filter__{{filter.key}}{{filter.op_str}}{{filter.value}}' class='filterButton' style='float:left;margin-bottom:10px;'>
 		<span>{{filter.key}}__{{filter.op}}__{{filter.value}}</span>
-        <img src='/all-static/img/details_close.png' class='closeButton' style='padding-left:3px;'/>
+        <img src='/static/img/details_close.png' class='closeButton' style='padding-left:3px;'/>
 	</div>
 	{% endfor %}
 
diff --git a/plugins/pres_view/static/js/initmap.js b/plugins/pres_view/static/js/initmap.js
index abd8bf1b..354564ea 100644
--- a/plugins/pres_view/static/js/initmap.js
+++ b/plugins/pres_view/static/js/initmap.js
@@ -1,7 +1,7 @@
 	//initialisation no conflict et de la config APE
 	
 	j = jQuery.noConflict();
-	j.getScript('/all-static/js/config.js');
+	j.getScript('/static/js/config.js');
 	
 	//fin
 	
diff --git a/plugins/pres_view/static/js/pres_view.js b/plugins/pres_view/static/js/pres_view.js
index bd49c1cf..69879189 100644
--- a/plugins/pres_view/static/js/pres_view.js
+++ b/plugins/pres_view/static/js/pres_view.js
@@ -98,7 +98,7 @@
 			//APE + no conflit
             j = jQuery.noConflict();
 		    ape_initialize();
-		    j.getScript('/all-static/js/config.js');
+		    j.getScript('/static/js/config.js');
 
 			// jquery:datepicker
 			j(".datepicker").datepicker({