From d315060e0a39afe9671bead78746bdb1be77b6c3 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sun, 12 May 2019 09:03:50 +0200
Subject: [PATCH] =?UTF-8?q?[9.1.04]=20aper=C3=A7u=20dans=20le=20header=20?=
 =?UTF-8?q?=20travail=20en=20cours?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/theme/view/header/header.js.php | 79 +++++++++++++--------
 core/module/theme/view/header/header.php    | 20 +++---
 2 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php
index 937d404b..31edd996 100755
--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
@@ -12,12 +12,35 @@
 
 
 
+// Récupérer les dimensions de l'image et les place dans des champs cachés
+$("#themeHeaderImage").on("change", function() {
+	if($(this).val() !== '') {
+		var tmpImg = new Image();
+		var url = "<?php echo helper::baseUrl(false); ?>" + "site/file/source/" + $("#themeHeaderImage").val();
+		tmpImg.src= url;
+		$(tmpImg).on('load',function(){
+			$("#themeHeaderImageWidth").val(tmpImg.width);
+			$("#themeHeaderImageHeight").val(tmpImg.height);
+		});	
+	} else {
+		$("#themeHeaderImageWidth").val(0);
+		$("#themeHeaderImageHeight").val(0);
+	}
+	console.log ("imagesize");
+}).trigger("change");
+
 
 /**
  * Aperçu en direct
  */
 $("input, select").on("change", function() {
 
+	var themeHeaderHeight = $("#themeHeaderHeight").val();
+	var widthSize =  $("#themeHeaderImageWidth").val();
+	var heightSize	= $("#themeHeaderImageHeight").val(); 
+	var themeHeaderImage = $("#themeHeaderImage").val();
+
+
 	// Import des polices de caractères
 	var headerFont = $("#themeHeaderFont").val();
 	var css = "@import url('https://fonts.googleapis.com/css?family=" + headerFont + "');";
@@ -26,28 +49,36 @@ $("input, select").on("change", function() {
 	css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";text-align:" + $("#themeHeaderTextAlign").val() + ";";
 
 	// Hauteur proportionnelle
-	var themeHeaderHeight = $("#themeHeaderHeight").val();
-	var widthSize =  $("#themeHeaderImageWidth").val();
-	var heightSize	= $("#themeHeaderImageHeight").val(); 
-	if (themeHeaderHeight === "none" ) {
-			css += "height: 0;  padding-top:" + (heightSize / widthSize ) * 100 + "%}";		
-		} else {
-			css += ";line-height:" + $("#themeHeaderHeight").val() + ";height:" + themeHeaderHeight + "}";
-	}	
 
-	var themeHeaderImage = $("#themeHeaderImage").val();
+	
+	// Une imge est sélectionnée
 	if(themeHeaderImage) {
-		css += "header{background-image:url('<?php echo helper::baseUrl(false); ?>site/file/source/" + themeHeaderImage + "');background-repeat:" + $("#themeHeaderImageRepeat").val() + ";background-position:" + $("#themeHeaderImagePosition").val() + "}";
-	}
-	else {
-		css += "header{background-image:none}";
-	}
 
-	// Adaptation de la bannière
-	css += "header{background-size:" + $("#themeHeaderImageContainer").val() + "}";
+		
+		css += "background-image:url('<?php echo helper::baseUrl(false); ?>site/file/source/" + themeHeaderImage + "');background-repeat:" + $("#themeHeaderImageRepeat").val() + ";background-position:" + $("#themeHeaderImagePosition").val() + ";";
+		// Adaptation de la bannière
+		css += "background-size:" + $("#themeHeaderImageContainer").val() + ";";
 
+		// Position responsive
+		if (themeHeaderHeight === "none" ) {
+
+			css += "height: 0;  padding-top:" + (heightSize / widthSize ) * 100 + "%;";	
+
+			console.log(widthSize + "-" + heightSize + ' ' + themeHeaderImage );
+			//console.log(css);	
+		} else {
+			css += "line-height:" + $("#themeHeaderHeight").val() + ";height:" + themeHeaderHeight + ";";
+		}
+
+	}else {
+		
+		css += "background-image:none;";
+		// Forcer la sélection 150px
+		$("#themeHeaderHeight option:eq(2)").prop("selected", true);
+	
+	} 
+	css += "}";
 
-console.log(widthSize + "-" + heightSize + ' ' + themeHeaderImage );
 
 
 	// Taille, couleur, épaisseur et capitalisation du titre de la bannière
@@ -119,20 +150,6 @@ $("#themeHeaderHeight").on("change", function() {
 	}
 }).trigger("change");
 
-// Récupérer les dimensions de l'image et les place dans des champs cachés
-$("#themeHeaderImage").on("change", function() {
-	if($(this).val() !== '') {
-		var tmpImg = new Image();
-		var url = "<?php echo helper::baseUrl(false); ?>" + "site/file/source/" + $("#themeHeaderImage").val();
-		tmpImg.src= url;
-		$(tmpImg).on('load',function(){
-			$("#themeHeaderImageWidth").val(tmpImg.width);
-			$("#themeHeaderImageHeight").val(tmpImg.height);
-		});
-	}
-}).trigger("change");
-
-
 
 // Affiche / Cache les options de l'image du fond
 $("#themeHeaderImage").on("change", function() {
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index ac2c6ebe..4bfa4027 100755
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -43,16 +43,16 @@
 				$imageFile = file_exists('site/file/source/'.$this->getData(['theme', 'header', 'image'])) ? $this->getData(['theme', 'header', 'image']) : "";
 				if ($this->getData(['theme', 'header', 'image']) && 
 				    $imageFile !== '') {
-					$sizes = getimagesize('site/file/source/'.$this->getData(['theme','header','image']));				
-					echo template::text('themeHeaderImageWidth', [
-						'value' => $sizes [0],
-						'noDirty' => true
-					]);
-					echo template::text('themeHeaderImageHeight', [
-						'value' => $sizes [1],
-						'noDirty' => true
-					]);
-				}
+					$sizes = getimagesize('site/file/source/'.$this->getData(['theme','header','image']));	
+				}			
+				echo template::hidden('themeHeaderImageWidth', [
+					'value' => $sizes [0],
+					'noDirty' => true
+				]);
+				echo template::hidden('themeHeaderImageHeight', [
+					'value' => $sizes [1],
+					'noDirty' => true
+				]);
 				echo template::file('themeHeaderImage', [
 					'label' => 'Fond',
 					'type' => 1,