@@ -38,12 +38,12 @@ discard block |
||
38 | 38 | 'title' => __('Launchpad'), |
39 | 39 | ]); |
40 | 40 | |
41 | - foreach(UserMenuJoint::collect() as $joint) { |
|
42 | - foreach ($joint->tools()?: [] as $tool) { |
|
41 | + foreach (UserMenuJoint::collect() as $joint) { |
|
42 | + foreach ($joint->tools() ?: [] as $tool) { |
|
43 | 43 | $this->addTool($tool); |
44 | 44 | } |
45 | 45 | |
46 | - foreach ($joint->entries()?: [] as $entry) { |
|
46 | + foreach ($joint->entries() ?: [] as $entry) { |
|
47 | 47 | $this->addEntry($entry); |
48 | 48 | } |
49 | 49 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | 'item' => ['Logout', 'icon' => 'sign out', 'attr' => ['onclick' => "event.preventDefault();$('#logout-form').submit();"]], |
62 | 62 | 'action' => url('logout'), |
63 | 63 | 'group' => '10000:user', |
64 | - 'callback' => function ($item){ |
|
64 | + 'callback' => function($item) { |
|
65 | 65 | $logoutForm = $item->add(['View', 'attr' => ['method' => 'POST', 'action' => URL::to('logout')]])->setElement('form')->addStyle(['display' => 'none']); |
66 | 66 | $logoutForm->id = 'logout-form'; |
67 | 67 | $logoutForm->add(['View', 'attr' => ['type' => 'hidden', 'name' => '_token', 'value' => csrf_token()]])->setElement('input'); |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | |
79 | 79 | public function getUserMenuLabel() |
80 | 80 | { |
81 | - return $this->userMenuLabel?: Auth::user()->name; |
|
81 | + return $this->userMenuLabel ?: Auth::user()->name; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | public function addEntry($entry) |
85 | 85 | { |
86 | 86 | $entry = collect(array_merge(['item' => $entry, 'group' => '00500:general', 'weight' => 10], $entry)); |
87 | 87 | |
88 | - if (! $entry->get('item')) return; |
|
88 | + if (!$entry->get('item')) return; |
|
89 | 89 | |
90 | 90 | $this->entries->add($entry); |
91 | 91 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | $item = $this->userMenu->addItem($entry['item'], $entry->get('action')); |
115 | 115 | |
116 | - if (! $callback = $entry->get('callback')) continue; |
|
116 | + if (!$callback = $entry->get('callback')) continue; |
|
117 | 117 | |
118 | 118 | $callback($item); |
119 | 119 | } |
@@ -73,7 +73,9 @@ discard block |
||
73 | 73 | { |
74 | 74 | $entry = collect(array_merge(['item' => $entry, 'group' => '00500:general', 'weight' => 10], $entry)); |
75 | 75 | |
76 | - if (! $entry->get('item')) return; |
|
76 | + if (! $entry->get('item')) { |
|
77 | + return; |
|
78 | + } |
|
77 | 79 | |
78 | 80 | $this->entries->add($entry); |
79 | 81 | } |
@@ -94,14 +96,18 @@ discard block |
||
94 | 96 | { |
95 | 97 | $empty = true; |
96 | 98 | foreach ($this->entries->groupBy('group')->sortKeys() as $group) { |
97 | - if (!$empty) $this->userMenu->addDivider(); |
|
99 | + if (!$empty) { |
|
100 | + $this->userMenu->addDivider(); |
|
101 | + } |
|
98 | 102 | |
99 | 103 | foreach ($group->sortBy('weight') as $entry) { |
100 | 104 | $empty = false; |
101 | 105 | |
102 | 106 | $item = $this->userMenu->addItem($entry['item'], $entry->get('action')); |
103 | 107 | |
104 | - if (! $callback = $entry->get('callback')) continue; |
|
108 | + if (! $callback = $entry->get('callback')) { |
|
109 | + continue; |
|
110 | + } |
|
105 | 111 | |
106 | 112 | $callback($item); |
107 | 113 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | protected function prepareButtons() |
60 | 60 | { |
61 | - foreach (self::$buttons->sortByDesc(function ($button) { |
|
61 | + foreach (self::$buttons->sortByDesc(function($button) { |
|
62 | 62 | return $button->weight; |
63 | 63 | }) as $button) { |
64 | 64 | $this->add($button); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | public static function addButtons($buttons) |
84 | 84 | { |
85 | - foreach (is_array($buttons)? $buttons: [$buttons] as $button) { |
|
85 | + foreach (is_array($buttons) ? $buttons : [$buttons] as $button) { |
|
86 | 86 | self::addButton($button); |
87 | 87 | } |
88 | 88 | } |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | public function __construct($parent) |
15 | 15 | { |
16 | - $this->parent = $parent; |
|
16 | + $this->parent = $parent; |
|
17 | 17 | |
18 | 18 | parent::__construct('$(this).atkCreateModal([arg])', [ |
19 | 19 | 'arg' => [ |
@@ -25,29 +25,29 @@ discard block |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | protected function getURL() |
28 | - { |
|
29 | - return $this->parent->add('VirtualPage')->set(Closure::fromCallable([$this, 'getContents']))->getJSURL('cut'); |
|
30 | - } |
|
28 | + { |
|
29 | + return $this->parent->add('VirtualPage')->set(Closure::fromCallable([$this, 'getContents']))->getJSURL('cut'); |
|
30 | + } |
|
31 | 31 | |
32 | - protected function getContents(VirtualPage $vp) |
|
33 | - { |
|
34 | - $vp->add([ |
|
35 | - new LaunchButton([ |
|
36 | - 'label' => 'Test Button 1', |
|
37 | - 'icon' => 'user' |
|
38 | - ]) |
|
39 | - ])->link(URL::to('/')); |
|
40 | - $vp->add([ |
|
41 | - new LaunchButton([ |
|
42 | - 'label' => 'Test Button 2', |
|
43 | - 'icon' => 'car' |
|
44 | - ]) |
|
45 | - ]); |
|
46 | - $vp->add([ |
|
47 | - new LaunchButton([ |
|
48 | - 'label' => 'Test Button 3', |
|
49 | - 'icon' => 'bus' |
|
50 | - ]) |
|
51 | - ]); |
|
52 | - } |
|
32 | + protected function getContents(VirtualPage $vp) |
|
33 | + { |
|
34 | + $vp->add([ |
|
35 | + new LaunchButton([ |
|
36 | + 'label' => 'Test Button 1', |
|
37 | + 'icon' => 'user' |
|
38 | + ]) |
|
39 | + ])->link(URL::to('/')); |
|
40 | + $vp->add([ |
|
41 | + new LaunchButton([ |
|
42 | + 'label' => 'Test Button 2', |
|
43 | + 'icon' => 'car' |
|
44 | + ]) |
|
45 | + ]); |
|
46 | + $vp->add([ |
|
47 | + new LaunchButton([ |
|
48 | + 'label' => 'Test Button 3', |
|
49 | + 'icon' => 'bus' |
|
50 | + ]) |
|
51 | + ]); |
|
52 | + } |
|
53 | 53 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $this->addHeader($this->app->title); |
20 | 20 | |
21 | 21 | $items = collect(); |
22 | - foreach(NavMenuJoint::collect() as $joint) { |
|
22 | + foreach (NavMenuJoint::collect() as $joint) { |
|
23 | 23 | $items = $items->merge($joint->items()); |
24 | 24 | } |
25 | 25 | |
@@ -36,13 +36,13 @@ discard block |
||
36 | 36 | |
37 | 37 | public static function addItems($menu, Collection $items) |
38 | 38 | { |
39 | - $items->sort(function ($entry1, $entry2) { |
|
39 | + $items->sort(function($entry1, $entry2) { |
|
40 | 40 | $weight1 = $entry1['weight']?? 10; |
41 | 41 | $weight2 = $entry2['weight']?? 10; |
42 | 42 | |
43 | 43 | return $weight1 <=> $weight2; |
44 | 44 | })->map(function($item, $caption) use ($menu) { |
45 | - if (! ($item['access']?? true)) return; |
|
45 | + if (!($item['access']?? true)) return; |
|
46 | 46 | |
47 | 47 | if (!isset($item['link']) && !is_array($item)) { |
48 | 48 | $item = [ |
@@ -42,7 +42,9 @@ discard block |
||
42 | 42 | |
43 | 43 | return $weight1 <=> $weight2; |
44 | 44 | })->map(function($item, $caption) use ($menu) { |
45 | - if (! ($item['access']?? true)) return; |
|
45 | + if (! ($item['access']?? true)) { |
|
46 | + return; |
|
47 | + } |
|
46 | 48 | |
47 | 49 | if (!isset($item['link']) && !is_array($item)) { |
48 | 50 | $item = [ |
@@ -60,8 +62,7 @@ discard block |
||
60 | 62 | $submenu = $menu->addMenu($item['caption']); |
61 | 63 | |
62 | 64 | self::addItems($submenu, collect($subitems)); |
63 | - } |
|
64 | - elseif ($subitems = $item['group']?? []) { |
|
65 | + } elseif ($subitems = $item['group']?? []) { |
|
65 | 66 | $subgroup = $menu->addGroup($item['caption']); |
66 | 67 | |
67 | 68 | if (($item['toggle']?? false) && !$menu->in_dropdown) { |
@@ -70,8 +71,7 @@ discard block |
||
70 | 71 | } |
71 | 72 | |
72 | 73 | self::addItems($subgroup, collect($subitems)); |
73 | - } |
|
74 | - elseif ($subitems = $item['accordion']?? []) { |
|
74 | + } elseif ($subitems = $item['accordion']?? []) { |
|
75 | 75 | $accordion = $menu->add(['Accordion']); |
76 | 76 | |
77 | 77 | $section = $accordion->addSection($item['caption']); |
@@ -94,12 +94,10 @@ discard block |
||
94 | 94 | } |
95 | 95 | } |
96 | 96 | // self::addItems($accordion, collect($subitems)); |
97 | - } |
|
98 | - else { |
|
97 | + } else { |
|
99 | 98 | if (is_a($menu, Accordion::class)) { |
100 | 99 | $menu->add(['View', 'Test']); |
101 | - } |
|
102 | - else { |
|
100 | + } else { |
|
103 | 101 | $menu->addItem($item['caption'], $item['link']?? ''); |
104 | 102 | } |
105 | 103 |
@@ -30,36 +30,36 @@ discard block |
||
30 | 30 | */ |
31 | 31 | class LayoutView extends ModuleView |
32 | 32 | { |
33 | - public $menuLeft; // vertical menu |
|
34 | - public $menu; // horizontal menu |
|
35 | - public $menuRight; // vertical pull-down |
|
36 | - public $actionBar; |
|
37 | - public $locationBar; |
|
33 | + public $menuLeft; // vertical menu |
|
34 | + public $menu; // horizontal menu |
|
35 | + public $menuRight; // vertical pull-down |
|
36 | + public $actionBar; |
|
37 | + public $locationBar; |
|
38 | 38 | |
39 | - public $burger = true; // burger menu item |
|
39 | + public $burger = true; // burger menu item |
|
40 | 40 | |
41 | - /* |
|
41 | + /* |
|
42 | 42 | * Whether or not left Menu is visible on Page load. |
43 | 43 | */ |
44 | - public $isMenuLeftVisible = true; |
|
44 | + public $isMenuLeftVisible = true; |
|
45 | 45 | |
46 | - public $defaultTemplate = 'layout/admin.html'; |
|
46 | + public $defaultTemplate = 'layout/admin.html'; |
|
47 | 47 | |
48 | - protected $location; |
|
48 | + protected $location; |
|
49 | 49 | |
50 | - public function init() |
|
51 | - { |
|
52 | - parent::init(); |
|
50 | + public function init() |
|
51 | + { |
|
52 | + parent::init(); |
|
53 | 53 | |
54 | - $this->setMenu(); |
|
55 | - $this->setActionBar(); |
|
54 | + $this->setMenu(); |
|
55 | + $this->setActionBar(); |
|
56 | 56 | |
57 | 57 | // if (request()->pjax()) return; |
58 | 58 | |
59 | - $this->setMenuLeft(); |
|
60 | - $this->setMenuRight(); |
|
59 | + $this->setMenuLeft(); |
|
60 | + $this->setMenuRight(); |
|
61 | 61 | |
62 | - $this->setVersion(); |
|
62 | + $this->setVersion(); |
|
63 | 63 | |
64 | 64 | // $this->js(true, null, 'body')->niceScroll(); |
65 | 65 | // $this->js(true, null, new jsExpression('window'))->on('pageshow', new jsFunction(['event'], [ |
@@ -67,24 +67,24 @@ discard block |
||
67 | 67 | // if (event.originalEvent.persisted) { |
68 | 68 | // window.location.reload(); |
69 | 69 | // }')])); |
70 | - } |
|
70 | + } |
|
71 | 71 | |
72 | - public function setMenu() |
|
73 | - { |
|
74 | - if ($this->menu) return; |
|
72 | + public function setMenu() |
|
73 | + { |
|
74 | + if ($this->menu) return; |
|
75 | 75 | |
76 | - //.ui.sidebar, |
|
77 | - $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu'); |
|
76 | + //.ui.sidebar, |
|
77 | + $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu'); |
|
78 | 78 | |
79 | - $this->app->addStyle(''); |
|
79 | + $this->app->addStyle(''); |
|
80 | 80 | |
81 | - // company logo |
|
82 | - $this->menu->add(['class' => ['epesi-logo']])->add(['Image', url('img/tsm_logo_agile.png')]); |
|
81 | + // company logo |
|
82 | + $this->menu->add(['class' => ['epesi-logo']])->add(['Image', url('img/tsm_logo_agile.png')]); |
|
83 | 83 | |
84 | - if ($this->burger) { |
|
85 | - /** @scrutinizer ignore-call */ |
|
86 | - $this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]); |
|
87 | - } |
|
84 | + if ($this->burger) { |
|
85 | + /** @scrutinizer ignore-call */ |
|
86 | + $this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]); |
|
87 | + } |
|
88 | 88 | |
89 | 89 | // home icon |
90 | 90 | $this->menu->addItem(['class' => ['icon epesi-home']], url('view/dashboard'))->add(['Icon', 'home']); |
@@ -126,50 +126,50 @@ discard block |
||
126 | 126 | ]), 'RightMenu')->addClass('right menu')->removeClass('item'); |
127 | 127 | } |
128 | 128 | |
129 | - public function setMenuLeft() |
|
130 | - { |
|
131 | - if ($this->menuLeft) return; |
|
129 | + public function setMenuLeft() |
|
130 | + { |
|
131 | + if ($this->menuLeft) return; |
|
132 | 132 | |
133 | - $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
|
133 | + $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
|
134 | 134 | |
135 | - if (! $this->burger) return; |
|
135 | + if (! $this->burger) return; |
|
136 | 136 | |
137 | - if (! session()->get('menu', 1)) { |
|
138 | - $this->isMenuLeftVisible = false; |
|
139 | - } |
|
137 | + if (! session()->get('menu', 1)) { |
|
138 | + $this->isMenuLeftVisible = false; |
|
139 | + } |
|
140 | 140 | |
141 | - $this->burger->add(['Icon', 'content'])->on('click', [ |
|
142 | - (new jQuery('.ui.left.sidebar'))->toggleClass('visible'), |
|
143 | - (new jQuery('.epesi-logo'))->toggleClass('expanded'), |
|
144 | - (new jQuery('body'))->toggleClass('atk-leftMenu-visible'), |
|
145 | - $this->burger->add('jsCallback')->set(function($j, $visible) { |
|
146 | - session()->put('menu', $visible? 1: 0); |
|
147 | - session()->save(); |
|
148 | - }, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )]) |
|
149 | - ]); |
|
150 | - } |
|
141 | + $this->burger->add(['Icon', 'content'])->on('click', [ |
|
142 | + (new jQuery('.ui.left.sidebar'))->toggleClass('visible'), |
|
143 | + (new jQuery('.epesi-logo'))->toggleClass('expanded'), |
|
144 | + (new jQuery('body'))->toggleClass('atk-leftMenu-visible'), |
|
145 | + $this->burger->add('jsCallback')->set(function($j, $visible) { |
|
146 | + session()->put('menu', $visible? 1: 0); |
|
147 | + session()->save(); |
|
148 | + }, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )]) |
|
149 | + ]); |
|
150 | + } |
|
151 | 151 | |
152 | - public function setActionBar() |
|
153 | - { |
|
154 | - if ($this->actionBar) return; |
|
152 | + public function setActionBar() |
|
153 | + { |
|
154 | + if ($this->actionBar) return; |
|
155 | 155 | |
156 | - $this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar'); |
|
157 | - } |
|
156 | + $this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar'); |
|
157 | + } |
|
158 | 158 | |
159 | - public function setVersion() |
|
160 | - { |
|
161 | - $this->template->trySet('version', $this->app->version); |
|
162 | - } |
|
159 | + public function setVersion() |
|
160 | + { |
|
161 | + $this->template->trySet('version', $this->app->version); |
|
162 | + } |
|
163 | 163 | |
164 | - /** |
|
165 | - * {@inheritdoc} |
|
166 | - */ |
|
164 | + /** |
|
165 | + * {@inheritdoc} |
|
166 | + */ |
|
167 | 167 | |
168 | - public function renderView() |
|
169 | - { |
|
170 | - if ($this->menuLeft && $this->isMenuLeftVisible) { |
|
171 | - $this->menuLeft->addClass('visible'); |
|
172 | - } |
|
173 | - parent::renderView(); |
|
174 | - } |
|
168 | + public function renderView() |
|
169 | + { |
|
170 | + if ($this->menuLeft && $this->isMenuLeftVisible) { |
|
171 | + $this->menuLeft->addClass('visible'); |
|
172 | + } |
|
173 | + parent::renderView(); |
|
174 | + } |
|
175 | 175 | } |
@@ -30,13 +30,13 @@ discard block |
||
30 | 30 | */ |
31 | 31 | class LayoutView extends ModuleView |
32 | 32 | { |
33 | - public $menuLeft; // vertical menu |
|
34 | - public $menu; // horizontal menu |
|
35 | - public $menuRight; // vertical pull-down |
|
33 | + public $menuLeft; // vertical menu |
|
34 | + public $menu; // horizontal menu |
|
35 | + public $menuRight; // vertical pull-down |
|
36 | 36 | public $actionBar; |
37 | 37 | public $locationBar; |
38 | 38 | |
39 | - public $burger = true; // burger menu item |
|
39 | + public $burger = true; // burger menu item |
|
40 | 40 | |
41 | 41 | /* |
42 | 42 | * Whether or not left Menu is visible on Page load. |
@@ -87,10 +87,10 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | // home icon |
90 | - $this->menu->addItem(['class' => ['icon epesi-home']], url('view/dashboard'))->add(['Icon', 'home']); |
|
90 | + $this->menu->addItem(['class' => ['icon epesi-home']], url('view/dashboard'))->add(['Icon', 'home']); |
|
91 | 91 | |
92 | 92 | // location bar |
93 | - $this->locationBar = $this->menu->add(['View', ['ui' => 'epesi-location']]); |
|
93 | + $this->locationBar = $this->menu->add(['View', ['ui' => 'epesi-location']]); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | public function setLocation($crumbs) |
@@ -132,20 +132,20 @@ discard block |
||
132 | 132 | |
133 | 133 | $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
134 | 134 | |
135 | - if (! $this->burger) return; |
|
135 | + if (!$this->burger) return; |
|
136 | 136 | |
137 | - if (! session()->get('menu', 1)) { |
|
137 | + if (!session()->get('menu', 1)) { |
|
138 | 138 | $this->isMenuLeftVisible = false; |
139 | 139 | } |
140 | 140 | |
141 | - $this->burger->add(['Icon', 'content'])->on('click', [ |
|
141 | + $this->burger->add(['Icon', 'content'])->on('click', [ |
|
142 | 142 | (new jQuery('.ui.left.sidebar'))->toggleClass('visible'), |
143 | 143 | (new jQuery('.epesi-logo'))->toggleClass('expanded'), |
144 | 144 | (new jQuery('body'))->toggleClass('atk-leftMenu-visible'), |
145 | 145 | $this->burger->add('jsCallback')->set(function($j, $visible) { |
146 | - session()->put('menu', $visible? 1: 0); |
|
146 | + session()->put('menu', $visible ? 1 : 0); |
|
147 | 147 | session()->save(); |
148 | - }, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )]) |
|
148 | + }, [new \atk4\ui\jsExpression('$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0')]) |
|
149 | 149 | ]); |
150 | 150 | } |
151 | 151 |
@@ -71,7 +71,9 @@ discard block |
||
71 | 71 | |
72 | 72 | public function setMenu() |
73 | 73 | { |
74 | - if ($this->menu) return; |
|
74 | + if ($this->menu) { |
|
75 | + return; |
|
76 | + } |
|
75 | 77 | |
76 | 78 | //.ui.sidebar, |
77 | 79 | $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu'); |
@@ -119,7 +121,9 @@ discard block |
||
119 | 121 | |
120 | 122 | public function setMenuRight() |
121 | 123 | { |
122 | - if ($this->menuRight) return; |
|
124 | + if ($this->menuRight) { |
|
125 | + return; |
|
126 | + } |
|
123 | 127 | |
124 | 128 | $this->menuRight = $this->menu->add(new Seeds\RightMenu([ |
125 | 129 | 'ui' => false |
@@ -128,11 +132,15 @@ discard block |
||
128 | 132 | |
129 | 133 | public function setMenuLeft() |
130 | 134 | { |
131 | - if ($this->menuLeft) return; |
|
135 | + if ($this->menuLeft) { |
|
136 | + return; |
|
137 | + } |
|
132 | 138 | |
133 | 139 | $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
134 | 140 | |
135 | - if (! $this->burger) return; |
|
141 | + if (! $this->burger) { |
|
142 | + return; |
|
143 | + } |
|
136 | 144 | |
137 | 145 | if (! session()->get('menu', 1)) { |
138 | 146 | $this->isMenuLeftVisible = false; |
@@ -151,7 +159,9 @@ discard block |
||
151 | 159 | |
152 | 160 | public function setActionBar() |
153 | 161 | { |
154 | - if ($this->actionBar) return; |
|
162 | + if ($this->actionBar) { |
|
163 | + return; |
|
164 | + } |
|
155 | 165 | |
156 | 166 | $this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar'); |
157 | 167 | } |