lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

[9.1.04] header responsive test continuing

Browse Source
This commit is contained in:
fredtempez 2019-05-11 23:31:37 +02:00
parent 5ca13a9b0d
commit 665b66f2bf
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core.php
View File

@ -1006,16 +1006,16 @@ class core extends common {
$css .= ';height: 0; padding-top:'; $css .= ';height: 0; padding-top:';
$css .= ( $sizes[1] / $sizes[0] )* 100; $css .= ( $sizes[1] / $sizes[0] )* 100;
$css .= '%'; $css .= '%';
} else { //} else {
// Le fichier n'existe plus // Le fichier n'existe plus
// largeur par défaut // largeur par défaut
$css .= ';height: 150px;'; // $css .= ';height: 150px; line-height: 150px;';
} }
} else { } else {
// Valeur de hauteur traditionnelle // 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'])) { 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']) . '}'; $css .= 'header{background-image:url("../file/source/' . $themeHeaderImage . '");background-position:' . $this->getData(['theme', 'header', 'imagePosition']) . ';background-repeat:' . $this->getData(['theme', 'header', 'imageRepeat']) . '}';
} }

9
core/module/theme/view/header/header.js.php
View File

@ -23,16 +23,16 @@ $("input, select").on("change", function() {
var css = "@import url('https://fonts.googleapis.com/css?family=" + headerFont + "');"; var css = "@import url('https://fonts.googleapis.com/css?family=" + headerFont + "');";
// Couleurs, image, alignement et hauteur de la bannière // 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 // Hauteur proportionnelle
var themeHeaderHeight = $("#themeHeaderHeight").val(); var themeHeaderHeight = $("#themeHeaderHeight").val();
var widthSize = $("#themeHeaderImageWidth").val(); var widthSize = $("#themeHeaderImageWidth").val();
var heightSize = $("#themeHeaderImageHeight").val(); var heightSize = $("#themeHeaderImageHeight").val();
if (themeHeaderHeight === "none" ) { if (themeHeaderHeight === "none" ) {
css += ";height: 0; padding-top:" + (heightSize / widthSize ) * 100 + "%;}"; css += "height: 0; padding-top:" + (heightSize / widthSize ) * 100 + "%}";
} else { } else {
css += ";height:" + themeHeaderHeight + ";}"; css += ";line-height:" + $("#themeHeaderHeight").val() + ";height:" + themeHeaderHeight + "}";
} }
var themeHeaderImage = $("#themeHeaderImage").val(); var themeHeaderImage = $("#themeHeaderImage").val();
@ -47,7 +47,7 @@ $("input, select").on("change", function() {
css += "header{background-size:" + $("#themeHeaderImageContainer").val() + "}"; 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 // Taille, couleur, épaisseur et capitalisation du titre de la bannière
@ -145,6 +145,7 @@ $("#themeHeaderImage").on("change", function() {
}); });
} }
}).trigger("change"); }).trigger("change");
// Affiche / Cache les options de la position // Affiche / Cache les options de la position
$("#themeHeaderPosition").on("change", function() { $("#themeHeaderPosition").on("change", function() {
if($(this).val() === 'site') { if($(this).val() === 'site') {

21
core/module/theme/view/header/header.php
View File

@ -40,16 +40,19 @@
<div class="block"> <div class="block">
<h4>Image</h4> <h4>Image</h4>
<?php <?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']) : ""; $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', [ echo template::file('themeHeaderImage', [
'label' => 'Fond', 'label' => 'Fond',
'type' => 1, 'type' => 1,