remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

[9.2.10] Changement d'un nom de clé

Browse Source
This commit is contained in:
fredtempez 2019-11-09 19:03:03 +01:00
parent d5be2e866c
commit f5a3aae819
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/core.php
View File

@ -958,11 +958,19 @@ class common {
}
// Version 9.2.10
if($this->getData(['core', 'dataVersion']) < 9210) {
// Utile pour l'installation d'un backup sur un autre serveur
$this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]);
// Préparation des clés de légendes pour la v10
// Suppression d'une option de hauteur de la bannière
if ($this->getData(['theme', 'header','height']) === 'none') {
$this->setData(['theme', 'header','height','150px']);
}
// Changer le nom de la clé linkHome -> linkHomePage
$this->setdata(['theme','header','linkHomePage',$this->getData(['theme','header','linkHome'])]);
$this->deleteData(['theme','header','linkHome']);
// Préparation des clés de légendes pour la v10
// Construire une liste plate de parents et d'enfants
foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {

8
core/layout/main.php
View File

@ -50,7 +50,7 @@
<!-- Bannière dans le fond du site -->
<header>
<?php
if ($this->getData(['theme','header','linkHome'])){
if ($this->getData(['theme','header','linkHomePage'])){
echo "<a href='" . helper::baseUrl(false) . "'>" ;} ?>
<?php if(
$this->getData(['theme', 'header', 'textHide']) === false
@ -66,7 +66,7 @@
</div> <!--fin container -->
<?php endif; ?>
<?php
if ($this->getData(['theme','header','linkHome'])){echo "</a>";}
if ($this->getData(['theme','header','linkHomePage'])){echo "</a>";}
?>
</header>
<?php endif; ?>
@ -97,7 +97,7 @@
): ?>
<!-- Bannière dans le site -->
<?php
if ($this->getData(['theme','header','linkHome'])){
if ($this->getData(['theme','header','linkHomePage'])){
echo "<a href='" . helper::baseUrl(false) . "'>" ;} ?>
<header <?php if($this->getData(['theme', 'header', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
<?php if(
@ -115,7 +115,7 @@
<?php endif; ?>
</header>
<?php
if ($this->getData(['theme','header','linkHome'])){echo "</a>";} ?>
if ($this->getData(['theme','header','linkHomePage'])){echo "</a>";} ?>
<?php endif; ?>
<?php if(
$this->getData(['theme', 'menu', 'position']) === 'site-second' ||

2
core/module/install/ressource/defaultdata.php
View File

@ -460,7 +460,7 @@ class install extends common {
'textColor' => 'rgba(33, 34, 35, 1)',
'textHide' => true,
'textTransform' => 'none',
'linkHome' => true,
'linkHomePage' => true,
'imageContainer' => 'auto'
],
'link' => [

2
core/module/theme/theme.php
View File

@ -366,7 +366,7 @@ class theme extends common {
'textAlign' => $this->getInput('themeHeaderTextAlign'),
'textColor' => $this->getInput('themeHeaderTextColor'),
'textHide' => $this->getInput('themeHeaderTextHide', helper::FILTER_BOOLEAN),
'linkHome' => $this->getInput('themeHeaderlinkHome',helper::FILTER_BOOLEAN),
'linkHomePage' => $this->getInput('themeHeaderlinkHomePage',helper::FILTER_BOOLEAN),
'imageContainer' => $this->getInput('themeHeaderImageContainer')
]]);
// Modification de la position du menu selon la position de la bannière

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

@ -81,8 +81,8 @@
]); ?>
</div>
<div id="themeHeaderShow" class="col6">
<?php echo template::checkbox('themeHeaderlinkHome', true, 'Bannière cliquable', [
'checked' => $this->getData(['theme', 'header', 'linkHome'])
<?php echo template::checkbox('themeHeaderlinkHomePage', true, 'Bannière cliquable', [
'checked' => $this->getData(['theme', 'header', 'linkHomePage'])
]); ?>
</div>
</div>