From e3158d5f23524332d8ff1f69f3746d40edd5b14d Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 22 Jun 2016 14:30:19 +0000 Subject: [PATCH] Add number prefixes to scripts and style | wip #480 @1 --- framework/application/configs/application.ini | 2 +- framework/application/layouts/scripts/layout.phtml | 4 ++-- js/002-common.js | 1 + js/{admin.js => 010-admin.js} | 0 js/common.js => less/000-imports.less | 0 less/{admin.less => 001-variables.less} | 0 less/002-common.less | 3 +++ less/{common.less => 010-admin.less} | 0 less/{ie7.less => 027-ie7.less} | 0 less/{ie8.less => 028-ie8.less} | 0 less/101-header.less | 1 + 11 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 js/002-common.js rename js/{admin.js => 010-admin.js} (100%) rename js/common.js => less/000-imports.less (100%) rename less/{admin.less => 001-variables.less} (100%) create mode 100644 less/002-common.less rename less/{common.less => 010-admin.less} (100%) rename less/{ie7.less => 027-ie7.less} (100%) rename less/{ie8.less => 028-ie8.less} (100%) create mode 100644 less/101-header.less diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index a4e59af..3acee9b 100644 --- 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 d43446c..fc4531b 100644 --- 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 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/admin.js b/js/010-admin.js similarity index 100% rename from js/admin.js rename to js/010-admin.js diff --git a/js/common.js b/less/000-imports.less similarity index 100% rename from js/common.js rename to less/000-imports.less diff --git a/less/admin.less b/less/001-variables.less similarity index 100% rename from less/admin.less rename to less/001-variables.less diff --git a/less/002-common.less b/less/002-common.less new file mode 100644 index 0000000..3626b59 --- /dev/null +++ b/less/002-common.less @@ -0,0 +1,3 @@ +body{ + background: #f00; +} \ No newline at end of file diff --git a/less/common.less b/less/010-admin.less similarity index 100% rename from less/common.less rename to less/010-admin.less diff --git a/less/ie7.less b/less/027-ie7.less similarity index 100% rename from less/ie7.less rename to less/027-ie7.less diff --git a/less/ie8.less b/less/028-ie8.less similarity index 100% rename from less/ie8.less rename to less/028-ie8.less diff --git a/less/101-header.less b/less/101-header.less new file mode 100644 index 0000000..75ee018 --- /dev/null +++ b/less/101-header.less @@ -0,0 +1 @@ +@import "000-imports"; \ No newline at end of file -- 2.39.5