From faeb33057960a3b71b2f70a0e9eddfd496efbe46 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 14 May 2020 19:22:09 +0200
Subject: [PATCH] =?UTF-8?q?093=20d=C3=A9placer=20admin.css=20dans=20data?=
 =?UTF-8?q?=20+=20d=C3=A9palcement=20d'un=20fichier=20de=20ressources?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                 | 24 +++++++++++++++++--
 core/module/config/view/backup/backup.css     |  2 +-
 core/module/config/view/index/index.css       |  2 +-
 core/module/config/view/manage/manage.css     |  2 +-
 core/module/config/view/restore/restore.css   |  2 +-
 core/module/config/view/script/script.css     |  2 +-
 .../{config => install}/ressource/.htaccess   |  0
 .../install/ressource}/admin.css              |  0
 core/module/install/view/index/index.css      |  2 +-
 core/module/install/view/update/update.css    |  2 +-
 core/module/page/view/edit/edit.css           |  2 +-
 core/module/theme/view/advanced/advanced.css  |  2 +-
 core/module/theme/view/body/body.css          |  2 +-
 core/module/theme/view/footer/footer.css      |  2 +-
 core/module/theme/view/header/header.css      |  2 +-
 core/module/theme/view/index/index.css        |  2 +-
 core/module/theme/view/manage/manage.css      |  2 +-
 core/module/theme/view/menu/menu.css          |  2 +-
 core/module/theme/view/site/site.css          |  2 +-
 core/module/user/view/add/add.css             |  2 +-
 core/module/user/view/edit/edit.css           |  2 +-
 core/module/user/view/forgot/forgot.css       |  2 +-
 core/module/user/view/index/index.css         |  2 +-
 core/module/user/view/login/login.css         |  2 +-
 core/module/user/view/reset/reset.css         |  2 +-
 module/blog/view/add/add.css                  |  2 +-
 module/blog/view/comment/comment.css          |  2 +-
 module/blog/view/config/config.css            |  2 +-
 module/blog/view/edit/edit.css                |  2 +-
 module/form/view/config/config.css            |  2 +-
 module/form/view/data/data.css                |  2 +-
 module/gallery/view/config/config.css         |  2 +-
 module/gallery/view/edit/edit.css             |  2 +-
 module/gallery/view/theme/theme.css           |  2 +-
 module/news/view/add/add.css                  |  2 +-
 module/news/view/config/config.css            |  2 +-
 module/redirection/view/config/config.css     |  2 +-
 module/redirection/view/index/index.css       |  2 +-
 38 files changed, 57 insertions(+), 37 deletions(-)
 rename core/module/{config => install}/ressource/.htaccess (100%)
 rename core/{layout => module/install/ressource}/admin.css (100%)

diff --git a/core/core.php b/core/core.php
index 05d853a5..1d4f75fc 100755
--- a/core/core.php
+++ b/core/core.php
@@ -152,7 +152,7 @@ class common {
 				$this->importData($keepUsers);
 				unset ($_SESSION['KEEP_USERS']);
 				// Réinstaller htaccess		
-				copy('core/module/config/ressource/.htaccess', self::DATA_DIR . '.htaccess');		
+				copy('core/module/install/ressource/.htaccess', self::DATA_DIR . '.htaccess');	
 				common::$importNotices [] = "Importation réalisée avec succès" ;
 				//echo '<script>window.location.replace("' .  helper::baseUrl() . $this->getData(['config','homePageId']) . '")</script>';
 		}
@@ -165,6 +165,10 @@ class common {
 				common::$coreNotices [] = $stageId ;
 			}
 		}
+		// Copier le thème de l'administration
+		if (!file_exists(self::DATA_DIR . 'admin.css')) {
+			copy('core/module/install/ressource/admin.css',self::DATA_DIR .'admin.css'); 	
+		}		
 
 		// Utilisateur connecté
 		if($this->user === []) {
@@ -1240,7 +1244,7 @@ class common {
 
 			$this->setData(['core', 'dataVersion', 10000]);	
 		}
-				// Version 10.0.092
+		// Version 10.0.092
 		if ($this->getData(['core', 'dataVersion']) < 10092) {
 			// Suppression du dossier fullpage
 			if (is_dir('core/vendor/fullpage')) {
@@ -1257,6 +1261,22 @@ class common {
 				unlink ('core/vendor/tinymce/templates/fullPageSlides.html'); }
 			$this->setData(['core', 'dataVersion', 10092]);
 		}
+		// Version 10.0.093
+		if ($this->getData(['core', 'dataVersion']) < 10093) {
+			// Déplacement du fichier admin.css dans data
+			if (file_exists('core/layout/admin.css')) {
+				copy('core/layout/admin.css',self::DATA_DIR.'admin.css'); 
+				unlink('core/layout/admin.css');
+			} else {
+				copy('core/module/install/ressource/admin.css',self::DATA_DIR .'admin.css'); 
+			}	
+			//Déplacement d'un fichier de ressources
+			if (file_exists('core/module/config/ressource/.htaccess'))	{
+				unlink('core/module/config/ressource/.htaccess');
+				rmdir ('core/module/config/ressource');
+			}
+			$this->setData(['core', 'dataVersion', 10093]);
+		}
 
 	}
 }
diff --git a/core/module/config/view/backup/backup.css b/core/module/config/view/backup/backup.css
index 9774521b..6faa3a6a 100755
--- a/core/module/config/view/backup/backup.css
+++ b/core/module/config/view/backup/backup.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/admin.css");
\ No newline at end of file
diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css
index 9774521b..6faa3a6a 100755
--- a/core/module/config/view/index/index.css
+++ b/core/module/config/view/index/index.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/admin.css");
\ No newline at end of file
diff --git a/core/module/config/view/manage/manage.css b/core/module/config/view/manage/manage.css
index 9774521b..6faa3a6a 100755
--- a/core/module/config/view/manage/manage.css
+++ b/core/module/config/view/manage/manage.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/admin.css");
\ No newline at end of file
diff --git a/core/module/config/view/restore/restore.css b/core/module/config/view/restore/restore.css
index 9774521b..6faa3a6a 100755
--- a/core/module/config/view/restore/restore.css
+++ b/core/module/config/view/restore/restore.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 9774521b..6faa3a6a 100755
--- a/core/module/config/view/script/script.css
+++ b/core/module/config/view/script/script.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/admin.css");
\ No newline at end of file
diff --git a/core/module/config/ressource/.htaccess b/core/module/install/ressource/.htaccess
similarity index 100%
rename from core/module/config/ressource/.htaccess
rename to core/module/install/ressource/.htaccess
diff --git a/core/layout/admin.css b/core/module/install/ressource/admin.css
similarity index 100%
rename from core/layout/admin.css
rename to core/module/install/ressource/admin.css
diff --git a/core/module/install/view/index/index.css b/core/module/install/view/index/index.css
index 1cd24778..ba396f2e 100755
--- a/core/module/install/view/index/index.css
+++ b/core/module/install/view/index/index.css
@@ -14,4 +14,4 @@
 
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 b547b6c6..b7b07fc9 100755
--- a/core/module/install/view/update/update.css
+++ b/core/module/install/view/update/update.css
@@ -14,5 +14,5 @@
 
 
 /*
-@import url("core/layout/admin.css");
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/core/module/page/view/edit/edit.css
+++ b/core/module/page/view/edit/edit.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/admin.css");
\ No newline at end of file
diff --git a/core/module/theme/view/advanced/advanced.css b/core/module/theme/view/advanced/advanced.css
index 7ae5b983..bfeedf7c 100755
--- a/core/module/theme/view/advanced/advanced.css
+++ b/core/module/theme/view/advanced/advanced.css
@@ -13,4 +13,4 @@
  */
 
 /* Thème administration */
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 09788d08..5ad98fd8 100755
--- a/core/module/theme/view/body/body.css
+++ b/core/module/theme/view/body/body.css
@@ -11,7 +11,7 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
+@import url("site/data/admin.css");
 
 #backToTop {
     display: block;
diff --git a/core/module/theme/view/footer/footer.css b/core/module/theme/view/footer/footer.css
index 7ae5b983..bfeedf7c 100755
--- a/core/module/theme/view/footer/footer.css
+++ b/core/module/theme/view/footer/footer.css
@@ -13,4 +13,4 @@
  */
 
 /* Thème administration */
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 9774521b..6faa3a6a 100755
--- a/core/module/theme/view/header/header.css
+++ b/core/module/theme/view/header/header.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 451894c3..afff18ca 100755
--- a/core/module/theme/view/index/index.css
+++ b/core/module/theme/view/index/index.css
@@ -12,7 +12,7 @@
 
 
 /* Thème administration */
-@import url("core/layout/admin.css");
+@import url("site/data/admin.css");
 
 #bar,
 #site,
diff --git a/core/module/theme/view/manage/manage.css b/core/module/theme/view/manage/manage.css
index 7ae5b983..bfeedf7c 100755
--- a/core/module/theme/view/manage/manage.css
+++ b/core/module/theme/view/manage/manage.css
@@ -13,4 +13,4 @@
  */
 
 /* Thème administration */
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 9774521b..6faa3a6a 100755
--- a/core/module/theme/view/menu/menu.css
+++ b/core/module/theme/view/menu/menu.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/core/module/theme/view/site/site.css
+++ b/core/module/theme/view/site/site.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 9774521b..6faa3a6a 100755
--- a/core/module/user/view/add/add.css
+++ b/core/module/user/view/add/add.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/core/module/user/view/edit/edit.css
+++ b/core/module/user/view/edit/edit.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/core/module/user/view/forgot/forgot.css
+++ b/core/module/user/view/forgot/forgot.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/core/module/user/view/index/index.css
+++ b/core/module/user/view/index/index.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 c2e6aaa2..be22d3c4 100755
--- a/core/module/user/view/login/login.css
+++ b/core/module/user/view/login/login.css
@@ -13,7 +13,7 @@
  */
 
 
-@import url("core/layout/admin.css");
+@import url("site/data/admin.css");
 
 #site {
     background-color: #fff !important;
diff --git a/core/module/user/view/reset/reset.css b/core/module/user/view/reset/reset.css
index 9774521b..6faa3a6a 100755
--- a/core/module/user/view/reset/reset.css
+++ b/core/module/user/view/reset/reset.css
@@ -12,4 +12,4 @@
  * @link http://zwiicms.com/
  */
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/blog/view/add/add.css
+++ b/module/blog/view/add/add.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/blog/view/comment/comment.css
+++ b/module/blog/view/comment/comment.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/blog/view/config/config.css
+++ b/module/blog/view/config/config.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/blog/view/edit/edit.css
+++ b/module/blog/view/edit/edit.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 41e81738..3d3c7ee7 100755
--- a/module/form/view/config/config.css
+++ b/module/form/view/config/config.css
@@ -1,4 +1,4 @@
-@import url("core/layout/admin.css");
+@import url("site/data/admin.css");
 
 /*
 .formConfigInput {
diff --git a/module/form/view/data/data.css b/module/form/view/data/data.css
index 3b94602b..74fce65d 100755
--- a/module/form/view/data/data.css
+++ b/module/form/view/data/data.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 b8d5a798..424570ff 100755
--- a/module/gallery/view/config/config.css
+++ b/module/gallery/view/config/config.css
@@ -13,7 +13,7 @@
  */
 
 
-@import url("core/layout/admin.css");
+@import url("site/data/admin.css");
 
 .galleryConfigError {
 	color: #F3674A;
diff --git a/module/gallery/view/edit/edit.css b/module/gallery/view/edit/edit.css
index 3b94602b..74fce65d 100755
--- a/module/gallery/view/edit/edit.css
+++ b/module/gallery/view/edit/edit.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/gallery/view/theme/theme.css
+++ b/module/gallery/view/theme/theme.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/news/view/add/add.css
+++ b/module/news/view/add/add.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/news/view/config/config.css
+++ b/module/news/view/config/config.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/redirection/view/config/config.css
+++ b/module/redirection/view/config/config.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/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 3b94602b..74fce65d 100755
--- a/module/redirection/view/index/index.css
+++ b/module/redirection/view/index/index.css
@@ -13,4 +13,4 @@
  */
 
 
-@import url("core/layout/admin.css");
\ No newline at end of file
+@import url("site/data/admin.css");
\ No newline at end of file