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

Merge branch 'dev' into binarity.cz

Browse Source
This commit is contained in:
Michal Kváček
2016-10-03 01:40:09 +02:00
parent f3e797a59a aca3c778e0
commit 232e1d5ec9
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Widgets/Menu/Presenters/Menu.php
+6 -9
View File
@@ -5,10 +5,10 @@ use App\Models\Content;
use App\Models\Widget; use App\Models\Widget;
use App\Models\WidgetType; use App\Models\WidgetType;
use App\Widgets\Contracts\WidgetRenderer; use App\Widgets\Contracts\WidgetRenderer;
use App\Widgets\Menu\Menu as WidgetMenu;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
class Menu implements WidgetRenderer class Menu implements WidgetRenderer
{ {
@@ -24,11 +24,10 @@ class Menu implements WidgetRenderer
public static function render($settings) public static function render($settings)
{ {
$links = (array)$settings->links; $links = (array)$settings->links;
$pageIds = array_keys($links); $pageIds = array_keys($links);
// get pages // get pages
$pages = \App\Widgets\Menu\Menu::selectContentPages($pageIds); $pages = WidgetMenu::selectContentPages($pageIds);
// sort links using "order" // sort links using "order"
uasort($links, function ($a, $b) { uasort($links, function ($a, $b) {
@@ -46,18 +45,16 @@ class Menu implements WidgetRenderer
if (!isset($pages[$pageId])) { if (!isset($pages[$pageId])) {
continue; continue;
} }
$page = $pages[$pageId];
$active = false; $page = $pages[$pageId];
if (($page->is_homepage && $route == 'page.index') || ($route == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url)) { $active = ($page->is_homepage && $route == 'page.index') || ($route == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url);
$active = true; $route = $page->is_homepage ? route('page.index') : route('page.content', ['url' => $page->url]);
}
$code .= '<li'; $code .= '<li';
if ($active) { if ($active) {
$code .= ' class="is-active active"'; $code .= ' class="is-active active"';
} }
$code .= '><a href="' . route('page.content', ['url' => $page->url]) . '">' . e($page->title) . '</a></li>'; $code .= '><a href="' . $route . '">' . e($page->title) . '</a></li>';
} }
$code .= "</ul>"; $code .= "</ul>";
resources/views/admin/templates/templatesTiles.blade.php
+2 -2
View File
@@ -1,10 +1,10 @@
<div class="tile-overview"> <div class="tile-overview sameheight-container">
@forelse($templates as $template) @forelse($templates as $template)
<div class="col-lg-3"> <div class="col-lg-3">
<div class="text-center bold" data-toggle="tooltip" title="{{$template->name}}"> <div class="text-center bold" data-toggle="tooltip" title="{{$template->name}}">
{{str_limit($template->name, 15)}} {{str_limit($template->name, 15)}}
</div> </div>
<div class="text-center"> <div class="text-center sameheight-item">
{{str_limit($template->description, 150)}} {{str_limit($template->description, 150)}}
</div> </div>