diff --git a/CHANGES.md b/CHANGES.md index 203f2a1e..ae1c3093 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ - Position des entrées de menu sur les écrans de smartphone. - Thème : import d'un thème, d'administration impossible. - Thème : import d'un thème, nettoyage du dossier tmp. + - Thème administration : modification de l'appel du code CSS permettant une mise à jour du thème sans vider le cache. ## version 10.3.03 - Correction : diff --git a/core/core.php b/core/core.php index f0b1da93..22fb7272 100644 --- a/core/core.php +++ b/core/core.php @@ -1672,7 +1672,7 @@ class core extends common { $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonRed'])); $css .= '.button.buttonRed {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}.button.buttonRed:hover {background-color:' . $colors['darken'] . ';color:' . $colors['text'] . ';}.button.buttonRed:active {background-color:' . $colors['veryDarken'] . ';color:' . $colors['text'] . ';}'; $colors = helper::colorVariants($this->getData(['admin','backgroundColorButtonGreen'])); - $css .= 'button[type=submit] {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . '}button[type=submit]:hover {background-color: ' . $colors['darken'] . ';color: ' . $colors['text'] .';}button[type=submit]:active {background-color: ' . $colors['darken'] . ';color: ' .$colors['text'] .';}'; + $css .= 'button[type=submit] {background-color: ' . $colors['normal'] . ';color: ' . $colors['text'] . ';}button[type=submit]:hover {background-color: ' . $colors['darken'] . ';color: ' . $colors['text'] .';}button[type=submit]:active {background-color: ' . $colors['darken'] . ';color: ' .$colors['text'] .';}'; $colors = helper::colorVariants($this->getData(['admin','backgroundBlockColor'])); $css .= '.block {border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}.block h4 {background-color: ' . $colors['normal'] . ';color:' . $colors['text'] . ';}'; $css .= 'table tr,input[type=email],input[type=text],input[type=password],select:not(#barSelectPage),textarea:not(.editorWysiwyg),.inputFile{background-color: ' . $colors['normal'] . ';color:' . $colors['text'] . ';border: 1px solid ' . $this->getData(['admin','borderBlockColor']) . ';}'; @@ -2767,6 +2767,9 @@ class layout extends common { public function showStyle() { if($this->core->output['style']) { echo ''; + if (strpos($this->core->output['style'], 'admin.css') >= 1 ) { + echo ''; + } echo ''; } } diff --git a/core/module/config/view/backup/backup.css b/core/module/config/view/backup/backup.css index ef7b951f..6171ce44 100755 --- a/core/module/config/view/backup/backup.css +++ b/core/module/config/view/backup/backup.css @@ -12,7 +12,15 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); +/** /** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ */ + +/** NE PAS EFFACER +* admin.css +*/ /** * Effet d'animation diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css index bc85d6a6..f644a17a 100755 --- a/core/module/config/view/index/index.css +++ b/core/module/config/view/index/index.css @@ -12,7 +12,15 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ */ + +/** NE PAS EFFACER +* admin.css +*/ .blockContainer { display : none; diff --git a/core/module/config/view/manage/manage.css b/core/module/config/view/manage/manage.css index a7139f53..55e779b3 100755 --- a/core/module/config/view/manage/manage.css +++ b/core/module/config/view/manage/manage.css @@ -12,4 +12,8 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/config/view/script/script.css b/core/module/config/view/script/script.css index a7139f53..55e779b3 100755 --- a/core/module/config/view/script/script.css +++ b/core/module/config/view/script/script.css @@ -12,4 +12,8 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/install/view/update/update.css b/core/module/install/view/update/update.css index 10b92b20..3037ba11 100755 --- a/core/module/install/view/update/update.css +++ b/core/module/install/view/update/update.css @@ -14,5 +14,9 @@ /* -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ */ \ No newline at end of file diff --git a/core/module/page/view/edit/edit.css b/core/module/page/view/edit/edit.css index 8785259c..7a630ac1 100755 --- a/core/module/page/view/edit/edit.css +++ b/core/module/page/view/edit/edit.css @@ -13,7 +13,11 @@ */ -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ #ceo > .blockContainer, #advanced > .blockContainer { diff --git a/core/module/theme/view/admin/admin.css b/core/module/theme/view/admin/admin.css index c1a66e94..50fb6742 100755 --- a/core/module/theme/view/admin/admin.css +++ b/core/module/theme/view/admin/admin.css @@ -13,4 +13,8 @@ */ /* Thème administration */ -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ diff --git a/core/module/theme/view/advanced/advanced.css b/core/module/theme/view/advanced/advanced.css index 654bd6be..220d2efb 100755 --- a/core/module/theme/view/advanced/advanced.css +++ b/core/module/theme/view/advanced/advanced.css @@ -13,4 +13,8 @@ */ /* Thème administration */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/theme/view/body/body.css b/core/module/theme/view/body/body.css index 752c880a..e153e8f7 100755 --- a/core/module/theme/view/body/body.css +++ b/core/module/theme/view/body/body.css @@ -11,7 +11,11 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ #backToTop { display: block; diff --git a/core/module/theme/view/footer/footer.css b/core/module/theme/view/footer/footer.css index 654bd6be..220d2efb 100755 --- a/core/module/theme/view/footer/footer.css +++ b/core/module/theme/view/footer/footer.css @@ -13,4 +13,8 @@ */ /* Thème administration */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css index a7139f53..55e779b3 100755 --- a/core/module/theme/view/header/header.css +++ b/core/module/theme/view/header/header.css @@ -12,4 +12,8 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/theme/view/index/index.css b/core/module/theme/view/index/index.css index 776025ed..4eeb6012 100755 --- a/core/module/theme/view/index/index.css +++ b/core/module/theme/view/index/index.css @@ -12,7 +12,11 @@ /* Thème administration */ -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ #bar, #site, diff --git a/core/module/theme/view/manage/manage.css b/core/module/theme/view/manage/manage.css index 654bd6be..220d2efb 100755 --- a/core/module/theme/view/manage/manage.css +++ b/core/module/theme/view/manage/manage.css @@ -13,4 +13,8 @@ */ /* Thème administration */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/theme/view/menu/menu.css b/core/module/theme/view/menu/menu.css index a7139f53..55e779b3 100755 --- a/core/module/theme/view/menu/menu.css +++ b/core/module/theme/view/menu/menu.css @@ -12,4 +12,8 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/theme/view/site/site.css b/core/module/theme/view/site/site.css index 2aa6edae..51a18ec5 100755 --- a/core/module/theme/view/site/site.css +++ b/core/module/theme/view/site/site.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/user/view/add/add.css b/core/module/user/view/add/add.css index a7139f53..55e779b3 100755 --- a/core/module/user/view/add/add.css +++ b/core/module/user/view/add/add.css @@ -12,4 +12,8 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/user/view/edit/edit.css b/core/module/user/view/edit/edit.css index 2aa6edae..51a18ec5 100755 --- a/core/module/user/view/edit/edit.css +++ b/core/module/user/view/edit/edit.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/user/view/forgot/forgot.css b/core/module/user/view/forgot/forgot.css index 2aa6edae..51a18ec5 100755 --- a/core/module/user/view/forgot/forgot.css +++ b/core/module/user/view/forgot/forgot.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/user/view/index/index.css b/core/module/user/view/index/index.css index 2aa6edae..51a18ec5 100755 --- a/core/module/user/view/index/index.css +++ b/core/module/user/view/index/index.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/user/view/login/login.css b/core/module/user/view/login/login.css index ce4f1b21..59f4f544 100755 --- a/core/module/user/view/login/login.css +++ b/core/module/user/view/login/login.css @@ -13,5 +13,9 @@ */ /* -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ */ diff --git a/core/module/user/view/reset/reset.css b/core/module/user/view/reset/reset.css index a7139f53..55e779b3 100755 --- a/core/module/user/view/reset/reset.css +++ b/core/module/user/view/reset/reset.css @@ -12,4 +12,8 @@ * @link http://zwiicms.fr/ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/blog/view/add/add.css b/module/blog/view/add/add.css index 2aa6edae..51a18ec5 100755 --- a/module/blog/view/add/add.css +++ b/module/blog/view/add/add.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/blog/view/comment/comment.css b/module/blog/view/comment/comment.css index 2aa6edae..51a18ec5 100755 --- a/module/blog/view/comment/comment.css +++ b/module/blog/view/comment/comment.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/blog/view/config/config.css b/module/blog/view/config/config.css index 2aa6edae..51a18ec5 100755 --- a/module/blog/view/config/config.css +++ b/module/blog/view/config/config.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/blog/view/edit/edit.css b/module/blog/view/edit/edit.css index 2aa6edae..51a18ec5 100755 --- a/module/blog/view/edit/edit.css +++ b/module/blog/view/edit/edit.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/form/view/config/config.css b/module/form/view/config/config.css index 3d3c7ee7..281bf52b 100755 --- a/module/form/view/config/config.css +++ b/module/form/view/config/config.css @@ -1,4 +1,8 @@ -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ /* .formConfigInput { diff --git a/module/form/view/data/data.css b/module/form/view/data/data.css index 2aa6edae..51a18ec5 100755 --- a/module/form/view/data/data.css +++ b/module/form/view/data/data.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/gallery/view/config/config.css b/module/gallery/view/config/config.css index a859c8dd..53f76541 100755 --- a/module/gallery/view/config/config.css +++ b/module/gallery/view/config/config.css @@ -13,7 +13,11 @@ */ -@import url("site/data/admin.css"); +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ .galleryConfigError { color: #F3674A; diff --git a/module/gallery/view/edit/edit.css b/module/gallery/view/edit/edit.css index 2aa6edae..51a18ec5 100755 --- a/module/gallery/view/edit/edit.css +++ b/module/gallery/view/edit/edit.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/gallery/view/theme/theme.css b/module/gallery/view/theme/theme.css index 2aa6edae..51a18ec5 100755 --- a/module/gallery/view/theme/theme.css +++ b/module/gallery/view/theme/theme.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/news/view/add/add.css b/module/news/view/add/add.css index 2aa6edae..51a18ec5 100755 --- a/module/news/view/add/add.css +++ b/module/news/view/add/add.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/news/view/config/config.css b/module/news/view/config/config.css index 2aa6edae..51a18ec5 100755 --- a/module/news/view/config/config.css +++ b/module/news/view/config/config.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/redirection/view/config/config.css b/module/redirection/view/config/config.css index 2aa6edae..51a18ec5 100755 --- a/module/redirection/view/config/config.css +++ b/module/redirection/view/config/config.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/redirection/view/index/index.css b/module/redirection/view/index/index.css index 2aa6edae..51a18ec5 100755 --- a/module/redirection/view/index/index.css +++ b/module/redirection/view/index/index.css @@ -13,4 +13,8 @@ */ -@import url("site/data/admin.css"); \ No newline at end of file +/** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/module/search/view/config/config.css b/module/search/view/config/config.css index 5e80538a..0cecd551 100755 --- a/module/search/view/config/config.css +++ b/module/search/view/config/config.css @@ -13,4 +13,8 @@ */ - @import url("site/data/admin.css"); \ No newline at end of file + /** @import url("site/data/admin.css"); */ + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file