From 665b66f2bfd4d0e18971850c35f3e8c0e8e7816d Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sat, 11 May 2019 23:31:37 +0200
Subject: [PATCH] [9.1.04] header responsive test continuing

---
 core/core.php                               |  8 ++++----
 core/module/theme/view/header/header.js.php |  9 +++++----
 core/module/theme/view/header/header.php    | 21 ++++++++++++---------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/core/core.php b/core/core.php
index 8bfcd270..7394fcb9 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1006,16 +1006,16 @@ class core extends common {
 					$css .= ';height: 0;  padding-top:';
 					$css .= ( $sizes[1] / $sizes[0] )* 100;
 					$css .= '%';
-				} else {
+				//} else {
 					// Le fichier n'existe plus
 					// largeur par défaut
-					$css .= ';height: 150px;';	
+				//	$css .= ';height: 150px; line-height: 150px;';	
 				}
 			} else {
 				// Valeur de hauteur traditionnelle
-				$css .= ';height:' . $this->getData(['theme', 'header', 'height']);
+				$css .= ';height:' . $this->getData(['theme', 'header', 'height']) . ';line-height:' . $this->getData(['theme', 'header', 'height']) ;
 			}
-			$css .=  ';line-height:' . $this->getData(['theme', 'header', 'height']) . ';text-align:' . $this->getData(['theme', 'header', 'textAlign']) . '}';
+			$css .=  ';text-align:' . $this->getData(['theme', 'header', 'textAlign']) . '}';
 			if($themeHeaderImage = $this->getData(['theme', 'header', 'image'])) {
 				$css .= 'header{background-image:url("../file/source/' . $themeHeaderImage . '");background-position:' . $this->getData(['theme', 'header', 'imagePosition']) . ';background-repeat:' . $this->getData(['theme', 'header', 'imageRepeat']) . '}';
 			}
diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php
index bbc4a551..937d404b 100755
--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
@@ -23,16 +23,16 @@ $("input, select").on("change", function() {
 	var css = "@import url('https://fonts.googleapis.com/css?family=" + headerFont + "');";
 
 	// Couleurs, image, alignement et hauteur de la bannière
-	css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";text-align:" + $("#themeHeaderTextAlign").val() + ";line-height:" + $("#themeHeaderHeight").val();
+	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 + "%;}";		
+			css += "height: 0;  padding-top:" + (heightSize / widthSize ) * 100 + "%}";		
 		} else {
-			css += ";height:" + themeHeaderHeight + ";}";
+			css += ";line-height:" + $("#themeHeaderHeight").val() + ";height:" + themeHeaderHeight + "}";
 	}	
 
 	var themeHeaderImage = $("#themeHeaderImage").val();
@@ -47,7 +47,7 @@ $("input, select").on("change", function() {
 	css += "header{background-size:" + $("#themeHeaderImageContainer").val() + "}";
 
 
-console.log(css);
+console.log(widthSize + "-" + heightSize + ' ' + themeHeaderImage );
 
 
 	// Taille, couleur, épaisseur et capitalisation du titre de la bannière
@@ -145,6 +145,7 @@ $("#themeHeaderImage").on("change", function() {
 		});
 	}
 }).trigger("change");
+
 // Affiche / Cache les options de la position
 $("#themeHeaderPosition").on("change", function() {
 	if($(this).val() === 'site') {
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index 1dcf7720..ac2c6ebe 100755
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -40,16 +40,19 @@
 			<div class="block">
 				<h4>Image</h4>
 				<?php 
-				$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
-				]);
 				$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
+					]);
+				}
 				echo template::file('themeHeaderImage', [
 					'label' => 'Fond',
 					'type' => 1,