diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index c0d674f6..fcdf367a 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -661,5 +661,13 @@ if ($this->getData(['core', 'dataVersion']) < 11100) {
// Anonymat des adresses iP de la journalisation
$this->setData(['config', 'connect', 'anonymousIp', 2 ]);
+ // Nouvelles options de contenu pour les écrans réduits
+ if ($this->getData(['theme', 'menu', 'burgerTitle'])) {
+ $this->setData(['theme', 'menu', 'burgerContent', 'title']);
+ } else {
+ $this->setData(['theme', 'menu', 'burgerContent', 'none']);
+ }
+ $this->setData(['theme', 'menu', 'burgerLogo', '']);
+
$this->setData(['core', 'dataVersion', 11100]);
}
\ No newline at end of file
diff --git a/core/layout/main.php b/core/layout/main.php
index bb063c1b..560dbddb 100644
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -44,12 +44,8 @@
?>
- getData(['theme','menu','burgerContent']) === 'title' ): ?>
-
getData(['locale', 'title']);?>
-
- getData(['theme','menu','burgerContent']) === 'logo' ): ?>
-
getData(['theme', 'menu', 'logoBurger']).'">';?>
-
+ getData(['theme','menu','burgerContent']) === 'title' ? '
' . $this->getData(['locale', 'title']) . '
' : '' ;?>
+ getData(['theme','menu','burgerContent']) === 'logo' ? '
' : '' ;?>
@@ -102,12 +94,8 @@
@@ -158,7 +146,7 @@
getData(['locale', 'title']);?>
getData(['theme','menu','burgerContent']) === 'logo' ): ?>
- getData(['theme', 'menu', 'logoBurger']).'">';?>
+ getData(['theme', 'menu', 'burgerLogo']).'">';?>
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 6b0de604..5acdb0ec 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -175,9 +175,8 @@ class init extends common {
'activeColor' => 'rgba(255, 255, 255, 1)',
'activeTextColor' => 'rgba(255, 255, 255, 1)',
'radius' => '0px',
- 'burgerTitle' => true,
'memberBar' => true,
- 'logoBurger' => '',
+ 'burgerLogo' => '',
'burgerContent' => 'title'
],
'site' => [
diff --git a/core/module/install/ressource/files.tar.gz b/core/module/install/ressource/files.tar.gz
index d0a8ca7b..ccbe6f50 100644
Binary files a/core/module/install/ressource/files.tar.gz and b/core/module/install/ressource/files.tar.gz differ
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 57f403e0..639e9ad4 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -240,9 +240,9 @@ class theme extends common {
'4' => 'Trois lignes superposées'
];
public static $burgerContent = [
- 'no' => 'Aucun',
- 'title' => 'Titre du site',
- 'logo' => 'Logo du site'
+ 'none' => 'Aucun',
+ 'title' => 'Titre du site',
+ 'logo' => 'Logo du site'
];
// Variable pour construire la liste des pages du site
@@ -517,7 +517,7 @@ class theme extends common {
'radius' => $this->getInput('themeMenuRadius'),
'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN),
'memberBar' => $this->getInput('themeMenuMemberBar', helper::FILTER_BOOLEAN),
- 'logoBurger' => $this->getInput('themeMenuLogoBurger'),
+ 'burgerLogo' => $this->getInput('themeMenuBurgerLogo'),
'burgerContent' => $this->getInput('themeMenuBurgerContent')
]]);
// Valeurs en sortie
diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php
index 1bec2803..bfa4d78b 100644
--- a/core/module/theme/view/menu/menu.js.php
+++ b/core/module/theme/view/menu/menu.js.php
@@ -179,9 +179,9 @@ $("#themeMenuActiveColorAuto").on("change", function() {
$("#themeMenuBurgerContent").on("change", function() {
console.log( $(this).val());
if($(this).val() === 'logo') {
- $("#themeMenuLogoBurgerId").slideDown();
+ $("#themeMenuBurgerLogoId").slideDown();
}
else {
- $("#themeMenuLogoBurgerId").slideUp();
+ $("#themeMenuBurgerLogoId").slideUp();
}
}).trigger("select");
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index 1705c964..34ccbd0d 100644
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -196,11 +196,11 @@
-