From 489f3b0da62208c914d0f485781dd35534ea7b98 Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Fri, 19 Jan 2024 14:37:03 +0100
Subject: [PATCH] =?UTF-8?q?Option=20d'affichage=20du=20s=C3=A9lecteur=20d'?=
 =?UTF-8?q?espaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/class/layout.class.php                   |  18 +-
 core/module/install/ressource/defaultdata.php |   3 +-
 core/module/theme/theme.php                   |   1 +
 core/module/theme/view/menu/menu.php          | 227 +++++++++---------
 4 files changed, 138 insertions(+), 111 deletions(-)

diff --git a/core/class/layout.class.php b/core/class/layout.class.php
index 5e7f9c8..eb441cc 100644
--- a/core/class/layout.class.php
+++ b/core/class/layout.class.php
@@ -504,10 +504,14 @@ class layout extends common
                 ]) .
                 '</li>';
         }
-        // Commandes pour les membres simples
+
+        /**
+         * Commandes pour les membres simples
+         * Affichage du sélecteur d'espaces
+         */ 
         if (
             $this->getUser('group') === self::GROUP_MEMBER
-            && $this->getData(['theme', 'menu', 'memberBar']) === true
+            && $this->getData(['theme', 'menu', 'selectSpace']) === true
         ) {
             if ($this->getCoursesByUser($this->getUser('id'), $this->getUser('group'))) {
                 $itemsRight .= '<li><select id="barSelectCourse" >';
@@ -517,6 +521,16 @@ class layout extends common
                 }
                 $itemsRight .= '</select></li>';
             }
+        }
+        /**
+         * Commandes pour les membres simples
+         * Affichage des boutons  gestionnaire de fichiers et mon compte
+         */ 
+        if (
+            $this->getUser('group') === self::GROUP_MEMBER
+            && $this->getData(['theme', 'menu', 'memberBar']) === true
+        ) {
+
             if (
                 ($this->getUser('group') >= self::GROUP_MEMBER &&
                     $this->getUser('permission', 'filemanager') === true)
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 1290611..9f6fc4c 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -835,7 +835,8 @@ class init extends common
 				'activeColor' => 'rgba(255, 255, 255, 1)',
 				'activeTextColor' => 'rgba(255, 255, 255, 1)',
 				'radius' => '0px',
-				'memberBar' => false,
+				'memberBar' => true,
+				'selectSpace' => true,
 				'burgerLogo' => '',
 				'burgerContent' => 'title',
 				'width' => 'container'
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 38b71af..50298cc 100644
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -594,6 +594,7 @@ class theme extends common
 					'radius' => $this->getInput('themeMenuRadius'),
 					'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN),
 					'memberBar' => $this->getInput('themeMenuMemberBar', helper::FILTER_BOOLEAN),
+					'selectSpace' => $this->getInput('themeMenuSelectSpace', helper::FILTER_BOOLEAN),
 					'burgerLogo' => $this->getInput('themeMenuBurgerLogo'),
 					'burgerContent' => $this->getInput('themeMenuBurgerContent')
 				]
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index c4d4e30..6aedd37 100644
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -9,11 +9,11 @@
     </div>
     <div class="col1">
         <?php /* echo template::button('themeMenuHelp', [
-            'href' => 'https://doc.zwiicms.fr/menu',
-            'target' => '_blank',
-            'value' => template::ico('help'),
-            'class' => 'buttonHelp'
-        ]); */?>
+       'href' => 'https://doc.zwiicms.fr/menu',
+       'target' => '_blank',
+       'value' => template::ico('help'),
+       'class' => 'buttonHelp'
+   ]); */?>
     </div>
     <div class="col2 offset8">
         <?php echo template::submit('themeMenuSubmit'); ?>
@@ -22,7 +22,8 @@
 <div class="row">
     <div class="col12">
         <div class="block">
-            <h4><?php echo helper::translate('Paramètres'); ?>
+            <h4>
+                <?php echo helper::translate('Paramètres'); ?>
             </h4>
             <div class="row">
                 <div class="col6">
@@ -84,7 +85,8 @@
 <div class="row">
     <div class="col12">
         <div class="block">
-            <h4><?php echo helper::translate('Contenu'); ?>
+            <h4>
+                <?php echo helper::translate('Contenu'); ?>
             </h4>
             <div class="row">
                 <div class="col3">
@@ -93,125 +95,134 @@
                     ]); ?>
                 </div>
                 <div class="col3">
-                    <?php echo template::checkbox('themeMenuMemberBar', true, 'Barre de membre', [
-                        'checked' =>  $this->getData(['theme', 'menu', 'memberBar']),
+                    <?php echo template::checkbox('themeMenuSelectSpace', true, 'Sélecteur d\'espaces', [
+                        'checked' => $this->getData(['theme', 'menu', 'selectSpace']),
                     ]); ?>
                 </div>
+                <div class="col3">
+                    <?php echo template::checkbox('themeMenuMemberBar', true, 'Barre de membre', [
+                        'checked' => $this->getData(['theme', 'menu', 'memberBar']),
+                    ]); ?>
+                </div>
+            </div>
+            <div class="row">
                 <div class="col6">
                     <?php echo template::select('themeMenuBurgerContent', $module::$burgerContent, [
                         'label' => 'Menu burger dans écran réduit',
                         'selected' => $this->getData(['theme', 'menu', 'burgerContent']),
                     ]); ?>
                 </div>
-            </div>
-            <div class="row">
-                <div id="themeMenuBurgerLogoId" class="col6 offset6 <?php if ($this->getData(['theme', 'menu', 'burgerContent']) !== 'logo') echo 'displayNone'; ?>">
-                    <?php $imageFile = file_exists(self::FILE_DIR . 'source/' . $this->getData(['theme', 'menu', 'burgerLogo'])) ? $this->getData(['theme', 'menu', 'burgerLogo']) : ""; ?>
-                    <?php echo template::file('themeMenuBurgerLogo', [
-                        'help' => 'Sélectionner une image de dimensions adaptées',
-                        'language' => $this->getData(['user', $this->getUser('id'), 'language']),
-                        'label' => 'Logo du menu burger',
-                        'type' => 1,
-                        'value' => $imageFile
-                    ]);
-                    ?>
+                <div class="col6" id="themeMenuBurgerLogoId"
+                        class="<?php if ($this->getData(['theme', 'menu', 'burgerContent']) !== 'logo')
+                            echo 'displayNone'; ?>">
+                        <?php $imageFile = file_exists(self::FILE_DIR . 'source/' . $this->getData(['theme', 'menu', 'burgerLogo'])) ? $this->getData(['theme', 'menu', 'burgerLogo']) : ""; ?>
+                        <?php echo template::file('themeMenuBurgerLogo', [
+                            'help' => 'Sélectionner une image de dimensions adaptées',
+                            'language' => $this->getData(['user', $this->getUser('id'), 'language']),
+                            'label' => 'Logo du menu burger',
+                            'type' => 1,
+                            'value' => $imageFile
+                        ]);
+                        ?>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-<div class="row">
-    <div class="col12">
-        <div class="block">
-            <h4><?php echo helper::translate('Couleurs'); ?>
-            </h4>
-            <div class="row">
-                <div class="col4">
-                    <?php echo template::text('themeMenuTextColor', [
-                        'class' => 'colorPicker',
-                        'help' => 'Le curseur horizontal règle le niveau de transparence.',
-                        'label' => 'Texte',
-                        'value' => $this->getData(['theme', 'menu', 'textColor'])
-                    ]); ?>
+    <div class="row">
+        <div class="col12">
+            <div class="block">
+                <h4>
+                    <?php echo helper::translate('Couleurs'); ?>
+                </h4>
+                <div class="row">
+                    <div class="col4">
+                        <?php echo template::text('themeMenuTextColor', [
+                            'class' => 'colorPicker',
+                            'help' => 'Le curseur horizontal règle le niveau de transparence.',
+                            'label' => 'Texte',
+                            'value' => $this->getData(['theme', 'menu', 'textColor'])
+                        ]); ?>
+                    </div>
+                    <div class="col4">
+                        <?php echo template::text('themeMenuBackgroundColor', [
+                            'class' => 'colorPicker',
+                            'help' => 'Le curseur horizontal règle le niveau de transparence.',
+                            'label' => 'Arrière plan',
+                            'value' => $this->getData(['theme', 'menu', 'backgroundColor'])
+                        ]); ?>
+                    </div>
+                    <div class="col4">
+                        <?php echo template::text('themeMenuBackgroundColorSub', [
+                            'class' => 'colorPicker',
+                            'help' => 'Le curseur horizontal règle le niveau de transparence.',
+                            'label' => 'Fond du sous-menu',
+                            'value' => $this->getData(['theme', 'menu', 'backgroundColorSub'])
+                        ]); ?>
+                    </div>
                 </div>
-                <div class="col4">
-                    <?php echo template::text('themeMenuBackgroundColor', [
-                        'class' => 'colorPicker',
-                        'help' => 'Le curseur horizontal règle le niveau de transparence.',
-                        'label' => 'Arrière plan',
-                        'value' => $this->getData(['theme', 'menu', 'backgroundColor'])
-                    ]); ?>
-                </div>
-                <div class="col4">
-                    <?php echo template::text('themeMenuBackgroundColorSub', [
-                        'class' => 'colorPicker',
-                        'help' => 'Le curseur horizontal règle le niveau de transparence.',
-                        'label' => 'Fond du sous-menu',
-                        'value' => $this->getData(['theme', 'menu', 'backgroundColorSub'])
-                    ]); ?>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col4">
-                    <?php echo template::text('themeMenuActiveTextColor', [
-                        'class' => 'colorPicker',
-                        'help' => 'Le curseur horizontal règle le niveau de transparence.',
-                        'label' => 'Couleur texte page active',
-                        'value' => $this->getData(['theme', 'menu', 'activeTextColor'])
-                    ]); ?>
-                </div>
-                <div class="col4 verticalAlignBottom">
-                    <?php
-                    echo template::checkbox('themeMenuActiveColorAuto', true, 'Couleur de fond automatique', [
-                        'checked' => $this->getData(['theme', 'menu', 'activeColorAuto']),
-                     ]); ?>
-                </div>
-                <div class="col4">
-                    <?php echo template::text('themeMenuActiveColor', [
-                        'class' => 'colorPicker',
-                        'help' => 'Couleur de fond de la page sélectionnée dans le menu.<br>Le curseur horizontal règle le niveau de transparence.',
-                        'label' => 'Fond page active',
-                        'value' => $this->getData(['theme', 'menu', 'activeColor'])
-                    ]); ?>
+                <div class="row">
+                    <div class="col4">
+                        <?php echo template::text('themeMenuActiveTextColor', [
+                            'class' => 'colorPicker',
+                            'help' => 'Le curseur horizontal règle le niveau de transparence.',
+                            'label' => 'Couleur texte page active',
+                            'value' => $this->getData(['theme', 'menu', 'activeTextColor'])
+                        ]); ?>
+                    </div>
+                    <div class="col4 verticalAlignBottom">
+                        <?php
+                        echo template::checkbox('themeMenuActiveColorAuto', true, 'Couleur de fond automatique', [
+                            'checked' => $this->getData(['theme', 'menu', 'activeColorAuto']),
+                        ]); ?>
+                    </div>
+                    <div class="col4">
+                        <?php echo template::text('themeMenuActiveColor', [
+                            'class' => 'colorPicker',
+                            'help' => 'Couleur de fond de la page sélectionnée dans le menu.<br>Le curseur horizontal règle le niveau de transparence.',
+                            'label' => 'Fond page active',
+                            'value' => $this->getData(['theme', 'menu', 'activeColor'])
+                        ]); ?>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-<div class="row">
-    <div class="col12">
-        <div class="block">
-            <h4><?php echo helper::translate('Mise en forme du texte'); ?>
-            </h4>
-            <div class="row">
-                <div class="col3">
-                    <?php echo template::select('themeMenuFont', $module::$fonts['name'], [
-                        'label' => 'Fonte',
-                        'selected' => $this->getData(['theme', 'menu', 'font']),
-                        'font' => $module::$fonts['family']
-                    ]); ?>
-                </div>
-                <div class="col3">
-                    <?php echo template::select('themeMenuFontSize', $module::$menuFontSizes, [
-                        'label' => 'Taille',
-                        'help' => 'Proportionnelle à la taille définie dans le site.',
-                        'selected' => $this->getData(['theme', 'menu', 'fontSize'])
-                    ]); ?>
-                </div>
-                <div class="col3">
-                    <?php echo template::select('themeMenuFontWeight', $module::$fontWeights, [
-                        'label' => 'Style',
-                        'selected' => $this->getData(['theme', 'menu', 'fontWeight'])
-                    ]); ?>
-                </div>
-                <div class="col3">
-                    <?php echo template::select('themeMenuTextTransform', $module::$textTransforms, [
-                        'label' => 'Casse',
-                        'selected' => $this->getData(['theme', 'menu', 'textTransform'])
-                    ]); ?>
+    <div class="row">
+        <div class="col12">
+            <div class="block">
+                <h4>
+                    <?php echo helper::translate('Mise en forme du texte'); ?>
+                </h4>
+                <div class="row">
+                    <div class="col3">
+                        <?php echo template::select('themeMenuFont', $module::$fonts['name'], [
+                            'label' => 'Fonte',
+                            'selected' => $this->getData(['theme', 'menu', 'font']),
+                            'font' => $module::$fonts['family']
+                        ]); ?>
+                    </div>
+                    <div class="col3">
+                        <?php echo template::select('themeMenuFontSize', $module::$menuFontSizes, [
+                            'label' => 'Taille',
+                            'help' => 'Proportionnelle à la taille définie dans le site.',
+                            'selected' => $this->getData(['theme', 'menu', 'fontSize'])
+                        ]); ?>
+                    </div>
+                    <div class="col3">
+                        <?php echo template::select('themeMenuFontWeight', $module::$fontWeights, [
+                            'label' => 'Style',
+                            'selected' => $this->getData(['theme', 'menu', 'fontWeight'])
+                        ]); ?>
+                    </div>
+                    <div class="col3">
+                        <?php echo template::select('themeMenuTextTransform', $module::$textTransforms, [
+                            'label' => 'Casse',
+                            'selected' => $this->getData(['theme', 'menu', 'textTransform'])
+                        ]); ?>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-<?php echo template::formClose(); ?>
\ No newline at end of file
+    <?php echo template::formClose(); ?>
\ No newline at end of file