Skip to content

Commit 633283e

Browse files
stygiansabyssstygiansabyss
committed
Updating core to use new menu package
1 parent f3e9c39 commit 633283e

File tree

10 files changed

+82
-270
lines changed

10 files changed

+82
-270
lines changed

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"intervention/image": "*",
2323
"knplabs/github-api": "*",
2424
"mccool/laravel-auto-presenter": "*",
25-
"anlutro/curl": "dev-master"
25+
"anlutro/curl": "dev-master",
26+
"vespakoen/menu": "dev-master"
2627
},
2728
"autoload": {
2829
"classmap": [

‎public/css/menu.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ Version: 1.0
3636
float: left;
3737
}
3838

39-
#utopian-navigation li:last-of-type {
40-
float: right;
41-
}
42-
4339
#utopian-navigation li ul {
4440
background: #666666;
4541
background: -moz-radial-gradient(80% 0% 0deg, circle cover, #787878, #666666, #666666 90%);

‎src/controllers/Core_BaseController.php

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function __construct()
3838

3939
// Set up the menu
4040
$this->getMenu();
41-
CoreView::setMenu(Menu::get());
41+
$this->setMenu();
4242
}
4343

4444
public function setGithubClient()
@@ -56,6 +56,58 @@ public function setGithubClient()
5656
$this->github = $github;
5757
}
5858

59+
public function setMenu()
60+
{
61+
// Handle the different menus
62+
$siteMenu = isset($this->activeUser) ? $this->activeUser->getPreferenceValueByKeyName('SITE_MENU') : Config::get('core::menu');
63+
64+
if (CoreView::get()->mobile == true || $siteMenu == 'twitter') {
65+
// Set the menu to twitter's style
66+
Menu::handler('main')->addClass('nav navbar-nav');
67+
Menu::handler('mainRight')->addClass('nav navbar-nav navbar-right');
68+
69+
// Handle children
70+
Menu::handler('main')->getItemsByContentType('Menu\Items\Contents\Link')
71+
->map(function($item) {
72+
if ($item->hasChildren()) {
73+
$item->getContent()->addClass('dropdown-toggle')->dataToggle('dropdown');
74+
$item->getContent()->value($item->getContent()->getValue() .' <b class="caret"></b>');
75+
$item->getChildren()->addClass('dropdown-menu');
76+
}
77+
});
78+
Menu::handler('mainRight')->getItemsByContentType('Menu\Items\Contents\Link')
79+
->map(function($item) {
80+
if ($item->hasChildren()) {
81+
$item->getContent()->addClass('dropdown-toggle')->dataToggle('dropdown');
82+
$item->getContent()->value($item->getContent()->getValue() .' <b class="caret"></b>');
83+
$item->getChildren()->addClass('dropdown-menu');
84+
}
85+
});
86+
87+
CoreView::setMenu('twitter');
88+
} elseif ($siteMenu == 'utopian') {
89+
// Set the menu to utopian's style
90+
Menu::handler('main')->id('utopian-navigation')->addClass('black utopian');
91+
Menu::handler('mainRight')->id('utopian-navigation')->addClass('black utopian');
92+
93+
// Handle children
94+
Menu::handler('main')->getItemsByContentType('Menu\Items\Contents\Link')
95+
->map(function($item) {
96+
if ($item->hasChildren()) {
97+
$item->addClass('dropdown');
98+
}
99+
});
100+
Menu::handler('mainRight')->getItemsByContentType('Menu\Items\Contents\Link')
101+
->map(function($item) {
102+
if ($item->hasChildren()) {
103+
$item->addClass('dropdown');
104+
}
105+
});
106+
107+
CoreView::setMenu('utopian');
108+
}
109+
}
110+
59111
/********************************************************************
60112
* Templating
61113
*******************************************************************/

‎src/services/Utility/AliasServiceProvider.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public function register()
1515
'HTML' => 'Syntax\Core\HTML',
1616
'View' => 'Syntax\Core\View\ViewFacade',
1717
'ForumPost' => 'Syntax\Core\Forum\Facades\ForumPost',
18-
'Menu' => 'Syntax\Core\Utility\Facades\Menu',
1918
'Mobile' => 'Syntax\Core\Utility\Facades\Mobile',
2019
'CoreView' => 'Syntax\Core\Utility\Facades\CoreView',
2120
'CoreImage' => 'Syntax\Core\Utility\Facades\CoreImage',

‎src/services/Utility/Facades/Menu.php

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/services/Utility/Menu.php

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎src/services/Utility/UtilityServiceProvider.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ public function register()
1414
// Main utilities
1515
$this->registerMobile();
1616

17-
$this->registerMenu();
18-
1917
$this->registerImage();
2018

2119
// View utilities
@@ -52,19 +50,6 @@ protected function registerMobile()
5250
});
5351
}
5452

55-
/**
56-
* Register the Menu instance.
57-
*
58-
* @return void
59-
*/
60-
protected function registerMenu()
61-
{
62-
$this->app->bindShared('menu', function($app)
63-
{
64-
return new Menu();
65-
});
66-
}
67-
6853
/**
6954
* Register the Image instance.
7055
*

‎src/views/layouts/default.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<body class="app">
3232
<div id="container">
3333
<div id="header">
34-
@if ($mobile == false)
35-
@include('layouts.menu.'. (isset($activeUser) ? $activeUser->getPreferenceValueByKeyName('SITE_MENU') : Config::get('core::menu')) )
36-
@else
34+
@if ($menu == 'utopian')
35+
@include('layouts.menu.utopian')
36+
@elseif ($menu == 'twitter')
3737
@include('layouts.menu.twitter')
3838
@endif
3939
</div>

‎src/views/layouts/menu/twitter.blade.php

Lines changed: 9 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@if(count($menu->menu) > 0)
2-
<?php $rightSwitch = false; ?>
1+
@if(count(Menu::handler('main')->getItemsAtDepth(0)) > 0)
32
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
43
<div class="navbar-header">
54
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -9,68 +8,16 @@
98
<span class="icon-bar"></span>
109
</button>
1110
<a class="navbar-brand" href="javascript: void(0);">
12-
@if (Config::get('app.siteIcon') != null)
13-
<i class="fa fa-{{ Config::get('app.siteIcon') }}"></i>
11+
@if (Config::get('core::siteIcon') != null)
12+
<i class="fa fa-{{ Config::get('core::siteIcon') }}"></i>
1413
@endif
15-
{{ Config::get('app.siteName') }}
14+
{{ Config::get('core::siteName') }}
1615
</a>
1716
</div>
1817
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
19-
<ul class="nav navbar-nav">
20-
@foreach ($menu->menu as $item)
21-
<?php
22-
$class = array();
23-
$liClass = null;
24-
$style = null;
25-
if (count($item->children) > 0) {
26-
$class[] = 'dropdown ';
27-
}
28-
if ($item->link != null && (Request::is($item->link) || Request::segment(1) == $item->link)) {
29-
$class[] = 'active';
30-
}
31-
if (count($class) > 0) {
32-
$liClass = ' class="'. implode(' ', $class) .'"';
33-
}
34-
$item->link = (strlen($item->link) > 1 ? '/'. $item->link : $item->link);
35-
?>
36-
@if ($item->alignment == 'right' && $rightSwitch == false)
37-
</ul>
38-
<ul class="nav navbar-nav navbar-right">
39-
<?php $rightSwitch = true; ?>
40-
@endif
41-
@if (count($item->children) == 0)
42-
@if ($item->link != null)
43-
<li{{ $liClass }}>{{ HTML::linkImage($item->link, $item->title) }}</li>
44-
@else
45-
<li{{ $liClass }}><a href="javascript: void(0);">{{ $item->title }}</a></li>
46-
@endif
47-
@else
48-
<li{{ $liClass }}>
49-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ $item->title }} <b class="caret"></b></a>
50-
<ul class="dropdown-menu">
51-
@if ($item->link != null)
52-
<li>{{ HTML::linkImage($item->link, $item->title) }}</li>
53-
@endif
54-
@foreach ($item->children as $child)
55-
@if ($child->children->count() > 0)
56-
@if ($child->link != null)
57-
<li class="nav-header">{{ HTML::linkImage('/'. $child->link, $child->title) }}</li>
58-
@else
59-
<li class="nav-header"><a href="javascript: void(0);">{{ $child->title }}</a></li>
60-
@endif
61-
@foreach ($child->children as $subChild)
62-
<li>{{ HTML::linkImage('/'. $subChild->link, $subChild->title) }}</li>
63-
@endforeach
64-
@else
65-
<li>{{ HTML::linkImage('/'. $child->link, $child->title) }}</li>
66-
@endif
67-
@endforeach
68-
</ul>
69-
</li>
70-
@endif
71-
@endforeach
72-
</ul>
18+
{{ Menu::handler('main') }}
19+
{{ Menu::handler('mainRight') }}
7320
</div>
74-
</div>
75-
@endif
76-
<br style="clear: both;" />
21+
</nav>
22+
<br style="clear: both;" />
23+
@endif

0 commit comments

Comments
 (0)