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

10.2dev21 petites corrections

Browse Source
This commit is contained in:
Fred Tempez 2020-06-02 12:03:45 +02:00
parent 29e460ffad
commit a400b65654
4 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -2561,7 +2561,7 @@ class layout extends common {
} }
if($this->getUser('group') >= self::GROUP_ADMIN) { if($this->getUser('group') >= self::GROUP_ADMIN) {
$rightItems .= '<li><a href="' . helper::baseUrl() . 'user" data-tippy-content="Configurer les utilisateurs">' . template::ico('users') . '</a></li>'; $rightItems .= '<li><a href="' . helper::baseUrl() . 'user" data-tippy-content="Configurer les utilisateurs">' . template::ico('users') . '</a></li>';
$rightItems .= '<li><a href="' . helper::baseUrl() . 'theme" data-tippy-content="Personnaliser le thème">' . template::ico('brush') . '</a></li>'; $rightItems .= '<li><a href="' . helper::baseUrl() . 'theme" data-tippy-content="Personnaliser les thèmes">' . template::ico('brush') . '</a></li>';
$rightItems .= '<li><a href="' . helper::baseUrl() . 'config" data-tippy-content="Configurer le site">' . template::ico('cog-alt') . '</a></li>'; $rightItems .= '<li><a href="' . helper::baseUrl() . 'config" data-tippy-content="Configurer le site">' . template::ico('cog-alt') . '</a></li>';
// Mise à jour automatique // Mise à jour automatique
// Une mise à jour est disponible + recherche auto activée + 1 jour de délais // Une mise à jour est disponible + recherche auto activée + 1 jour de délais

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

@ -7,6 +7,7 @@ class init extends common {
'autoUpdate' => true, 'autoUpdate' => true,
'cookieConsent' => true, 'cookieConsent' => true,
'favicon' => 'favicon.ico', 'favicon' => 'favicon.ico',
'faviconDark' => 'faviconDark.ico',
'homePageId' => 'accueil', 'homePageId' => 'accueil',
'maintenance' => false, 'maintenance' => false,
'social' => [ 'social' => [
@ -122,7 +123,7 @@ class init extends common {
'margin' => false, 'margin' => false,
'position' => 'site', 'position' => 'site',
'textAlign' => 'center', 'textAlign' => 'center',
'textColor' => 'rgba(33, 34, 35, 1)', 'textColor' => 'rgba(80, 80, 80, 1)',
'textHide' => false, 'textHide' => false,
'textTransform' => 'none', 'textTransform' => 'none',
'linkHomePage' => true, 'linkHomePage' => true,

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

@ -9,7 +9,7 @@
* @author Rémi Jean <remi.jean@outlook.com> * @author Rémi Jean <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean
* @license GNU General Public License, version 3 * @license GNU General Public License, version 3
* @link http://zwiicms.com/ * @link http://zwiicms.com/
* @copyright : Frédéric Tempez <frederic.tempez@outlook.com> * @copyright : Frédéric Tempez <frederic.tempez@outlook.com>
* @copyright Copyright (C) 2018-2020, Frédéric Tempez * @copyright Copyright (C) 2018-2020, Frédéric Tempez
*/ */
@ -26,7 +26,7 @@ class theme extends common {
'reset' => self::GROUP_ADMIN, 'reset' => self::GROUP_ADMIN,
'resetAdmin' => self::GROUP_ADMIN, 'resetAdmin' => self::GROUP_ADMIN,
'site' => self::GROUP_ADMIN, 'site' => self::GROUP_ADMIN,
'admin' => self::GROUP_ADMIN, 'admin' => self::GROUP_ADMIN,
'manage' => self::GROUP_ADMIN, 'manage' => self::GROUP_ADMIN,
'export' => self::GROUP_ADMIN, 'export' => self::GROUP_ADMIN,
'save' => self::GROUP_ADMIN 'save' => self::GROUP_ADMIN
@ -72,7 +72,7 @@ class theme extends common {
public static $footerblocks = [ public static $footerblocks = [
1 => [ 1 => [
'hide' => 'Masqué', 'hide' => 'Masqué',
'center' => 'Affiché' ], 'center' => 'Affiché' ],
2 => [ 2 => [
'hide' => 'Masqué', 'hide' => 'Masqué',
'left' => 'À gauche', 'left' => 'À gauche',
@ -112,7 +112,7 @@ class theme extends common {
'1.1em' => 'Moyenne (110%)', '1.1em' => 'Moyenne (110%)',
'1.2em' => 'Grande (120%)', '1.2em' => 'Grande (120%)',
'1.3em' => 'Très grande (130%)' '1.3em' => 'Très grande (130%)'
]; ];
public static $headerFontSizes = [ public static $headerFontSizes = [
'1.6em' => 'Très petite (160%)', '1.6em' => 'Très petite (160%)',
'1.8em' => 'Petite (180%)', '1.8em' => 'Petite (180%)',
@ -160,7 +160,7 @@ class theme extends common {
'25px 15px' => 'Très grande' '25px 15px' => 'Très grande'
]; ];
public static $menuPositionsSite = [ public static $menuPositionsSite = [
'top' => 'En-dehors du site', 'top' => 'En-dehors du site',
'site-first' => 'Avant la bannière', 'site-first' => 'Avant la bannière',
'site-second' => 'Après la bannière', 'site-second' => 'Après la bannière',
'hide' => 'Caché' 'hide' => 'Caché'
@ -171,7 +171,7 @@ class theme extends common {
'body-second' => 'Après la bannière', 'body-second' => 'Après la bannière',
'site' => 'Dans le site', 'site' => 'Dans le site',
'hide' => 'Caché' 'hide' => 'Caché'
]; ];
public static $menuRadius = [ public static $menuRadius = [
'0px' => 'Aucun', '0px' => 'Aucun',
'3px 3px 0px 0px' => 'Très léger', '3px 3px 0px 0px' => 'Très léger',
@ -210,7 +210,7 @@ class theme extends common {
'16px' => '16 pixels' '16px' => '16 pixels'
]; ];
public static $bodySizes = [ public static $bodySizes = [
'auto' => 'Automatique', 'auto' => 'Automatique',
'100% 100%' => 'Image étirée (100% 100%)', '100% 100%' => 'Image étirée (100% 100%)',
'cover' => 'Responsive (cover)', 'cover' => 'Responsive (cover)',
'contain' => 'Responsive (contain)' 'contain' => 'Responsive (contain)'
@ -219,7 +219,7 @@ class theme extends common {
'none' => 'Standard', 'none' => 'Standard',
'lowercase' => 'Minuscules', 'lowercase' => 'Minuscules',
'uppercase' => 'Majuscules', 'uppercase' => 'Majuscules',
'capitalize' => 'Majuscule à chaque mot' 'capitalize' => 'Majuscule à chaque mot'
]; ];
public static $widths = [ public static $widths = [
'750px' => 'Petite (750 pixels)', '750px' => 'Petite (750 pixels)',
@ -227,13 +227,13 @@ class theme extends common {
'1170px' => 'Grande (1170 pixels)', '1170px' => 'Grande (1170 pixels)',
'100%' => 'Fluide (100%)' '100%' => 'Fluide (100%)'
]; ];
public static $headerWide = [ public static $headerWide = [
'auto auto' => 'Automatique', 'auto auto' => 'Automatique',
'100% 100%' => 'Image étirée (100% 100%)', '100% 100%' => 'Image étirée (100% 100%)',
'cover' => 'Responsive (cover)', 'cover' => 'Responsive (cover)',
'contain' => 'Responsive (contain)' 'contain' => 'Responsive (contain)'
]; ];
public static $footerTemplate = [ public static $footerTemplate = [
'1' => 'Une seule colonne', '1' => 'Une seule colonne',
'2' => 'Deux colonnes : 1/2 - 1/2', '2' => 'Deux colonnes : 1/2 - 1/2',
'3' => 'Trois colonnes : 1/3 - 1/3 - 1/3', '3' => 'Trois colonnes : 1/3 - 1/3 - 1/3',
@ -275,7 +275,7 @@ class theme extends common {
'vendor' => [ 'vendor' => [
'tinycolorpicker' 'tinycolorpicker'
], ],
]); ]);
} }
/** /**
@ -342,7 +342,7 @@ class theme extends common {
public function footer() { public function footer() {
// Soumission du formulaire // Soumission du formulaire
if($this->isPost()) { if($this->isPost()) {
if ( $this->getInput('themeFooterCopyrightPosition') === 'hide' && if ( $this->getInput('themeFooterCopyrightPosition') === 'hide' &&
$this->getInput('themeFooterSocialsPosition') === 'hide' && $this->getInput('themeFooterSocialsPosition') === 'hide' &&
$this->getInput('themeFooterTextPosition') === 'hide' ) { $this->getInput('themeFooterTextPosition') === 'hide' ) {
// Valeurs en sortie // Valeurs en sortie
@ -367,7 +367,7 @@ class theme extends common {
'copyrightPosition' => $this->getInput('themeFooterCopyrightPosition'), 'copyrightPosition' => $this->getInput('themeFooterCopyrightPosition'),
'textPosition' => $this->getInput('themeFooterTextPosition'), 'textPosition' => $this->getInput('themeFooterTextPosition'),
'socialsPosition' => $this->getInput('themeFooterSocialsPosition'), 'socialsPosition' => $this->getInput('themeFooterSocialsPosition'),
'textTransform' => $this->getInput('themeFooterTextTransform'), 'textTransform' => $this->getInput('themeFooterTextTransform'),
'font' => $this->getInput('themeFooterFont'), 'font' => $this->getInput('themeFooterFont'),
'fontSize' => $this->getInput('themeFooterFontSize'), 'fontSize' => $this->getInput('themeFooterFontSize'),
'fontWeight' => $this->getInput('themeFooterFontWeight'), 'fontWeight' => $this->getInput('themeFooterFontWeight'),
@ -406,7 +406,7 @@ class theme extends common {
// Si une image est positionnée, l'arrière en transparent. // Si une image est positionnée, l'arrière en transparent.
$this->setData(['theme', 'header', [ $this->setData(['theme', 'header', [
'backgroundColor' => $this->getInput('themeHeaderBackgroundColor'), 'backgroundColor' => $this->getInput('themeHeaderBackgroundColor'),
'textTransform' => $this->getInput('themeHeaderTextTransform'), 'textTransform' => $this->getInput('themeHeaderTextTransform'),
'font' => $this->getInput('themeHeaderFont'), 'font' => $this->getInput('themeHeaderFont'),
'fontSize' => $this->getInput('themeHeaderFontSize'), 'fontSize' => $this->getInput('themeHeaderFontSize'),
'fontWeight' => $this->getInput('themeHeaderFontWeight'), 'fontWeight' => $this->getInput('themeHeaderFontWeight'),
@ -418,7 +418,7 @@ class theme extends common {
'position' => $this->getInput('themeHeaderPosition'), 'position' => $this->getInput('themeHeaderPosition'),
'textAlign' => $this->getInput('themeHeaderTextAlign'), 'textAlign' => $this->getInput('themeHeaderTextAlign'),
'textColor' => $this->getInput('themeHeaderTextColor'), 'textColor' => $this->getInput('themeHeaderTextColor'),
'textHide' => $this->getInput('themeHeaderTextHide', helper::FILTER_BOOLEAN), 'textHide' => $this->getInput('themeHeaderTextHide', helper::FILTER_BOOLEAN),
'linkHomePage' => $this->getInput('themeHeaderlinkHomePage',helper::FILTER_BOOLEAN), 'linkHomePage' => $this->getInput('themeHeaderlinkHomePage',helper::FILTER_BOOLEAN),
'imageContainer' => $this->getInput('themeHeaderImageContainer') 'imageContainer' => $this->getInput('themeHeaderImageContainer')
]]); ]]);
@ -427,17 +427,17 @@ class theme extends common {
$this->getData(['theme','menu','position']) !== 'site' && $this->getData(['theme','menu','position']) !== 'site' &&
$this->getData(['theme','menu','position']) !== 'top' ) { $this->getData(['theme','menu','position']) !== 'top' ) {
case 'site' : case 'site' :
$position = str_replace ('body','site',$this->getData(['theme','menu','position'])); $position = str_replace ('body','site',$this->getData(['theme','menu','position']));
break; break;
case 'body' : case 'body' :
$position = str_replace ('site','body',$this->getData(['theme','menu','position'])); $position = str_replace ('site','body',$this->getData(['theme','menu','position']));
break; break;
default: default:
$position = $this->getData(['theme','menu','position']); $position = $this->getData(['theme','menu','position']);
} }
$this->setData(['theme', 'menu', [ $this->setData(['theme', 'menu', [
'backgroundColor' => $this->getData(['theme', 'menu', 'backgroundColor']), 'backgroundColor' => $this->getData(['theme', 'menu', 'backgroundColor']),
'font' => $this->getData(['theme', 'menu', 'font']), 'font' => $this->getData(['theme', 'menu', 'font']),
'fontSize' => $this->getData(['theme', 'menu', 'fontSize']), 'fontSize' => $this->getData(['theme', 'menu', 'fontSize']),
'fontWeight' => $this->getData(['theme', 'menu', 'fontWeight']), 'fontWeight' => $this->getData(['theme', 'menu', 'fontWeight']),
'height' => $this->getData(['theme', 'menu', 'height']), 'height' => $this->getData(['theme', 'menu', 'height']),
@ -476,7 +476,7 @@ class theme extends common {
public function index() { public function index() {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'title' => 'Personnalisation du thème', 'title' => 'Personnalisation des thèmes',
'view' => 'index' 'view' => 'index'
]); ]);
} }
@ -489,7 +489,7 @@ class theme extends common {
if($this->isPost()) { if($this->isPost()) {
$this->setData(['theme', 'menu', [ $this->setData(['theme', 'menu', [
'backgroundColor' => $this->getInput('themeMenuBackgroundColor'), 'backgroundColor' => $this->getInput('themeMenuBackgroundColor'),
'font' => $this->getInput('themeMenuFont'), 'font' => $this->getInput('themeMenuFont'),
'fontSize' => $this->getInput('themeMenuFontSize'), 'fontSize' => $this->getInput('themeMenuFontSize'),
'fontWeight' => $this->getInput('themeMenuFontWeight'), 'fontWeight' => $this->getInput('themeMenuFontWeight'),
'height' => $this->getInput('themeMenuHeight'), 'height' => $this->getInput('themeMenuHeight'),
@ -577,10 +577,10 @@ class theme extends common {
'width' => $this->getInput('themeSiteWidth'), 'width' => $this->getInput('themeSiteWidth'),
'margin' => $this->getInput('themeSiteMargin',helper::FILTER_BOOLEAN) 'margin' => $this->getInput('themeSiteMargin',helper::FILTER_BOOLEAN)
]]); ]]);
$this->setData(['theme', 'button', [ $this->setData(['theme', 'button', [
'backgroundColor' => $this->getInput('themeButtonBackgroundColor') 'backgroundColor' => $this->getInput('themeButtonBackgroundColor')
]]); ]]);
$this->setData(['theme', 'block', [ $this->setData(['theme', 'block', [
'backgroundColor' => $this->getInput('themeBlockBackgroundColor'), 'backgroundColor' => $this->getInput('themeBlockBackgroundColor'),
'borderColor' => $this->getInput('themeBlockBorderColor') 'borderColor' => $this->getInput('themeBlockBorderColor')
]]); ]]);
@ -624,22 +624,22 @@ class theme extends common {
]); ]);
} }
} }
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'title' => 'Gestion des thèmes', 'title' => 'Gestion des thèmes',
'view' => 'manage' 'view' => 'manage'
]); ]);
} }
/** /**
* Export du thème * Export du thème
*/ */
public function export() { public function export() {
// Make zip // Make zip
$zipFilename = $this->makezip($this->getUrl(2)); $zipFilename = $this->makezip($this->getUrl(2));
// Téléchargement du ZIP // Téléchargement du ZIP
header('Content-Description: File Transfer'); header('Content-Description: File Transfer');
header('Content-Type: application/octet-stream'); header('Content-Type: application/octet-stream');
@ -690,13 +690,13 @@ class theme extends common {
case 'theme': case 'theme':
$zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.json'); $zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.json');
$zip->addFile(self::DATA_DIR.'theme.css',self::DATA_DIR.'theme.css'); $zip->addFile(self::DATA_DIR.'theme.css',self::DATA_DIR.'theme.css');
$zip->addFile(self::DATA_DIR.'custom.css',self::DATA_DIR.'custom.css'); $zip->addFile(self::DATA_DIR.'custom.css',self::DATA_DIR.'custom.css');
if ($this->getData(['theme','body','image']) !== '' ) { if ($this->getData(['theme','body','image']) !== '' ) {
$zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','body','image']), $zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','body','image']),
self::FILE_DIR.'source/'.$this->getData(['theme','body','image']) self::FILE_DIR.'source/'.$this->getData(['theme','body','image'])
); );
} }
if ($this->getData(['theme','header','image']) !== '' ) { if ($this->getData(['theme','header','image']) !== '' ) {
$zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','header','image']), $zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','header','image']),
self::FILE_DIR.'source/'.$this->getData(['theme','header','image']) self::FILE_DIR.'source/'.$this->getData(['theme','header','image'])
); );

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

@ -31,7 +31,7 @@
<?php echo template::button('themeManage', [ <?php echo template::button('themeManage', [
'ico' => 'upload', 'ico' => 'upload',
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'value' => 'Gérer' 'value' => 'Gestion'
]); ?> ]); ?>
</div> </div>
</div> </div>
@ -65,7 +65,7 @@
<?php echo template::button('themeManage', [ <?php echo template::button('themeManage', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'ico' => 'upload', 'ico' => 'upload',
'value' => 'Gérer' 'value' => 'Gestion'
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">