diff --git a/CHANGES.md b/CHANGES.md index bc4eef4..410af84 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,13 @@ # Changelog +## Version 4.2.02 de Deltacms +- Modifications : + - Statislite : sécurité vis à vis d'une corruption des fichiers json, + - Statislite : mise à jour de la ressource d'identification des systèmes d'exploitation, + - Personnalisation du thème / menu burger avec affichage du titre : réglage de la taille et de la couleur du texte. +- Corrections : + - Statislite : erreur sur le nom d'une variable. + ## Version 4.2.01 de Deltacms - Modifications : - Gestionnaire de fichiers : compatibilité PHP 8.1, diff --git a/README.md b/README.md index aa03356..7ddbbb6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# DeltaCMS 4.2.01 +# DeltaCMS 4.2.02 DeltaCMS est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. L'administration du site est bilingue anglais ou français, le site peut être rédigé dans une des principales langues européennes. diff --git a/core/core.php b/core/core.php index e387c66..bb5e20e 100644 --- a/core/core.php +++ b/core/core.php @@ -48,7 +48,7 @@ class common { // Numéro de version const DELTA_UPDATE_URL = 'https://update.deltacms.fr/master/'; - const DELTA_VERSION = '4.2.01'; + const DELTA_VERSION = '4.2.02'; const DELTA_UPDATE_CHANNEL = "v4"; public static $actions = []; @@ -2507,7 +2507,7 @@ class core extends common { /*$color2 = helper::colorVariants($this->getData(['theme', 'menu', 'textColor'])); $css .= 'nav a.active{color:' . $color2['text'] . '}';*/ } - $css .= 'nav #burgerText{color:' . $colors['text'] . '}'; + $css .= 'nav #burgerText{color:' . $this->getData(['theme','menu','burgerTextColor']) .';font-size:'.$this->getData(['theme','menu','burgerFontSize']) .';}'; // Sous menu $colors = helper::colorVariants($this->getData(['theme', 'menu', 'backgroundColorSub'])); $css .= 'nav .navSub a{background-color:' . $colors['normal'] . '}'; diff --git a/core/include/update.inc.php b/core/include/update.inc.php index 407acfb..d07512e 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -53,9 +53,10 @@ if ($this->getData(['core', 'dataVersion']) < 4104) { $this->setData(['core', 'dataVersion', 4104]); } -if ($this->getData(['core', 'dataVersion']) < 4201) { - +if ($this->getData(['core', 'dataVersion']) < 4202) { + $this->setData(['theme', 'menu', 'burgerTextColor', '#DDD']); + $this->setData(['theme', 'menu', 'burgerFontSize', '1.5em']); // Mise à jour - $this->setData(['core', 'dataVersion', 4201]); + $this->setData(['core', 'dataVersion', 4202]); } ?> diff --git a/core/module/install/ressource/database_en/base/content/home.html b/core/module/install/ressource/database_en/base/content/home.html new file mode 100644 index 0000000..66b7871 --- /dev/null +++ b/core/module/install/ressource/database_en/base/content/home.html @@ -0,0 +1,6 @@ +
+An email containing the summary of your installation has just been sent to you.
+
Log in now to your member area to create a site that suits you !
You will be able to customize the theme, create pages, add users and much more !
Bannière vide<\/p>", + "featureContent": "
Banner empty<\/p>", "width": "container" }, "menu": { @@ -80,7 +80,9 @@ "memberBar": true, "burgerLogo": "", "burgerContent": "title", - "width": "container" + "width": "container", + "burgerTextColor": "#DDD", + "burgerFontSize": "1.5em" }, "site": { "backgroundColor": "rgba(255, 255, 255, 1)", diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 2de3d40..f68283a 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -70,7 +70,7 @@ class init extends common { ] ], 'core' => [ - 'dataVersion' => 4201, + 'dataVersion' => 4202, 'lastBackup' => 0, 'lastClearTmp' => 0, 'lastAutoUpdate' => 0, @@ -358,7 +358,9 @@ class init extends common { 'memberBar' => true, 'burgerLogo' => '', 'burgerContent' => 'title', - 'width' => 'container' + 'width' => 'container', + 'burgerFontSize' => '1.5em', + 'burgerTextColor' => '#DDD' ], 'site' => [ 'backgroundColor' => 'rgba(255, 255, 255, 1)', diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 4253e21..119b336 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -236,6 +236,22 @@ class theme extends common { '1.2em' => 'Large (120%)', '1.3em' => 'Very large (130%)' ]; + public static $menuBurgerFontSizes = [ + '1em' => 'Très petite (100%)', + '1.2em' => 'Petite (120%)', + '1.5em' => 'Standard (150%)', + '1.8em' => 'Moyenne (180%)', + '2em' => 'Grande (200%)', + '2.5em' => 'Très grande (250%)' + ]; + public static $menuBurgerFontSizes_en = [ + '1em' => 'Very small (100%)', + '1.2em' => 'Small (120%)', + '1.5em' => 'Standard (150%)', + '1.8em' => 'Medium (180%)', + '2em' => 'Large (200%)', + '2.5em' => 'Very large (250%)' + ]; public static $menuHeights = [ '5px 10px' => 'Très petite', '10px' => 'Petite', @@ -1079,7 +1095,9 @@ class theme extends common { 'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN), 'memberBar' => $this->getInput('themeMenuMemberBar', helper::FILTER_BOOLEAN), 'burgerLogo' => $this->getInput('themeMenuBurgerLogo'), - 'burgerContent' => $this->getInput('themeMenuBurgerContent') + 'burgerContent' => $this->getInput('themeMenuBurgerContent'), + 'burgerTextColor' => $this->getInput('themeMenuBurgerTextColor'), + 'burgerFontSize' => $this->getInput('themeMenuBurgerFontSize') ]]); // Valeurs en sortie diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php index 83dccbf..7b57bf2 100644 --- a/core/module/theme/view/menu/menu.js.php +++ b/core/module/theme/view/menu/menu.js.php @@ -192,4 +192,10 @@ $("#themeMenuBurgerContent").on("change", function() { else { $("#themeMenuBurgerLogoId").slideUp(); } + if($(this).val() === 'title') { + $("#themeMenuBurgerTitle").slideDown(); + } + else { + $("#themeMenuBurgerTitle").slideUp(); + } }).trigger("select"); diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index 0bf6aea..9dc9ba8 100644 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -49,6 +49,7 @@ switch ($val) { $aligns = $module::$aligns; $burgerContent = $module::$burgerContent; $menuFontSizes = $module::$menuFontSizes; + $menuBurgerFontSizes = $module::$menuBurgerFontSizes; $fontWeights = $module::$fontWeights; $textTransforms = $module::$textTransforms; break; @@ -98,6 +99,7 @@ switch ($val) { $aligns = $module::$aligns_en; $burgerContent = $module::$burgerContent_en; $menuFontSizes = $module::$menuFontSizes_en; + $menuBurgerFontSizes = $module::$menuBurgerFontSizes_en; $fontWeights = $module::$fontWeights_en; $textTransforms = $module::$textTransforms_en; break; @@ -212,6 +214,25 @@ switch ($val) { ]); ?> +