From ec59a0c77cf976c63390c36311ca35e44d9fd7dd Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sun, 25 Oct 2020 22:49:28 +0100
Subject: [PATCH 1/4] =?UTF-8?q?2=20bugs=20de=20th=C3=A8me=20:=20import=20a?=
 =?UTF-8?q?dmin=20et=20nettoyage=20tmp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                      |  4 +++-
 core/core.php                   | 11 +++++++++++
 core/module/install/install.php | 14 +-------------
 core/module/theme/theme.php     | 13 ++++++++-----
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fbb496f3..203f2a1e 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,10 @@
 # Changelog
 
 ## version 10.3.04
-- Correction :
+- Corrections :
     - 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.
 
 ## version 10.3.03
 - Correction :
diff --git a/core/core.php b/core/core.php
index c7d68d12..f0b1da93 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1022,6 +1022,17 @@ class common {
 		$db->save;
 	}
 
+	/**
+	* Effacer un dossier non vide.
+	* @param string URL du dossier à supprimer
+	*/
+	public function removeDir ( $path ) {
+		foreach ( new DirectoryIterator($path) as $item ):
+			if ( $item->isFile() ) unlink($item->getRealPath());
+			if ( !$item->isDot() && $item->isDir() ) $this->removeDir($item->getRealPath());
+		endforeach;
+		rmdir($path);
+	}
 
 	/**
 	 * Mises à jour
diff --git a/core/module/install/install.php b/core/module/install/install.php
index e3479ee8..7dfdf89f 100644
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
@@ -18,8 +18,7 @@ class install extends common {
 	public static $actions = [
 		'index' => self::GROUP_VISITOR,
 		'steps' => self::GROUP_ADMIN,
-		'update' => self::GROUP_ADMIN,
-		'removeAll' => self::GROUP_ADMIN
+		'update' => self::GROUP_ADMIN
 	];
 
 
@@ -253,16 +252,5 @@ class install extends common {
 		]);
 	}
 
-	/**
-	* Effacer un dossier non vide.
-	*/
-	private function removeAll ( $path ) {
-		foreach ( new DirectoryIterator($path) as $item ):
-			if ( $item->isFile() ) unlink($item->getRealPath());
-			if ( !$item->isDot() && $item->isDir() ) $this->removeAll($item->getRealPath());
-		endforeach;
-
-		rmdir($path);
-	}
 
 }
\ No newline at end of file
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 177800cb..a97f8635 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -616,16 +616,19 @@ class theme extends common {
 				mkdir (self::TEMP_DIR . $tempFolder);
 				$zip->extractTo(self::TEMP_DIR . $tempFolder );
 				// Archive de thème ?
-				if ( file_exists(self::TEMP_DIR . $tempFolder . '/site/data/custom.css')
-					AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/theme.css')
-					AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/theme.json') ) {
+				if (( file_exists(self::TEMP_DIR . $tempFolder . '/site/data/custom.css')
+					 AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/theme.css')
+					 AND file_exists(self::TEMP_DIR . $tempFolder . '/site/data/theme.json')
+					) OR (
+						file_exists(self::TEMP_DIR . $tempFolder . '/site/data/admin.json')
+					)
+				) {
 					// traiter l'archive
 					$success = $zip->extractTo('.');
 					// traitement de l'erreur
 					$notification = $success ? 'Le thème a été importé' : 'Erreur lors de l\'extraction, vérifiez les permissions.';
 					// Supprimmer le dossier temporaire
-					$install = new install;
-					$install->removeAll(self::TEMP_DIR . $tempFolder);
+					$this->removeDir(self::TEMP_DIR . $tempFolder);
 				} else {
 					// pas une archive de thème
 					$success = false;

From dd65cdb3c2ebad004ec92218f7ad04544d3612cd Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sun, 25 Oct 2020 22:55:21 +0100
Subject: [PATCH 2/4] =?UTF-8?q?Pr=C3=A9sentation=20am=C3=A9lior=C3=A9e=20d?=
 =?UTF-8?q?u=20mail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/layout/mail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/layout/mail.php b/core/layout/mail.php
index 6638ee19..c8bc04b4 100644
--- a/core/layout/mail.php
+++ b/core/layout/mail.php
@@ -71,7 +71,7 @@
 	<div style="display:none;font-size:1px;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;mso-hide:all;font-family: sans-serif;">
 		<?php echo $subject; ?>
 	</div>
-	<div style="max-width: 500px; margin: auto;" class="email-container">
+	<div style="max-width: 500px; margin: auto; margin-top: 30px; border: #aaa 1px solid;" class="email-container">
 		<!--[if mso]>
 			<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="500" align="center">
 				<tr>

From 41c44b45572d0ffbb303c85b4d411c2c111b4f86 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 28 Oct 2020 07:53:51 +0100
Subject: [PATCH 3/4] =?UTF-8?q?th=C3=A8me=20admin=20css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                                   |  1 +
 core/core.php                                |  5 ++++-
 core/module/config/view/backup/backup.css    | 10 +++++++++-
 core/module/config/view/index/index.css      | 10 +++++++++-
 core/module/config/view/manage/manage.css    |  6 +++++-
 core/module/config/view/script/script.css    |  6 +++++-
 core/module/install/view/update/update.css   |  6 +++++-
 core/module/page/view/edit/edit.css          |  6 +++++-
 core/module/theme/view/admin/admin.css       |  6 +++++-
 core/module/theme/view/advanced/advanced.css |  6 +++++-
 core/module/theme/view/body/body.css         |  6 +++++-
 core/module/theme/view/footer/footer.css     |  6 +++++-
 core/module/theme/view/header/header.css     |  6 +++++-
 core/module/theme/view/index/index.css       |  6 +++++-
 core/module/theme/view/manage/manage.css     |  6 +++++-
 core/module/theme/view/menu/menu.css         |  6 +++++-
 core/module/theme/view/site/site.css         |  6 +++++-
 core/module/user/view/add/add.css            |  6 +++++-
 core/module/user/view/edit/edit.css          |  6 +++++-
 core/module/user/view/forgot/forgot.css      |  6 +++++-
 core/module/user/view/index/index.css        |  6 +++++-
 core/module/user/view/login/login.css        |  6 +++++-
 core/module/user/view/reset/reset.css        |  6 +++++-
 module/blog/view/add/add.css                 |  6 +++++-
 module/blog/view/comment/comment.css         |  6 +++++-
 module/blog/view/config/config.css           |  6 +++++-
 module/blog/view/edit/edit.css               |  6 +++++-
 module/form/view/config/config.css           |  6 +++++-
 module/form/view/data/data.css               |  6 +++++-
 module/gallery/view/config/config.css        |  6 +++++-
 module/gallery/view/edit/edit.css            |  6 +++++-
 module/gallery/view/theme/theme.css          |  6 +++++-
 module/news/view/add/add.css                 |  6 +++++-
 module/news/view/config/config.css           |  6 +++++-
 module/redirection/view/config/config.css    |  6 +++++-
 module/redirection/view/index/index.css      |  6 +++++-
 module/search/view/config/config.css         |  6 +++++-
 37 files changed, 188 insertions(+), 36 deletions(-)

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 '<base href="' . helper::baseUrl(true) .'">';
+			if (strpos($this->core->output['style'], 'admin.css') >= 1 ) {
+				echo '<link rel="stylesheet" href="' . self::DATA_DIR . 'admin.css?' . md5_file(self::DATA_DIR .'admin.css') . '">';
+			}
 			echo '<style type="text/css">' . helper::minifyCss($this->core->output['style']) . '</style>';
 		}
 	}
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

From b8772c0ac6acef46b0212ff9e8a141436c1caea8 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 28 Oct 2020 19:02:19 +0100
Subject: [PATCH 4/4] changes

---
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index ae1c3093..6c3f5fcf 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,8 @@
     - 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.
+- Amélioration :
+    - Mise en page du corps des mails de notification.
 
 ## version 10.3.03
 - Correction :