Add number prefixes to scripts and style | wip #480 @1

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index a4e59af791ff2f478a68c5085013d221a6598c41..3acee9bdbbd7f6495633652d1fd7561e51ce389e 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -55,7 +55,7 @@ acl.roles[] = admin
 
 mail.test = APPLICATION_PATH "/../data/email/test"
 
-compat_ie = 8
+compat_ie = 9
 
 [testing : production]
 

diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml
index d43446cdd3357bf07d7efd36890e6b14b2a150ac..fc4531b6c68d2b6e88fc6a3ae21233cb1a70a7e5 100644 (file)
--- a/framework/application/layouts/scripts/layout.phtml
+++ b/framework/application/layouts/scripts/layout.phtml
@@ -4,8 +4,8 @@ if ($this->acl()->isAllowed('edition')) {
        $this->headScript()->addCommonsAdmin();
 }
 $this->headScript()->addIEConditionnals();
-$this->headScript()->appendFile('/js/common.js');
-$this->headLink()->appendStylesheet('/less/common.less', 'all');
+$this->headScript()->appendFile('/js/002-common.js');
+$this->headLink()->appendStylesheet('/less/002-common.less', 'all');
 
 /**
  * Exemples d'intégrations de webfonts

diff --git a/js/002-common.js b/js/002-common.js
new file mode 100644 (file)
index 0000000..ea71ddf
--- /dev/null
+++ b/js/002-common.js
@@ -0,0 +1 @@
+alert('common.js');
\ No newline at end of file

diff --git a/js/010-admin.js b/js/010-admin.js
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/js/admin.js b/js/admin.js
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/js/common.js b/js/common.js
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/less/000-imports.less b/less/000-imports.less
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/less/001-variables.less b/less/001-variables.less
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/less/002-common.less b/less/002-common.less
new file mode 100644 (file)
index 0000000..3626b59
--- /dev/null
+++ b/less/002-common.less
@@ -0,0 +1,3 @@
+body{\r
+       background: #f00;\r
+}
\ No newline at end of file

diff --git a/less/010-admin.less b/less/010-admin.less
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/less/027-ie7.less b/less/027-ie7.less
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/less/028-ie8.less b/less/028-ie8.less
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/less/101-header.less b/less/101-header.less
new file mode 100644 (file)
index 0000000..75ee018
--- /dev/null
+++ b/less/101-header.less
@@ -0,0 +1 @@
+@import "000-imports";
\ No newline at end of file

diff --git a/less/admin.less b/less/admin.less
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/less/common.less b/less/common.less
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/less/ie7.less b/less/ie7.less
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/less/ie8.less b/less/ie8.less
deleted file mode 100644 (file)
index e69de29..0000000