From 7095456d36c28ffc17f9899e85ef5d8f5335c176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 12 Nov 2026 11:13:30 +0100 Subject: [PATCH] feat: group the sidebar, add a settings hub and move account actions to a header user menu --- assets/controllers/toggle_controller.js | 6 + assets/images/ep-logo.svg | 1 + config/services.yaml | 3 + .../Administrative/System/IndexController.php | 22 ++ src/Menu/AbstractMenuBuilder.php | 108 ++---- src/Menu/AdminMenuBuilder.php | 334 +++++------------- src/Menu/HouseManagerMenuBuilder.php | 5 - src/Menu/ManagerMenuBuilder.php | 175 +++------ src/Menu/MenuBuilder.php | 12 + src/Menu/TeamerMenuBuilder.php | 5 - templates/_partials/_brand.html.twig | 5 + templates/_partials/_menu.html.twig | 22 +- templates/_partials/_user_menu.html.twig | 35 ++ .../administrative/system/index.html.twig | 71 ++++ templates/layout.html.twig | 53 ++- .../System/IndexControllerTest.php | 107 ++++++ 16 files changed, 487 insertions(+), 477 deletions(-) create mode 100644 assets/images/ep-logo.svg create mode 100644 src/Controller/Administrative/System/IndexController.php create mode 100644 templates/_partials/_brand.html.twig create mode 100644 templates/_partials/_user_menu.html.twig create mode 100644 templates/administrative/system/index.html.twig create mode 100644 tests/Controller/Administrative/System/IndexControllerTest.php diff --git a/assets/controllers/toggle_controller.js b/assets/controllers/toggle_controller.js index 3b6ed2a..9b2efb7 100644 --- a/assets/controllers/toggle_controller.js +++ b/assets/controllers/toggle_controller.js @@ -23,6 +23,12 @@ export default class extends Controller { this.openValue = false } + closeOutside(event) { + if (false === this.element.contains(event.target)) { + this.close() + } + } + open() { this.openValue = true } diff --git a/assets/images/ep-logo.svg b/assets/images/ep-logo.svg new file mode 100644 index 0000000..596f534 --- /dev/null +++ b/assets/images/ep-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config/services.yaml b/config/services.yaml index fd98f0a..974ebed 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -340,6 +340,9 @@ services: - name: knp_menu.menu_builder method: createTeamerMenu alias: default_teamer + - name: knp_menu.menu_builder + method: createUserMenu + alias: default_user App\Menu\AdminMenuBuilder: arguments: diff --git a/src/Controller/Administrative/System/IndexController.php b/src/Controller/Administrative/System/IndexController.php new file mode 100644 index 0000000..4799e03 --- /dev/null +++ b/src/Controller/Administrative/System/IndexController.php @@ -0,0 +1,22 @@ +render('administrative/system/index.html.twig'); + } +} diff --git a/src/Menu/AbstractMenuBuilder.php b/src/Menu/AbstractMenuBuilder.php index 8fc4e07..5329589 100644 --- a/src/Menu/AbstractMenuBuilder.php +++ b/src/Menu/AbstractMenuBuilder.php @@ -134,77 +134,39 @@ abstract class AbstractMenuBuilder ...(null !== $returnUrl ? ['uri' => $returnUrl] : ['route' => $defaultRoute]), 'extras' => [ 'icon' => 'arrow-left', + 'back' => true, ], ]); } - protected function addAdminItem(ItemInterface $menu): void - { - if ($this->security->isGranted('ROLE_TEAM_ADMIN')) { - $this->addDivider($menu); - $menu->addChild('zum Adminbereich', [ - 'route' => 'app_admin_index', - 'linkAttributes' => [ - 'title' => 'zum Adminbereich', - ], - 'extras' => [ - 'icon' => 'user', - ], - ]); - } - } + /** + * Areas the user can switch to, in priority order, with the label of their link. + */ + protected const AREA_LINKS = [ + 'ROLE_TEAM_ADMIN' => ['zum Adminbereich', 'app_admin_index'], + 'ROLE_MANAGER' => ['zum Managementbereich', 'app_manager_index'], + 'ROLE_HOUSE_MANAGER' => ['zum Hausleitungsbereich', 'app_house_manager_index'], + 'ROLE_TEAMER' => ['zum Teambereich', 'app_teamer_index'], + ]; - protected function addManagerItem(ItemInterface $menu): void + /** + * Adds the links to the other areas the user has, then logout, or the way back to the + * own user while impersonating someone. + */ + protected function addAccountItems(ItemInterface $menu): void { - if ($this->security->isGranted('ROLE_MANAGER')) { - $this->addDivider($menu); - $menu->addChild('zum Managementbereich', [ - 'route' => 'app_manager_index', - 'linkAttributes' => [ - 'title' => 'zum Managementbereich', - ], - 'extras' => [ - 'icon' => 'user', - ], - ]); - } - } + $currentArea = $this->resolveArea(); - protected function addTeamerItem(ItemInterface $menu): void - { - if ($this->security->isGranted('ROLE_TEAMER')) { - $this->addDivider($menu); - $menu->addChild('zum Teambereich', [ - 'route' => 'app_teamer_index', - 'linkAttributes' => [ - 'title' => 'zum Teambereich', - ], - 'extras' => [ - 'icon' => 'user', - ], - ]); + foreach (self::AREA_LINKS as $role => [$label, $route]) { + if ($role !== $currentArea && $this->security->isGranted($role)) { + $menu->addChild($label, [ + 'route' => $route, + 'extras' => [ + 'icon' => 'arrow-right', + ], + ]); + } } - } - - protected function addHouseManagerItem(ItemInterface $menu): void - { - if ($this->security->isGranted('ROLE_HOUSE_MANAGER')) { - $this->addDivider($menu); - $menu->addChild('zum Hausleitungsbereich', [ - 'route' => 'app_house_manager_index', - 'linkAttributes' => [ - 'title' => 'zum Hausleitungsbereich', - ], - 'extras' => [ - 'icon' => 'user', - ], - ]); - } - } - - protected function addLogoutItem(ItemInterface $menu): void - { - $this->addDivider($menu); $token = $this->security->getToken(); @@ -214,9 +176,6 @@ abstract class AbstractMenuBuilder $menu->addChild('zum eigenen Benutzer', [ 'route' => $originalUser->getDefaultRoute(), 'routeParameters' => ['_switch_user' => '_exit'], - 'linkAttributes' => [ - 'title' => 'zurück', - ], 'extras' => [ 'icon' => 'logout', ], @@ -224,9 +183,6 @@ abstract class AbstractMenuBuilder } else { $menu->addChild('Logout', [ 'route' => 'app_security_logout', - 'linkAttributes' => [ - 'title' => 'Logout', - ], 'extras' => [ 'icon' => 'logout', ], @@ -234,6 +190,20 @@ abstract class AbstractMenuBuilder } } + /** + * Adds the heading of a group of sidebar items. The items themselves follow as siblings, + * so their level, active state and route patterns stay as they are. + */ + protected function addHeading(ItemInterface $menu, string $label): void + { + $menu->addChild(Uuid::v4(), [ + 'label' => $label, + 'extras' => [ + 'heading' => true, + ], + ]); + } + protected function addDivider(ItemInterface $menu): void { $menu->addChild(Uuid::v4(), [ diff --git a/src/Menu/AdminMenuBuilder.php b/src/Menu/AdminMenuBuilder.php index 8a4335d..de7f713 100644 --- a/src/Menu/AdminMenuBuilder.php +++ b/src/Menu/AdminMenuBuilder.php @@ -21,6 +21,8 @@ class AdminMenuBuilder extends AbstractMenuBuilder ], ]); + $this->addHeading($menu, 'Planung'); + $menu->addChild('Einsatzübersicht', [ 'route' => 'app_administrative_assignment_index', 'linkAttributes' => [ @@ -44,83 +46,17 @@ class AdminMenuBuilder extends AbstractMenuBuilder ], ]); - $menu->addChild('Bewerbungsübersicht', [ - 'route' => 'app_admin_application_index', + $menu->addChild('Verfügbarkeiten', [ + 'route' => 'app_administrative_availability_index', 'linkAttributes' => [ - 'title' => 'Bewerbungsübersicht', + 'title' => 'Verfügbarkeiten', ], 'extras' => [ - 'icon' => 'mail', + 'icon' => 'calendar', ], ]); - $menu->addChild('Bewerbungseingang TYPO3', [ - 'route' => 'app_admin_application_form_submission_index', - 'linkAttributes' => [ - 'title' => 'Bewerbungseingang TYPO3', - ], - 'extras' => [ - 'icon' => 'typo3', - 'routes' => [ - ['pattern' => '/^app_admin_application_form_submission_/'], - ], - ], - ]); - - $documentMenu = $menu->addChild('Dokumente', [ - 'extras' => [ - 'icon' => 'document', - ], - ]); - $documentMenu->addChild('Übersicht', [ - 'route' => 'app_administrative_document_index', - 'linkAttributes' => [ - 'title' => 'Übersicht', - ], - ]); - $documentMenu->addChild('akzeptierte Honorarnoten', [ - 'route' => 'app_administrative_document_accepted', - 'routeParameters' => [ - 'type' => Upload::TYPE_INVOICE, - ], - 'linkAttributes' => [ - 'title' => 'akzeptierte Honorarnoten', - ], - ]); - $documentMenu->addChild('geprüfte Honorverträge', [ - 'route' => 'app_administrative_document_accepted', - 'routeParameters' => [ - 'type' => Upload::TYPE_CONTRACT, - ], - 'linkAttributes' => [ - 'title' => 'geprüfte Honorverträge', - ], - ]); - - $menu->addChild('Teamer:innen-Feedback', [ - 'route' => 'app_administrative_feedback_index', - 'linkAttributes' => [ - 'title' => 'Teamer:innen-Feedback', - ], - 'extras' => [ - 'icon' => 'feedback', - 'routes' => [ - ['pattern' => '/^app_administrative_feedback_/'], - ], - ], - ]); - $menu->addChild('Reiseleitungsfeedback', [ - 'route' => 'app_administrative_questionnaire_index', - 'linkAttributes' => [ - 'title' => 'Reiseleitungsfeedback nach Einsätzen', - ], - 'extras' => [ - 'icon' => 'document', - 'routes' => [ - ['pattern' => '/^app_administrative_questionnaire_/'], - ], - ], - ]); + $this->addHeading($menu, 'Team'); $menu->addChild('Teamübersicht', [ 'route' => 'app_administrative_teamer_index', @@ -175,13 +111,86 @@ class AdminMenuBuilder extends AbstractMenuBuilder ], ]); - $menu->addChild('Verfügbarkeiten', [ - 'route' => 'app_administrative_availability_index', + $documentMenu = $menu->addChild('Dokumente', [ + 'extras' => [ + 'icon' => 'document', + ], + ]); + $documentMenu->addChild('Übersicht', [ + 'route' => 'app_administrative_document_index', 'linkAttributes' => [ - 'title' => 'Verfügbarkeiten', + 'title' => 'Übersicht', + ], + ]); + $documentMenu->addChild('akzeptierte Honorarnoten', [ + 'route' => 'app_administrative_document_accepted', + 'routeParameters' => [ + 'type' => Upload::TYPE_INVOICE, + ], + 'linkAttributes' => [ + 'title' => 'akzeptierte Honorarnoten', + ], + ]); + $documentMenu->addChild('geprüfte Honorverträge', [ + 'route' => 'app_administrative_document_accepted', + 'routeParameters' => [ + 'type' => Upload::TYPE_CONTRACT, + ], + 'linkAttributes' => [ + 'title' => 'geprüfte Honorverträge', + ], + ]); + + $this->addHeading($menu, 'Bewerbungen'); + + $menu->addChild('Bewerbungsübersicht', [ + 'route' => 'app_admin_application_index', + 'linkAttributes' => [ + 'title' => 'Bewerbungsübersicht', ], 'extras' => [ - 'icon' => 'calendar', + 'icon' => 'mail', + ], + ]); + + $menu->addChild('Bewerbungseingang TYPO3', [ + 'route' => 'app_admin_application_form_submission_index', + 'linkAttributes' => [ + 'title' => 'Bewerbungseingang TYPO3', + ], + 'extras' => [ + 'icon' => 'typo3', + 'routes' => [ + ['pattern' => '/^app_admin_application_form_submission_/'], + ], + ], + ]); + + $this->addHeading($menu, 'Feedback & Auswertung'); + + $menu->addChild('Teamer:innen-Feedback', [ + 'route' => 'app_administrative_feedback_index', + 'linkAttributes' => [ + 'title' => 'Teamer:innen-Feedback', + ], + 'extras' => [ + 'icon' => 'feedback', + 'routes' => [ + ['pattern' => '/^app_administrative_feedback_/'], + ], + ], + ]); + + $menu->addChild('Reiseleitungsfeedback', [ + 'route' => 'app_administrative_questionnaire_index', + 'linkAttributes' => [ + 'title' => 'Reiseleitungsfeedback nach Einsätzen', + ], + 'extras' => [ + 'icon' => 'document', + 'routes' => [ + ['pattern' => '/^app_administrative_questionnaire_/'], + ], ], ]); @@ -215,176 +224,18 @@ class AdminMenuBuilder extends AbstractMenuBuilder ], ]); - $settingsMenu = $menu->addChild('Einstellungen', [ + $this->addDivider($menu); + + $menu->addChild('Einstellungen', [ + 'route' => 'app_administrative_system_index', 'linkAttributes' => [ 'title' => 'Einstellungen', ], 'extras' => [ 'icon' => 'settings', - ], - ]); - $settingsMenu->addChild('Verfügbarkeiten', [ - 'route' => 'app_admin_system_availability_index', - 'linkAttributes' => [ - 'title' => 'Verfügbarkeiten', - ], - 'extras' => [ 'routes' => [ - ['pattern' => '/^app_admin_system_availability_/'], - ], - ], - ]); - $settingsMenu->addChild('Honorare', [ - 'route' => 'app_admin_system_fee_index', - 'linkAttributes' => [ - 'title' => 'Honorare', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_admin_system_fee_/'], - ], - ], - ]); - $settingsMenu->addChild('Fortbildungen', [ - 'route' => 'app_admin_system_training_index', - 'linkAttributes' => [ - 'title' => 'Fortbildungen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_admin_system_training_/'], - ], - ], - ]); - $settingsMenu->addChild('E-Mail-Texte', [ - 'route' => 'app_admin_system_email_text_index', - 'linkAttributes' => [ - 'title' => 'E-Mail-Texte', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_admin_system_email_text_/'], - ], - ], - ]); - $settingsMenu->addChild('Jobprofile', [ - 'route' => 'app_admin_system_job_profile_index', - 'linkAttributes' => [ - 'title' => 'Jobprofile', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_admin_system_job_profile_/'], - ], - ], - ]); - $settingsMenu->addChild('Besetzungsmatrix', [ - 'route' => 'app_administrative_system_staffing_rule_index', - 'linkAttributes' => [ - 'title' => 'Besetzungsmatrix', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_staffing_rule_/'], - ], - ], - ]); - $settingsMenu->addChild('Reisen', [ - 'route' => 'app_administrative_system_destination_index', - 'linkAttributes' => [ - 'title' => 'Reisen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_destination_/'], - ], - ], - ]); - $settingsMenu->addChild('Feedbackvorlagen', [ - 'route' => 'app_admin_system_feedback_set_index', - 'linkAttributes' => [ - 'title' => 'Feedbackvorlagen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_admin_system_feedback_set_/'], - ], - ], - ]); - $settingsMenu->addChild('FAQ', [ - 'route' => 'app_administrative_system_faq_index', - 'linkAttributes' => [ - 'title' => 'FAQ', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_faq_/'], - ], - ], - ]); - $settingsMenu->addChild('News', [ - 'route' => 'app_administrative_system_news_index', - 'linkAttributes' => [ - 'title' => 'News', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_news_/'], - ], - ], - ]); - $settingsMenu->addChild('Dokumente', [ - 'route' => 'app_administrative_system_document_index', - 'linkAttributes' => [ - 'title' => 'Dokumente', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_document_/'], - ], - ], - ]); - $settingsMenu->addChild('Saisonteam-Dokumente', [ - 'route' => 'app_administrative_system_season_task_document_index', - 'linkAttributes' => [ - 'title' => 'Saisonteam-Dokumente', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_season_task_document_/'], - ], - ], - ]); - $settingsMenu->addChild('Mailvorlagen', [ - 'route' => 'app_administrative_system_mailing_template_index', - 'linkAttributes' => [ - 'title' => 'Mailvorlagen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_mailing_template_/'], - ], - ], - ]); - $settingsMenu->addChild('Ansprechpersonen', [ - 'route' => 'app_admin_system_contact_index', - 'linkAttributes' => [ - 'title' => 'Ansprechpersonen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_admin_system_contact_/'], - ], - ], - ]); - $settingsMenu->addChild('Administrative Benutzer:innen', [ - 'route' => 'app_admin_system_user_index', - 'linkAttributes' => [ - 'title' => 'Administrative Benutzer:innen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_admin_system_user_/'], + ['pattern' => '/^app_admin_system_/'], + ['pattern' => '/^app_administrative_system_/'], ], ], ]); @@ -399,11 +250,6 @@ class AdminMenuBuilder extends AbstractMenuBuilder ], ]); - $this->addTeamerItem($menu); - $this->addManagerItem($menu); - $this->addHouseManagerItem($menu); - $this->addLogoutItem($menu); - return $menu; } diff --git a/src/Menu/HouseManagerMenuBuilder.php b/src/Menu/HouseManagerMenuBuilder.php index 7aa4d29..d669bad 100644 --- a/src/Menu/HouseManagerMenuBuilder.php +++ b/src/Menu/HouseManagerMenuBuilder.php @@ -42,11 +42,6 @@ class HouseManagerMenuBuilder extends AbstractMenuBuilder ], ]); - $this->addAdminItem($menu); - $this->addManagerItem($menu); - $this->addTeamerItem($menu); - $this->addLogoutItem($menu); - return $menu; } } diff --git a/src/Menu/ManagerMenuBuilder.php b/src/Menu/ManagerMenuBuilder.php index 38ec27a..5b24fa1 100644 --- a/src/Menu/ManagerMenuBuilder.php +++ b/src/Menu/ManagerMenuBuilder.php @@ -20,6 +20,9 @@ class ManagerMenuBuilder extends AbstractMenuBuilder 'icon' => 'chart', ], ]); + + $this->addHeading($menu, 'Planung'); + $menu->addChild('Einsatzübersicht', [ 'route' => 'app_administrative_assignment_index', 'linkAttributes' => [ @@ -32,6 +35,7 @@ class ManagerMenuBuilder extends AbstractMenuBuilder ], ], ]); + $menu->addChild('Zeitleiste', [ 'route' => 'app_administrative_timeline', 'linkAttributes' => [ @@ -41,6 +45,48 @@ class ManagerMenuBuilder extends AbstractMenuBuilder 'icon' => 'table', ], ]); + + $this->addHeading($menu, 'Team'); + + $menu->addChild('Teamübersicht', [ + 'route' => 'app_administrative_teamer_index', + 'linkAttributes' => [ + 'title' => 'Teamübersicht', + ], + 'extras' => [ + 'icon' => 'users', + 'routes' => [ + ['pattern' => '/^app_administrative_teamer_/'], + ], + ], + ]); + + $menu->addChild('Saisonteamer', [ + 'route' => 'app_administrative_season_teamer_index', + 'linkAttributes' => [ + 'title' => 'Saisonteamer', + ], + 'extras' => [ + 'icon' => 'users', + 'routes' => [ + ['pattern' => '/^app_administrative_season_teamer_/'], + ], + ], + ]); + + $menu->addChild('Saisoneinsätze', [ + 'route' => 'app_administrative_season_assignment_index', + 'linkAttributes' => [ + 'title' => 'Saisoneinsätze', + ], + 'extras' => [ + 'icon' => 'calendar', + 'routes' => [ + ['pattern' => '/^app_administrative_season_assignment_/'], + ], + ], + ]); + $documentMenu = $menu->addChild('Dokumente', [ 'extras' => [ 'icon' => 'document', @@ -70,42 +116,9 @@ class ManagerMenuBuilder extends AbstractMenuBuilder 'title' => 'geprüfte Honorverträge', ], ]); - $menu->addChild('Teamübersicht', [ - 'route' => 'app_administrative_teamer_index', - 'linkAttributes' => [ - 'title' => 'Teamübersicht', - ], - 'extras' => [ - 'icon' => 'users', - 'routes' => [ - ['pattern' => '/^app_administrative_teamer_/'], - ], - ], - ]); - $menu->addChild('Saisonteamer', [ - 'route' => 'app_administrative_season_teamer_index', - 'linkAttributes' => [ - 'title' => 'Saisonteamer', - ], - 'extras' => [ - 'icon' => 'users', - 'routes' => [ - ['pattern' => '/^app_administrative_season_teamer_/'], - ], - ], - ]); - $menu->addChild('Saisoneinsätze', [ - 'route' => 'app_administrative_season_assignment_index', - 'linkAttributes' => [ - 'title' => 'Saisoneinsätze', - ], - 'extras' => [ - 'icon' => 'calendar', - 'routes' => [ - ['pattern' => '/^app_administrative_season_assignment_/'], - ], - ], - ]); + + $this->addHeading($menu, 'Feedback & Auswertung'); + $menu->addChild('Teamer:innen-Feedback', [ 'route' => 'app_administrative_feedback_index', 'linkAttributes' => [ @@ -118,6 +131,7 @@ class ManagerMenuBuilder extends AbstractMenuBuilder ], ], ]); + $menu->addChild('Reiseleitungsfeedback', [ 'route' => 'app_administrative_questionnaire_index', 'linkAttributes' => [ @@ -130,6 +144,7 @@ class ManagerMenuBuilder extends AbstractMenuBuilder ], ], ]); + $statisticsMenu = $menu->addChild('Statistiken', [ 'extras' => [ 'icon' => 'chart', @@ -159,96 +174,22 @@ class ManagerMenuBuilder extends AbstractMenuBuilder 'title' => 'Bewerbungen pro Destination', ], ]); - $settingsMenu = $menu->addChild('Einstellungen', [ + + $this->addDivider($menu); + + $menu->addChild('Einstellungen', [ + 'route' => 'app_administrative_system_index', 'linkAttributes' => [ 'title' => 'Einstellungen', ], 'extras' => [ 'icon' => 'settings', - ], - ]); - $settingsMenu->addChild('Besetzungsmatrix', [ - 'route' => 'app_administrative_system_staffing_rule_index', - 'linkAttributes' => [ - 'title' => 'Besetzungsmatrix', - ], - 'extras' => [ 'routes' => [ - ['pattern' => '/^app_administrative_system_staffing_rule_/'], + ['pattern' => '/^app_admin_system_/'], + ['pattern' => '/^app_administrative_system_/'], ], ], ]); - $settingsMenu->addChild('Reisen', [ - 'route' => 'app_administrative_system_destination_index', - 'linkAttributes' => [ - 'title' => 'Reisen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_destination_/'], - ], - ], - ]); - $settingsMenu->addChild('FAQ', [ - 'route' => 'app_administrative_system_faq_index', - 'linkAttributes' => [ - 'title' => 'FAQ', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_faq_/'], - ], - ], - ]); - $settingsMenu->addChild('News', [ - 'route' => 'app_administrative_system_news_index', - 'linkAttributes' => [ - 'title' => 'News', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_news_/'], - ], - ], - ]); - $settingsMenu->addChild('Dokumente', [ - 'route' => 'app_administrative_system_document_index', - 'linkAttributes' => [ - 'title' => 'Dokumente', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_document_/'], - ], - ], - ]); - $settingsMenu->addChild('Saisonunterlagen', [ - 'route' => 'app_administrative_system_season_task_document_index', - 'linkAttributes' => [ - 'title' => 'Saisonunterlagen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_season_task_document_/'], - ], - ], - ]); - $settingsMenu->addChild('Mailvorlagen', [ - 'route' => 'app_administrative_system_mailing_template_index', - 'linkAttributes' => [ - 'title' => 'Mailvorlagen', - ], - 'extras' => [ - 'routes' => [ - ['pattern' => '/^app_administrative_system_mailing_template_/'], - ], - ], - ]); - - $this->addAdminItem($menu); - $this->addTeamerItem($menu); - $this->addHouseManagerItem($menu); - $this->addLogoutItem($menu); return $menu; } diff --git a/src/Menu/MenuBuilder.php b/src/Menu/MenuBuilder.php index 957728c..f6a7f32 100644 --- a/src/Menu/MenuBuilder.php +++ b/src/Menu/MenuBuilder.php @@ -40,6 +40,18 @@ class MenuBuilder extends AbstractMenuBuilder }; } + /** + * The account menu behind the user's picture in the header: the other areas and logout. + */ + public function createUserMenu(array $options): ItemInterface + { + $menu = $this->createRootElement(); + + $this->addAccountItems($menu); + + return $menu; + } + public function createTeamerMenu(array $options): ItemInterface { return match ($this->resolveArea()) { diff --git a/src/Menu/TeamerMenuBuilder.php b/src/Menu/TeamerMenuBuilder.php index 26bd708..85ff5ed 100644 --- a/src/Menu/TeamerMenuBuilder.php +++ b/src/Menu/TeamerMenuBuilder.php @@ -170,11 +170,6 @@ class TeamerMenuBuilder extends AbstractMenuBuilder ], ]); - $this->addAdminItem($menu); - $this->addManagerItem($menu); - $this->addHouseManagerItem($menu); - $this->addLogoutItem($menu); - return $menu; } diff --git a/templates/_partials/_brand.html.twig b/templates/_partials/_brand.html.twig new file mode 100644 index 0000000..58d5cd5 --- /dev/null +++ b/templates/_partials/_brand.html.twig @@ -0,0 +1,5 @@ +{# The E&P logo with the app name beside it, as in the header of the apps portal (EP/apps) and epbms. #} + + E&P Reisen & Events + Team + diff --git a/templates/_partials/_menu.html.twig b/templates/_partials/_menu.html.twig index b7056e3..934c618 100644 --- a/templates/_partials/_menu.html.twig +++ b/templates/_partials/_menu.html.twig @@ -3,7 +3,7 @@ {% block list %} {% if item.hasChildren and options.depth is not same as(0) and item.displayChildren %} {% if item.level == 0 %} -
+