From 40c35a0de7226d6e4643da0a401a3b8b627694f7 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Tue, 26 May 2020 00:03:58 +0200
Subject: [PATCH] =?UTF-8?q?10.2.dev5=20theme=20admin=20+=20pr=C3=A9sentati?=
 =?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/theme/view/admin/admin.js.php | 24 ++++++------
 core/module/theme/view/admin/admin.php    | 46 +++++++++++++----------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/core/module/theme/view/admin/admin.js.php b/core/module/theme/view/admin/admin.js.php
index ddcb9fb8..2046191f 100755
--- a/core/module/theme/view/admin/admin.js.php
+++ b/core/module/theme/view/admin/admin.js.php
@@ -14,7 +14,7 @@
  * Aperçu en direct
  */
 $("input, select").on("change", function() {
-    
+
     var titleFont = $("#adminFontTitle").val();
     var textFont = $("#adminFontText").val();
     var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
@@ -22,20 +22,20 @@ $("input, select").on("change", function() {
     var css = "#site{background-color:" + colors.normal + ";}";
     css += "body, .row > div {font:" + $("#adminFontTextSize").val() + " '" + $("#adminColorTitle").val()  + "', sans-serif;}";
     css += "body h1, h2, h3, h4, h5, h6 {font-family:'" +  titleFont + "', sans-serif; color:" + $("#adminColorTitle").val() + ";}";
-    css += "body:not(.editorWysiwyg),span .zwiico-help {color:" + colors.text + ";}";
-    css += "input[type=email],input[type=text],input[type=password],select,textarea:not(.editorWysiwyg),.inputFile{color: #222;}";
+    css += "body:not(.editorWysiwyg),span .zwiico-help {color:" + $("#adminColorText").val() + ";}";
     var colors = core.colorVariants($("#adminColorButton").val());
-    css += "input[type='checkbox']:checked + label::before,.speechBubble{ background-color:" + colors.normal + "; color:" + $("#adminColorButtonText").val() + ";}";       
-    css += ".speechBubble::before {border-color:" + colors.normal + " transparent transparent transparent;}";    
+    css += "input[type='checkbox']:checked + label::before,.speechBubble{ background-color:" + colors.normal + "; color:" + $("#adminColorButtonText").val() + ";}";
+    css += ".speechBubble::before {border-color:" + colors.normal + " transparent transparent transparent;}";
     css += ".button {background:" + colors.normal + ";color:" + $("#adminColorButtonText").val() + ";}.button:hover {background:" + colors.darken + ";color:" + $("#adminColorButtonText").val() + ";}.button:active {background:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + ";}";
-    var colors = core.colorVariants($("#adminColorGrey").val());    
-    css += ".button.buttonGrey {background: " + colors.normal + ";color:" + $("#adminColorButtonText").val() + ";}.button.buttonGrey:hover {background:" + colors.darken + ";color:" + $("#adminColorButtonText").val() + "}.button.buttonGrey:active {background:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + ";}";
-    var colors = core.colorVariants($("#adminColorRed").val());    
-    css += ".button.buttonRed {background: " + colors.normal + ";color:" + $("#adminColorButtonText").val() + ";}.button.buttonRed:hover {background:" + colors.darken + ";color:" + $("#adminColorButtonText").val() + "}.button.buttonRed:active {background:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + "}";
-    var colors = core.colorVariants($("#adminColorGreen").val());    
+    var colors = core.colorVariants($("#adminColorGrey").val());
+    css += ".button.buttonGrey {background: " + colors.normal + ";color:" + $("#adminColorButtonText").val() + ";}.button.buttonGrey:hover {background-color:" + colors.darken + ";color:" + $("#adminColorButtonText").val() + "}.button.buttonGrey:active {background-color:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + ";}";
+    var colors = core.colorVariants($("#adminColorRed").val());
+    css += ".button.buttonRed {background: " + colors.normal + ";color:" + $("#adminColorButtonText").val() + ";}.button.buttonRed:hover {background-color:" + colors.darken + ";color:" + $("#adminColorButtonText").val() + "}.button.buttonRed:active {background-color:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + "}";
+    var colors = core.colorVariants($("#adminColorGreen").val());
     css += "button[type=submit] {background-color: " + colors.normal + ";color: " + ";color:" + $("#adminColorButtonText").val() + "}button[type=submit]:hover {background-color: " + colors.darken +  ";color:" + $("#adminColorButtonText").val() + ";}button[type=submit]:active {background:" + colors.veryDarken + ";color:" + $("#adminColorButtonText").val() + "}";
-    var colors = core.colorVariants($("#adminBackGroundBlockColor").val());  
-    css += ".block {border: 1px solid " + $("#adminBorderBlockColor").val() + ";}.block h4 {background: "  + colors.normal + ";color:" + colors.text + ";}";
+    var colors = core.colorVariants($("#adminBackGroundBlockColor").val());
+    css += ".block {border: 1px solid " + $("#adminBorderBlockColor").val() + ";}.block h4 {background-color: "  + colors.normal + ";color:" + colors.text + ";}";
+    css += "input[type=email],input[type=text],input[type=password],select,textarea:not(.editorWysiwyg),.inputFile{background-color: "  + colors.normal + ";color:" + colors.text + ";border: 1px solid " + $("#adminBorderBlockColor").val() + ";}";
 
 	// Ajout du css au DOM
 	$("#themePreview").remove();
diff --git a/core/module/theme/view/admin/admin.php b/core/module/theme/view/admin/admin.php
index 20ae73de..a91d4c92 100755
--- a/core/module/theme/view/admin/admin.php
+++ b/core/module/theme/view/admin/admin.php
@@ -8,11 +8,17 @@
 				'value' => 'Retour'
 			]); ?>
 		</div>
-		<div class="col2 offset6">
+		<div class="col2 offset4">
+			<?php echo template::button('configAdminTest', [
+				'value' => 'Bouton Standard'
+			]); ?>
+		</div>
+		<div class="col2 offset">
 			<?php echo template::button('configAdminReset', [
 				'class' => 'buttonRed',
 				'href' => helper::baseUrl() . 'theme/resetAdmin',
-				'value' => 'Réinitialiser'
+				'value' => 'Réinitialiser',
+				'ico' => 'cancel'
 			]); ?>
 		</div>
 		<div class="col2">
@@ -35,24 +41,6 @@
 							'value' => $this->getData(['admin', 'backgroundColor'])
 						]); ?>
 					</div>
-					<div class="col4">
-						<?php echo template::text('adminBackGroundBlockColor', [
-							'class' => 'colorPicker',
-							'help' => 'Couleur visible en l\'absence d\'une image.<br />Le curseur horizontal règle le niveau de transparence.',
-							'label' => 'Arrière-plan des blocs',
-							'value' => $this->getData(['admin', 'backgroundBlockColor'])
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::text('adminBorderBlockColor', [
-							'class' => 'colorPicker',
-							'help' => 'Couleur visible en l\'absence d\'une image.<br />Le curseur horizontal règle le niveau de transparence.',
-							'label' => 'Bordure des blocs',
-							'value' => $this->getData(['admin', 'borderBlockColor'])
-						]); ?>
-					</div>
-				</div>
-				<div class="row">
 					<div class="col4">
 						<?php echo template::text('adminColorTitle', [
 							'class' => 'colorPicker',
@@ -69,6 +57,24 @@
 							'value' => $this->getData(['admin', 'colorText'])
 						]); ?>
 					</div>
+				</div>
+				<div class="row">
+					<div class="col4">
+						<?php echo template::text('adminBackGroundBlockColor', [
+							'class' => 'colorPicker',
+							'help' => 'Couleur visible en l\'absence d\'une image.<br />Le curseur horizontal règle le niveau de transparence. La couleur du texte est automatique.',
+							'label' => 'Arrière-plan des champs',
+							'value' => $this->getData(['admin', 'backgroundBlockColor'])
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::text('adminBorderBlockColor', [
+							'class' => 'colorPicker',
+							'help' => 'Couleur visible en l\'absence d\'une image.<br />Le curseur horizontal règle le niveau de transparence.',
+							'label' => 'Bordure des champs',
+							'value' => $this->getData(['admin', 'borderBlockColor'])
+						]); ?>
+					</div>
 					<div class="col4">
 						<?php echo template::text('adminColorButtonText', [
 							'class' => 'colorPicker',