From 54d03c2d16174dc827010d780fe2e485d4e308b1 Mon Sep 17 00:00:00 2001 From: Deltacms Date: Fri, 13 Oct 2023 08:22:34 +0200 Subject: [PATCH] correction liens icones bandeau burger --- CHANGES.md | 6 ++++++ README.md | 2 +- core/core.php | 6 +++--- core/include/update.inc.php | 9 +++++++++ .../ressource/database_en/base/locale.json | 4 ++++ .../ressource/database_es/base/locale.json | 4 ++++ .../ressource/database_fr/base/locale.json | 4 ++++ core/module/theme/lang/en/lex_theme.php | 2 +- core/module/theme/lang/es/lex_theme.php | 2 +- core/module/theme/lang/fr/lex_theme.php | 2 +- core/module/theme/theme.php | 8 +++++--- core/module/theme/view/menu/menu.php | 20 +++++++++++++------ 12 files changed, 53 insertions(+), 16 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0835f7a..5b95fa1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ # Changelog +## Version 4.5.02 de Deltacms +- Modifications : + +- Corrections : + - Theme / Menu / Burger : les liens associés aux icônes gauche et centrale du bandeau burger sont valides pour toutes les langues du site, + ## Version 4.5.01 de Deltacms - Modifications : - Une troisième langue d'administration est disponible : espagnol / castillan, diff --git a/README.md b/README.md index a41c8ab..a53ff1d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# DeltaCMS 4.5.01 +# DeltaCMS 4.5.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 trilingue espagnol (castillan), anglais ou français, le site peut être rédigé dans une langue quelconque. diff --git a/core/core.php b/core/core.php index 087a6a3..eea507b 100644 --- a/core/core.php +++ b/core/core.php @@ -49,7 +49,7 @@ class common { // Numéro de version const DELTA_UPDATE_URL = 'https://update.deltacms.fr/master/'; - const DELTA_VERSION = '4.5.01'; + const DELTA_VERSION = '4.5.02'; const DELTA_UPDATE_CHANNEL = "v4"; public static $actions = []; @@ -1702,8 +1702,8 @@ class common { //Menu burger $fileIcon1 = './site/file/source/'. $this->getData(['theme', 'menu', 'burgerIcon1']); $fileIcon2 = './site/file/source/'. $this->getData(['theme', 'menu', 'burgerIcon2']); - $iconLink1 = helper::baseUrl().$this->getData(['theme', 'menu','burgerIconLink1']); - $iconLink2 = helper::baseUrl().$this->getData(['theme', 'menu','burgerIconLink2']); + $iconLink1 = helper::baseUrl().$this->getData(['locale', 'menuBurger','burgerLeftIconLink']); + $iconLink2 = helper::baseUrl().$this->getData(['locale', 'menuBurger','burgerCenterIconLink']); echo '
'; switch( $this->getData(['theme','menu','burgerContent']) ){ case 'none' : diff --git a/core/include/update.inc.php b/core/include/update.inc.php index 8dd97f8..d18a6e3 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -169,4 +169,13 @@ if ($this->getData(['core', 'dataVersion']) < 4501) { if( is_file('./site/data/head.inc.html')) rename('./site/data/head.inc.html', './site/data/head.inc.php' ); $this->setData(['core', 'dataVersion', 4501]); } +if ($this->getData(['core', 'dataVersion']) < 4502) { + // Déplacement et renommage des variables Burger Icon Link + $this->setData(['locale', 'menuBurger', [ + 'burgerLeftIconLink' => $this->getData(['theme', 'menu','burgerIconLink1']) , + 'burgerCenterIconLink' => $this->getData(['theme', 'menu','burgerIconLink2']) + ]]); + $this->deleteData(['theme', 'menu', 'burgerIconLink1']); + $this->deleteData(['theme', 'menu', 'burgerIconLink2']); + $this->setData(['core', 'dataVersion', 4502]); ?> diff --git a/core/module/install/ressource/database_en/base/locale.json b/core/module/install/ressource/database_en/base/locale.json index a72b83a..173c185 100644 --- a/core/module/install/ressource/database_en/base/locale.json +++ b/core/module/install/ressource/database_en/base/locale.json @@ -26,6 +26,10 @@ "cookiesCheckboxExtText": "", "cookiesFooterText": "Cookies", "cookiesButtonText": "I understand" + }, + "menuBurger": { + "burgerLeftIconLink": "home", + "burgerCenterIconLink": "recherche" } } } \ No newline at end of file diff --git a/core/module/install/ressource/database_es/base/locale.json b/core/module/install/ressource/database_es/base/locale.json index 66f577e..bee4661 100644 --- a/core/module/install/ressource/database_es/base/locale.json +++ b/core/module/install/ressource/database_es/base/locale.json @@ -26,6 +26,10 @@ "cookiesCheckboxExtText": "", "cookiesFooterText": "Cookies", "cookiesButtonText": "He entendido" + }, + "menuBurger": { + "burgerLeftIconLink": "inicio", + "burgerCenterIconLink": "investigacion" } } } \ No newline at end of file diff --git a/core/module/install/ressource/database_fr/base/locale.json b/core/module/install/ressource/database_fr/base/locale.json index 51307d2..9e388b9 100644 --- a/core/module/install/ressource/database_fr/base/locale.json +++ b/core/module/install/ressource/database_fr/base/locale.json @@ -26,6 +26,10 @@ "cookiesCheckboxExtText": "", "cookiesFooterText": "Cookies", "cookiesButtonText": "J'ai compris" + }, + "menuBurger": { + "burgerLeftIconLink": "accueil", + "burgerCenterIconLink": "recherche" } } } \ No newline at end of file diff --git a/core/module/theme/lang/en/lex_theme.php b/core/module/theme/lang/en/lex_theme.php index 7b7cacb..43d9e94 100644 --- a/core/module/theme/lang/en/lex_theme.php +++ b/core/module/theme/lang/en/lex_theme.php @@ -256,7 +256,7 @@ $text['core_theme_view']['menu'][49] = 'Burger icon color'; $text['core_theme_view']['menu'][50] = 'Left icon'; $text['core_theme_view']['menu'][51] = 'This icon will be visible on the left side of the burger menu banner'; $text['core_theme_view']['menu'][52] = 'Link to page'; -$text['core_theme_view']['menu'][53] = 'This choice allows a shortcut to an important page like the home page.'; +$text['core_theme_view']['menu'][53] = 'This choice allows a shortcut to an important page like the home page. This must be done for each language of your site.'; $text['core_theme_view']['menu'][54] = 'Core icon'; $text['core_theme_view']['menu'][55] = 'This icon will be visible in the central part of the burger menu banner'; $text['core_theme_view']['menu'][56] = 'When fixed the banner of the burger menu is at the top of the screen or under the administration bar.'; diff --git a/core/module/theme/lang/es/lex_theme.php b/core/module/theme/lang/es/lex_theme.php index f0df29a..cf849cf 100644 --- a/core/module/theme/lang/es/lex_theme.php +++ b/core/module/theme/lang/es/lex_theme.php @@ -256,7 +256,7 @@ $text['core_theme_view']['menu'][49] = 'Color del icono de la hamburguesa'; $text['core_theme_view']['menu'][50] = 'Icono izquierdo'; $text['core_theme_view']['menu'][51] = 'Este ícono será visible en el lado izquierdo del banner del menú de hamburguesas'; $text['core_theme_view']['menu'][52] = 'Enlace a la página'; -$text['core_theme_view']['menu'][53] = 'Esta opción permite un acceso directo a una página importante como la página de inicio.'; +$text['core_theme_view']['menu'][53] = 'Esta opción permite un acceso directo a una página importante como la página de inicio. Esto debe hacerse para cada idioma de su sitio.'; $text['core_theme_view']['menu'][54] = 'Icono principal'; $text['core_theme_view']['menu'][55] = 'Este ícono será visible en la parte central del banner del menú de hamburguesas'; $text['core_theme_view']['menu'][56] = 'Cuando se arregla, el banner del menú de hamburguesas está en la parte superior de la pantalla o debajo de la barra de administración.'; diff --git a/core/module/theme/lang/fr/lex_theme.php b/core/module/theme/lang/fr/lex_theme.php index 5537d92..3c1b15b 100644 --- a/core/module/theme/lang/fr/lex_theme.php +++ b/core/module/theme/lang/fr/lex_theme.php @@ -256,7 +256,7 @@ $text['core_theme_view']['menu'][49] = 'Couleur de l\'icône burger'; $text['core_theme_view']['menu'][50] = 'Icône gauche'; $text['core_theme_view']['menu'][51] = 'Cette icône sera visible dans la partie gauche du bandeau du menu burger'; $text['core_theme_view']['menu'][52] = 'Lien vers la page'; -$text['core_theme_view']['menu'][53] = 'Ce choix permet un raccourci vers une page importante comme la page d\'accueil.'; +$text['core_theme_view']['menu'][53] = 'Ce choix permet un raccourci vers une page importante comme la page d\'accueil. Il est à faire pour chaque langue de votre site.'; $text['core_theme_view']['menu'][54] = 'Icône centrale'; $text['core_theme_view']['menu'][55] = 'Cette icône sera visible dans la partie centrale du bandeau du menu burger'; $text['core_theme_view']['menu'][56] = 'Quand il est fixe le bandeau du menu burger est en haut d\'écran ou sous la barre d\'administration.'; diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 0f4c10d..20c46f7 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -702,10 +702,12 @@ class theme extends common { 'burgerActiveColorAuto' => $this->getInput('themeMenuBurgerActiveColorAuto', helper::FILTER_BOOLEAN), 'burgerActiveColor' => $this->getInput('themeMenuBurgerActiveColor'), 'burgerBackgroundColorSub' => $this->getInput('themeMenuBurgerBackgroundColorSub'), - 'burgerIconLink1' => $this->getInput('themeMenuBurgerIconLink1'), - 'burgerIconLink2' => $this->getInput('themeMenuBurgerIconLink2'), 'burgerOverlay' => $this->getInput('themeMenuBurgerOverlay', helper::FILTER_BOOLEAN) ]]); + $this->setData(['locale', 'menuBurger', [ + 'burgerLeftIconLink' => $this->getInput('themeMenuBurgerLeftIconLink'), + 'burgerCenterIconLink' => $this->getInput('themeMenuBurgerCenterIconLink') + ]]); // Valeurs en sortie if (isset($_POST['themeMenuSubmit'])){ @@ -721,7 +723,7 @@ class theme extends common { } } // Liste des pages pour les liens sur icônes - foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) { + foreach ($this->getHierarchy(null,true,null) as $parentKey=>$parentValue) { // Exclusions les barres, les pages masquées ou non publiques if ($this->getData(['page',$parentKey,'group']) !== 0 || $this->getData(['page', $parentKey, 'block']) === 'bar' ) { diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index 57f9877..2c54b54 100644 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -2,6 +2,14 @@ // Lexique include('./core/module/theme/lang/'. $this->getData(['config', 'i18n', 'langAdmin']) . '/lex_theme.php'); +// drapeau pour la langue d'origine ou la langue en traduction rédigée +if( $this->getInput('DELTA_I18N_SITE') === '' || $this->getInput('DELTA_I18N_SITE')=== null || $this->getInput('DELTA_I18N_SITE') === 'base'){ + $flag = $this->getData(['config', 'i18n', 'langBase']); +} +else{ + $flag = $this->getInput('DELTA_I18N_SITE'); +} + echo template::formOpen('themeMenuForm'); ?>
@@ -263,9 +271,9 @@ echo template::formOpen('themeMenuForm'); ?> ]); ?>
- $this->getData(['theme', 'menu','burgerIconLink1']), - 'label' => $text['core_theme_view']['menu'][52], + $this->getData(['locale', 'menuBurger','burgerLeftIconLink']), + 'label' => $text['core_theme_view']['menu'][52] .' '. template::flag($flag, '20px'), 'help' => $text['core_theme_view']['menu'][53] ]); ?>
@@ -283,9 +291,9 @@ echo template::formOpen('themeMenuForm'); ?> ]); ?>
- $this->getData(['theme', 'menu','burgerIconLink2']), - 'label' => $text['core_theme_view']['menu'][52], + $this->getData(['locale', 'menuBurger','burgerCenterIconLink']), + 'label' => $text['core_theme_view']['menu'][52] . template::flag($flag, '20px'), 'help' => $text['core_theme_view']['menu'][53] ]); ?>