From 1bc8589b39478f5c9645ef4dff9f1539ee786b09 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 9 May 2019 22:51:30 +0200
Subject: [PATCH] =?UTF-8?q?[9.1.04]=20aper=C3=A7u=20modif=20header=20in=20?=
 =?UTF-8?q?progress?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/theme/view/header/header.js.php | 44 ++++++++++++++++++---
 core/module/theme/view/header/header.php    |  9 +++++
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php
index 43ecf0ba..bbc4a551 100755
--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
@@ -10,18 +10,31 @@
  * @link http://zwiicms.com/
  */
 
+
+
+
 /**
  * Aperçu en direct
  */
 $("input, select").on("change", function() {
+
 	// Import des polices de caractères
 	var headerFont = $("#themeHeaderFont").val();
 	var css = "@import url('https://fonts.googleapis.com/css?family=" + headerFont + "');";
-	// Adaptation aux média
-	css += "@media (max-width: 767px) {header{height:" + $("#themeHeaderHeight").val() + "/2;line-height:" + $("#themeHeaderHeight").val() + "/2;}}";
+
 	// Couleurs, image, alignement et hauteur de la bannière
-	css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";text-align:" + $("#themeHeaderTextAlign").val() + ";height:" + $("#themeHeaderHeight").val() + ";line-height:" + $("#themeHeaderHeight").val() + "}";
-		
+	css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";text-align:" + $("#themeHeaderTextAlign").val() + ";line-height:" + $("#themeHeaderHeight").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 += ";height:" + themeHeaderHeight + ";}";
+	}	
+
 	var themeHeaderImage = $("#themeHeaderImage").val();
 	if(themeHeaderImage) {
 		css += "header{background-image:url('<?php echo helper::baseUrl(false); ?>site/file/source/" + themeHeaderImage + "');background-repeat:" + $("#themeHeaderImageRepeat").val() + ";background-position:" + $("#themeHeaderImagePosition").val() + "}";
@@ -29,8 +42,14 @@ $("input, select").on("change", function() {
 	else {
 		css += "header{background-image:none}";
 	}
+
 	// Adaptation de la bannière
 	css += "header{background-size:" + $("#themeHeaderImageContainer").val() + "}";
+
+
+console.log(css);
+
+
 	// Taille, couleur, épaisseur et capitalisation du titre de la bannière
 	css += "header span{color:" + $("#themeHeaderTextColor").val() + ";font-family:'" + headerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeHeaderFontWeight").val() + ";font-size:" + $("#themeHeaderFontSize").val() + ";text-transform:" + $("#themeHeaderTextTransform").val() + "}";
 	// Cache le titre de la bannière
@@ -89,7 +108,7 @@ $("input, select").on("change", function() {
 		.attr("id", "themePreview")
 		.text(css)
 		.appendTo("head");
-});
+}).trigger("change");
 
 $("#themeHeaderHeight").on("change", function() {
 	if($(this).val() === 'none') {
@@ -100,6 +119,21 @@ $("#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() {
 	if($(this).val()) {
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index b0246bed..601d0e56 100755
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -40,6 +40,15 @@
 			<div class="block">
 				<h4>Image</h4>
 				<?php 
+				$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
+				]);
 				$imageFile = file_exists('site/file/source/'.$this->getData(['theme', 'header', 'image'])) ? $this->getData(['theme', 'header', 'image']) : "";
 				echo template::file('themeHeaderImage', [
 					'label' => 'Fond',