From 70c8a146711c58e8504e2ae7afebcbfc1e55b631 Mon Sep 17 00:00:00 2001 From: Michael Krecek Date: Wed, 31 Aug 2022 20:15:15 +0200 Subject: [PATCH 1/6] Add support to add label to menugroup --- src/Menu.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Menu.php b/src/Menu.php index be505488bd..04e76969d7 100644 --- a/src/Menu.php +++ b/src/Menu.php @@ -131,6 +131,8 @@ public function addGroup($name, string $template = 'menugroup.html') if (isset($name['icon'])) { Icon::addTo($group, [$name['icon']], ['Icon'])->removeClass('item'); + } elseif (isset($name['label'])) { + Label::addTo($group, [$name['label']], ['Icon'])->removeClass('item')->addClass('mini'); } return $group; From b4eaa211557607eed3c5fc56a8a93887f16c1b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 2 Apr 2024 23:03:29 +0200 Subject: [PATCH 2/6] rm unused fallback keys --- src/Menu.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Menu.php b/src/Menu.php index 04e76969d7..48c66bf928 100644 --- a/src/Menu.php +++ b/src/Menu.php @@ -91,7 +91,7 @@ public function addMenu($name) $name = [$name]; } - $label = $name['title'] ?? $name['text'] ?? $name['name'] ?? $name[0] ?? null; + $label = $name['title'] ?? $name[0] ?? null; if ($label !== null) { $subMenu->template->set('label', $label); @@ -123,7 +123,7 @@ public function addGroup($name, string $template = 'menugroup.html') $name = [$name]; } - $title = $name['title'] ?? $name['text'] ?? $name['name'] ?? $name[0] ?? null; + $title = $name['title'] ?? $name[0] ?? null; if ($title !== null) { $group->template->set('title', $title); From c3e9ab8c7660093299b5e466404134f08014ae9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 2 Apr 2024 23:19:02 +0200 Subject: [PATCH 3/6] improve var case in docs --- docs/app.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/app.md b/docs/app.md index 06d4994e7a..9dab5725a0 100644 --- a/docs/app.md +++ b/docs/app.md @@ -447,8 +447,8 @@ $layout = $app->layout; $layout->menuLeft->addItem(['Welcome Page', 'icon' => 'gift'], ['index']); $layout->menuLeft->addItem(['Layouts', 'icon' => 'object group'], ['layouts']); -$EditGroup = $layout->menuLeft->addGroup(['Edit', 'icon' => 'edit']); -$EditGroup->addItem('Basics', ['edit/basic']); +$editGroup = $layout->menuLeft->addGroup(['Edit', 'icon' => 'edit']); +$editGroup->addItem('Basics', ['edit/basic']); ``` :::{php:attr} menu From 63e9011e90a308e6f58b87989fdc5e2aedfa4aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 3 Apr 2024 05:46:30 +0200 Subject: [PATCH 4/6] tiny size --- src/Menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Menu.php b/src/Menu.php index 48c66bf928..95e6ac828c 100644 --- a/src/Menu.php +++ b/src/Menu.php @@ -132,7 +132,7 @@ public function addGroup($name, string $template = 'menugroup.html') if (isset($name['icon'])) { Icon::addTo($group, [$name['icon']], ['Icon'])->removeClass('item'); } elseif (isset($name['label'])) { - Label::addTo($group, [$name['label']], ['Icon'])->removeClass('item')->addClass('mini'); + Label::addTo($group, [$name['label']], ['Icon'])->removeClass('item')->addClass('tiny'); } return $group; From 10142a4607991b310359f7298a814d115ed1445d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 3 Apr 2024 06:01:02 +0200 Subject: [PATCH 5/6] add docs example --- docs/app.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/app.md b/docs/app.md index 9dab5725a0..dbd0f13fbb 100644 --- a/docs/app.md +++ b/docs/app.md @@ -449,6 +449,9 @@ $layout->menuLeft->addItem(['Layouts', 'icon' => 'object group'], ['layouts']); $editGroup = $layout->menuLeft->addGroup(['Edit', 'icon' => 'edit']); $editGroup->addItem('Basics', ['edit/basic']); + +$newsGroup = $layout->menuLeft->addGroup(['News', 'label' => ['28', 'class.red' => true]]); +$newsGroup->addItem('Emails', ['news/emails']); ``` :::{php:attr} menu From 93ac62f1aa8a1bd2678138e2836d9fb99bbe55c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 3 Apr 2024 06:12:13 +0200 Subject: [PATCH 6/6] DEBUG render/size unify --- demos/init-app.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/demos/init-app.php b/demos/init-app.php index 460800fceb..57d029ef85 100644 --- a/demos/init-app.php +++ b/demos/init-app.php @@ -153,10 +153,10 @@ public static function get_class(\Closure $createAnonymousClassFx): string $layout->addMenuItem(['Sliding Panel'], [$path . 'layout-panel'], $menu); $path = $demosUrl . 'basic/'; - $menu = $layout->addMenuGroup(['Basics', 'icon' => 'cubes']); + $menu = $layout->addMenuGroup(['Basics', 'label' => ['10', 'class.red' => true]]); $layout->addMenuItem('View', [$path . 'view'], $menu); - $layout->addMenuItem('Button', [$path . 'button'], $menu); - $layout->addMenuItem('Header', [$path . 'header'], $menu); + $layout->addMenuItem(['Button', 'label' => ['10', 'class.red' => true]], [$path . 'button'], $menu); + $layout->addMenuItem(['Header', 'icon' => 'edit'], [$path . 'header'], $menu); $layout->addMenuItem('Message', [$path . 'message'], $menu); $layout->addMenuItem('Labels', [$path . 'label'], $menu); $layout->addMenuItem('Menu', [$path . 'menu'], $menu); @@ -174,9 +174,11 @@ public static function get_class(\Closure $createAnonymousClassFx): string $layout->addMenuItem(['HTML Layout'], [$path . 'html-layout'], $menu); $layout->addMenuItem(['Conditional Fields'], [$path . 'jscondform'], $menu); + $layout->addMenuItem(['Chats', 'label' => ['10', 'class.red' => true]], [$path . '..']); + $path = $demosUrl . 'form-control/'; $menu = $layout->addMenuGroup(['Form Controls', 'icon' => 'keyboard outline']); - $layout->addMenuItem(['Input'], [$path . 'input2'], $menu); + $layout->addMenuItem(['Input', 'label' => ['10', 'class.red' => true]], [$path . 'input2'], $menu); $layout->addMenuItem('Input Decoration', [$path . 'input'], $menu); $layout->addMenuItem('Calendar', [$path . 'calendar'], $menu); $layout->addMenuItem(['Checkboxes'], [$path . 'checkbox'], $menu);