minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FEATURE #1753: remove pingpong menus and install nwidart laravel-menus

Browse Source
This commit is contained in:
Michal Kváček
2017-07-31 15:46:24 +02:00
parent 5707750f5b
commit e9e9f0976c
8 changed files with 373 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMS/MenuPresenters/FoundationDrilldownMenuPresenter.php
+3 -2
View File
@@ -1,8 +1,9 @@
<?php <?php
namespace App\CMS\MenuPresenters; namespace App\CMS\MenuPresenters;
use Pingpong\Menus\MenuItem; use Nwidart\Menus\MenuItem;
use Pingpong\Menus\Presenters\Presenter; use Nwidart\Menus\Presenters\Presenter;
class FoundationDrilldownMenuPresenter extends Presenter class FoundationDrilldownMenuPresenter extends Presenter
{ {
app/CMS/MenuPresenters/FoundationDropdownMenuPresenter.php
+4 -3
View File
@@ -1,7 +1,8 @@
<?php <?php
namespace App\CMS\MenuPresenters; namespace App\CMS\MenuPresenters;
use Pingpong\Menus\Presenters\Presenter; use Nwidart\Menus\Presenters\Presenter;
class FoundationDropdownMenuPresenter extends Presenter class FoundationDropdownMenuPresenter extends Presenter
{ {
@@ -27,7 +28,7 @@ class FoundationDropdownMenuPresenter extends Presenter
public function getMenuWithoutDropdownWrapper($item) public function getMenuWithoutDropdownWrapper($item)
{ {
$link = '<a href="' . $item->getUrl() . '">' . $item->getIcon() . ' ' . $item->title . '</a>'; $link = '<a href="' . $item->getUrl() . '">' . $item->getIcon() . ' ' . $item->title . '</a>';
return '<li' . $this->getActiveState($item) . '>' . $link . '</li>'.PHP_EOL; return '<li' . $this->getActiveState($item) . '>' . $link . '</li>' . PHP_EOL;
} }
/** /**
@@ -43,7 +44,7 @@ class FoundationDropdownMenuPresenter extends Presenter
*/ */
public function getDividerWrapper() public function getDividerWrapper()
{ {
return '<li class="divider"></li>'.PHP_EOL; return '<li class="divider"></li>' . PHP_EOL;
} }
/** /**
app/CMS/MenuPresenters/MetismenuPresenter.php
+2 -2
View File
@@ -1,8 +1,8 @@
<?php <?php
namespace App\CMS\MenuPresenters; namespace App\CMS\MenuPresenters;
use Pingpong\Menus\MenuItem; use Nwidart\Menus\MenuItem;
use Pingpong\Menus\Presenters\Presenter; use Nwidart\Menus\Presenters\Presenter;
class MetismenuPresenter extends Presenter class MetismenuPresenter extends Presenter
{ {
app/CMS/MenuPresenters/ProfileMenuPresenter.php
+3 -2
View File
@@ -1,8 +1,9 @@
<?php <?php
namespace App\CMS\MenuPresenters; namespace App\CMS\MenuPresenters;
use Pingpong\Menus\MenuItem; use Nwidart\Menus\MenuItem;
use Pingpong\Menus\Presenters\Presenter; use Nwidart\Menus\Presenters\Presenter;
class ProfileMenuPresenter extends Presenter class ProfileMenuPresenter extends Presenter
{ {
app/Providers/AppServiceProvider.php
-1
View File
@@ -64,7 +64,6 @@ class AppServiceProvider extends ServiceProvider
} }
// register PingPong module extension // register PingPong module extension
$this->app->register(MenusServiceProvider::class);
$this->app->register(LaravelLocalizationServiceProvider::class); $this->app->register(LaravelLocalizationServiceProvider::class);
// create singletons for registering widgets // create singletons for registering widgets
composer.json
+3 -3
View File
@@ -8,14 +8,14 @@
"type": "project", "type": "project",
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.5.9",
"laravel/framework": "5.4.*", "laravel/framework": "5.2.*",
"pingpong/menus": "^2.2",
"watson/sitemap": "^2.0", "watson/sitemap": "^2.0",
"mcamara/laravel-localization": "^1.1", "mcamara/laravel-localization": "^1.1",
"franzose/closure-table": "^4.1", "franzose/closure-table": "^4.1",
"intervention/image": "^2.3", "intervention/image": "^2.3",
"webwizo/laravel-shortcodes": "1.0.4", "webwizo/laravel-shortcodes": "1.0.4",
"greggilbert/recaptcha": "^2.2@dev" "greggilbert/recaptcha": "^2.2@dev",
"nwidart/laravel-menus": "dev-master"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
composer.lock
Generated
+355 -954
View File
File diff suppressed because it is too large Load Diff
config/app.php
+3 -2
View File
@@ -155,7 +155,8 @@ return [
Illuminate\View\ViewServiceProvider::class, Illuminate\View\ViewServiceProvider::class,
Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class, Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class,
\App\ModuleManager\Providers\ModuleManager::class, \App\ModuleManager\Providers\ModuleManager::class,
Pingpong\Menus\MenusServiceProvider::class, \Nwidart\Menus\MenusServiceProvider::class,
// Pingpong\Menus\MenusServiceProvider::class,
Franzose\ClosureTable\ClosureTableServiceProvider::class, Franzose\ClosureTable\ClosureTableServiceProvider::class,
\Watson\Sitemap\SitemapServiceProvider::class, \Watson\Sitemap\SitemapServiceProvider::class,
Intervention\Image\ImageServiceProvider::class, Intervention\Image\ImageServiceProvider::class,
@@ -202,7 +203,7 @@ return [
'Lang' => Illuminate\Support\Facades\Lang::class, 'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class, 'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class, 'Mail' => Illuminate\Support\Facades\Mail::class,
'Menu' => Pingpong\Menus\MenuFacade::class, 'Menu' => Nwidart\Menus\Facades\Menu::class,
'Password' => Illuminate\Support\Facades\Password::class, 'Password' => Illuminate\Support\Facades\Password::class,
'Queue' => Illuminate\Support\Facades\Queue::class, 'Queue' => Illuminate\Support\Facades\Queue::class,
'Redirect' => Illuminate\Support\Facades\Redirect::class, 'Redirect' => Illuminate\Support\Facades\Redirect::class,