[9.0.03] fin de fichiers - déplacement du header - barre sélection
This commit is contained in:
commit
92717302b8
|
@ -30,7 +30,7 @@ class common {
|
||||||
// Désactive l'update auto
|
// Désactive l'update auto
|
||||||
// const ZWII_VERSION = '9.0.00-dev27';
|
// const ZWII_VERSION = '9.0.00-dev27';
|
||||||
// Numéro de version stable
|
// Numéro de version stable
|
||||||
const ZWII_VERSION = '9.0.02';
|
const ZWII_VERSION = '9.0.03';
|
||||||
|
|
||||||
public static $actions = [];
|
public static $actions = [];
|
||||||
public static $coreModuleIds = [
|
public static $coreModuleIds = [
|
||||||
|
@ -3180,5 +3180,5 @@ class template {
|
||||||
// Retourne le html
|
// Retourne le html
|
||||||
return $html;
|
return $html;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
?>
|
|
@ -305,4 +305,5 @@ class configHelper extends helper {
|
||||||
return $dirContent;
|
return $dirContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
?>
|
|
@ -194,5 +194,5 @@ class install extends common {
|
||||||
'view' => 'update'
|
'view' => 'update'
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
?>
|
|
@ -30,4 +30,5 @@ class maintenance extends common {
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
?>
|
|
@ -37,16 +37,17 @@ class page extends common {
|
||||||
// Position du module
|
// Position du module
|
||||||
public static $modulePosition = [
|
public static $modulePosition = [
|
||||||
'bottom' => 'En bas',
|
'bottom' => 'En bas',
|
||||||
'top' => 'En haut',
|
'top' => 'En haut',
|
||||||
'free' => 'Libre'
|
'free' => 'Libre'
|
||||||
];
|
];
|
||||||
public static $pageBlocks = [
|
public static $pageBlocks = [
|
||||||
'12' => 'Page pleine',
|
'12' => 'Page pleine',
|
||||||
'4-8' => 'Barre latérale 1/3 - Page 2/3',
|
'4-8' => 'Barre latérale 1/3 - Page 2/3',
|
||||||
'8-4' => 'Page 2/3 - Barre latérale 1/3',
|
'8-4' => 'Page 2/3 - Barre latérale 1/3',
|
||||||
'3-9' => 'Barre latérale 1/4 - Page 3/4',
|
'3-9' => 'Barre latérale 1/4 - Page 3/4',
|
||||||
'9-3' => 'Page 3/4 - Barre latérale 1/4',
|
'9-3' => 'Page 3/4 - Barre latérale 1/4',
|
||||||
'3-6-3' => 'Barre latérale 1/4 - Page 1/2 - Barre latérale 1/4'
|
'3-6-3' => 'Barre latérale 1/4 - Page 1/2 - Barre latérale 1/4',
|
||||||
|
'bar' => 'Barre latérale'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -243,7 +244,6 @@ class page extends common {
|
||||||
]);
|
]);
|
||||||
// Barre renommée : changement le nom de la barre dans les pages mères
|
// Barre renommée : changement le nom de la barre dans les pages mères
|
||||||
if ($this->getinput('pageEditBlock') === 'bar') {
|
if ($this->getinput('pageEditBlock') === 'bar') {
|
||||||
echo '<pre>';
|
|
||||||
foreach ($this->getHierarchy() as $eachPageId=>$parentId) {
|
foreach ($this->getHierarchy() as $eachPageId=>$parentId) {
|
||||||
if ($this->getData(['page',$eachPageId,'barRight']) === $this->getUrl(2)) {
|
if ($this->getData(['page',$eachPageId,'barRight']) === $this->getUrl(2)) {
|
||||||
$this->setData(['page',$eachPageId,'barRight',$pageId]);
|
$this->setData(['page',$eachPageId,'barRight',$pageId]);
|
||||||
|
@ -315,3 +315,4 @@ class page extends common {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
?>
|
|
@ -32,8 +32,7 @@ $( document ).ready(function() {
|
||||||
*/
|
*/
|
||||||
if($("#pageEditModuleId").val() === "") {
|
if($("#pageEditModuleId").val() === "") {
|
||||||
$("#pageEditModuleConfig").addClass("disabled");
|
$("#pageEditModuleConfig").addClass("disabled");
|
||||||
$("#pageEditContentContainer").slideDown();
|
$("#pageEditContentContainer").slideDown();
|
||||||
$("#pageEditBlock").append('<option value="bar">Barre latérale</option>');
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$("#pageEditModuleConfig").removeClass("disabled");
|
$("#pageEditModuleConfig").removeClass("disabled");
|
||||||
|
|
|
@ -181,4 +181,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<?php echo template::formClose(); ?>
|
<?php echo template::formClose(); ?>
|
|
@ -29,4 +29,5 @@ class sitemap extends common {
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
?>
|
|
@ -320,36 +320,26 @@ class theme extends common {
|
||||||
// Modification de la position du menu selon la position de la bannière
|
// Modification de la position du menu selon la position de la bannière
|
||||||
switch ($this->getInput('themeHeaderPosition')) {
|
switch ($this->getInput('themeHeaderPosition')) {
|
||||||
case 'site' :
|
case 'site' :
|
||||||
$this->setData(['theme', 'menu',
|
$position = str_replace ('body','site',$this->getData(['theme','menu','position']));
|
||||||
['position' => str_replace ('site','body',$this->getData(['theme','menu','position'])) ],
|
|
||||||
'backgroundColor' => $this->getData('themeMenuBackgroundColor'),
|
|
||||||
'font' => $this->getData('themeMenuFont'),
|
|
||||||
'fontSize' => $this->getData('themeMenuFontSize'),
|
|
||||||
'fontWeight' => $this->getData('themeMenuFontWeight'),
|
|
||||||
'height' => $this->getData('themeMenuHeight'),
|
|
||||||
'loginLink' => $this->getData('themeMenuLoginLink'),
|
|
||||||
'margin' => $this->getData('themeMenuMargin', helper::FILTER_BOOLEAN),
|
|
||||||
'textAlign' => $this->getData('themeMenuTextAlign'),
|
|
||||||
'textColor' => $this->getData('themeMenuTextColor'),
|
|
||||||
'textTransform' => $this->getData('themeMenuTextTransform'),
|
|
||||||
]);
|
|
||||||
break;
|
break;
|
||||||
case 'body' :
|
case 'body' :
|
||||||
$this->setData(['theme', 'menu',
|
$position = str_replace ('site','body',$this->getData(['theme','menu','position']));
|
||||||
['position' => str_replace ('body','site',$this->getData(['theme','menu','position'])) ],
|
|
||||||
'backgroundColor' => $this->getData('themeMenuBackgroundColor'),
|
|
||||||
'font' => $this->getData('themeMenuFont'),
|
|
||||||
'fontSize' => $this->getData('themeMenuFontSize'),
|
|
||||||
'fontWeight' => $this->getData('themeMenuFontWeight'),
|
|
||||||
'height' => $this->getData('themeMenuHeight'),
|
|
||||||
'loginLink' => $this->getData('themeMenuLoginLink'),
|
|
||||||
'margin' => $this->getData('themeMenuMargin', helper::FILTER_BOOLEAN),
|
|
||||||
'textAlign' => $this->getData('themeMenuTextAlign'),
|
|
||||||
'textColor' => $this->getData('themeMenuTextColor'),
|
|
||||||
'textTransform' => $this->getData('themeMenuTextTransform'),
|
|
||||||
]);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
$this->setData(['theme', 'menu', [
|
||||||
|
'backgroundColor' => $this->getData(['theme', 'menu', 'backgroundColor']),
|
||||||
|
'font' => $this->getData(['theme', 'menu', 'font']),
|
||||||
|
'fontSize' => $this->getData(['theme', 'menu', 'fontSize']),
|
||||||
|
'fontWeight' => $this->getData(['theme', 'menu', 'fontWeight']),
|
||||||
|
'height' => $this->getData(['theme', 'menu', 'height']),
|
||||||
|
'loginLink' => $this->getData(['theme', 'menu', 'loginLink']),
|
||||||
|
'margin' => $this->getData(['theme', 'menu', 'margin']),
|
||||||
|
'position' => $position,
|
||||||
|
'textAlign' => $this->getData(['theme', 'menu', 'textAlign']),
|
||||||
|
'textColor' => $this->getData(['theme', 'menu', 'textColor']),
|
||||||
|
'textTransform' => $this->getData(['theme','menu','textTransform']),
|
||||||
|
'fixed' => $this->getData(['theme','menu','fixed'])
|
||||||
|
]]);
|
||||||
// Valeurs en sortie
|
// Valeurs en sortie
|
||||||
$this->addOutput([
|
$this->addOutput([
|
||||||
'notification' => 'Modifications enregistrées',
|
'notification' => 'Modifications enregistrées',
|
||||||
|
@ -569,3 +559,4 @@ class theme extends common {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
?>
|
|
@ -425,5 +425,5 @@ class user extends common {
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
?>
|
|
@ -386,5 +386,5 @@ class blog extends common {
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
?>
|
|
@ -370,5 +370,5 @@ class form extends common {
|
||||||
'view' => 'index',
|
'view' => 'index',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
?>
|
|
@ -302,5 +302,5 @@ class galleriesHelper extends helper {
|
||||||
}
|
}
|
||||||
return $dirContent;
|
return $dirContent;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
?>
|
|
@ -30,4 +30,4 @@
|
||||||
</div>
|
</div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php $i++; ?>
|
<?php $i++; ?>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
|
@ -236,5 +236,5 @@ class news extends common {
|
||||||
'view' => 'index'
|
'view' => 'index'
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
?>
|
|
@ -70,5 +70,5 @@ class redirection extends common {
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
?>
|
Loading…
Reference in New Issue