From b5aab11aeb69038f954062ce330b437a0f7d8e48 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 13 May 2019 00:16:35 +0200 Subject: [PATCH] [9.1.04] apercu header WIP --- core/module/theme/view/header/header.js.php | 40 +++++++-------------- core/module/theme/view/header/header.php | 12 ------- 2 files changed, 13 insertions(+), 39 deletions(-) diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php index 31edd996..e1214352 100755 --- a/core/module/theme/view/header/header.js.php +++ b/core/module/theme/view/header/header.js.php @@ -12,22 +12,7 @@ -// 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 = "" + "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"); + /** @@ -35,11 +20,13 @@ $("#themeHeaderImage").on("change", function() { */ $("input, select").on("change", function() { - var themeHeaderHeight = $("#themeHeaderHeight").val(); - var widthSize = $("#themeHeaderImageWidth").val(); - var heightSize = $("#themeHeaderImageHeight").val(); - var themeHeaderImage = $("#themeHeaderImage").val(); + var tmpImg = new Image(); + var url = "" + "site/file/source/" + $("#themeHeaderImage").val(); + tmpImg.src= url; + + var themeHeaderHeight = $("#themeHeaderHeight").val(); + var themeHeaderImage = $("#themeHeaderImage").val(); // Import des polices de caractères var headerFont = $("#themeHeaderFont").val(); @@ -48,13 +35,11 @@ $("input, select").on("change", function() { // Couleurs, image, alignement et hauteur de la bannière css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";text-align:" + $("#themeHeaderTextAlign").val() + ";"; - // Hauteur proportionnelle - - + // Hauteur proportionnelle // Une imge est sélectionnée if(themeHeaderImage) { - + console.log ((tmpImg.height / tmpImg.width ) * 100 + "%;"); css += "background-image:url('site/file/source/" + themeHeaderImage + "');background-repeat:" + $("#themeHeaderImageRepeat").val() + ";background-position:" + $("#themeHeaderImagePosition").val() + ";"; // Adaptation de la bannière css += "background-size:" + $("#themeHeaderImageContainer").val() + ";"; @@ -62,9 +47,8 @@ $("input, select").on("change", function() { // Position responsive if (themeHeaderHeight === "none" ) { - css += "height: 0; padding-top:" + (heightSize / widthSize ) * 100 + "%;"; + css += "height: 0; padding-top:" + (tmpImg.height / tmpImg.width ) * 100 + "%;"; - console.log(widthSize + "-" + heightSize + ' ' + themeHeaderImage ); //console.log(css); } else { css += "line-height:" + $("#themeHeaderHeight").val() + ";height:" + themeHeaderHeight + ";"; @@ -74,7 +58,9 @@ $("input, select").on("change", function() { css += "background-image:none;"; // Forcer la sélection 150px - $("#themeHeaderHeight option:eq(2)").prop("selected", true); + // $("#themeHeaderHeight option:eq(2)").prop("selected", true); + // Forcer le titre dans le header + $("header .container").show(); } css += "}"; diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php index 4bfa4027..b0246bed 100755 --- a/core/module/theme/view/header/header.php +++ b/core/module/theme/view/header/header.php @@ -41,18 +41,6 @@

Image

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::hidden('themeHeaderImageWidth', [ - 'value' => $sizes [0], - 'noDirty' => true - ]); - echo template::hidden('themeHeaderImageHeight', [ - 'value' => $sizes [1], - 'noDirty' => true - ]); echo template::file('themeHeaderImage', [ 'label' => 'Fond', 'type' => 1,