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 ]) . ''; } - // 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 .= '
'; } + } + /** + * 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 @@