Merge branch 'dev' into template_support

This commit is contained in:
Michal Kváček
2016-09-24 23:00:44 +02:00
29 changed files with 413 additions and 86 deletions
@@ -11,14 +11,11 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
<div class="row">
<div class="col-lg-8">
@if(isset($homepage))
@include('admin.snippets.card', [
'type' => 'primary',
'title' => $homepage->title,
'body' => '
<p><small>'.trans($homepage->module_name).'</small></p>
<p>'.str_limit(strip_tags($homepage->content), 200).'</p>',
'title' => $homepage->title.' <small>'.trans($homepage->module_name).'</small>',
'body' => '<p>'.str_limit(strip_tags($homepage->content), 200).'</p>',
'footerClass' => 'text-right',
'footer' => '<a href="'.route('content.edit', ['id' => $homepage->id]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>'
])
@@ -37,10 +34,8 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
@include('admin.snippets.card', [
'title' => $allPages[$pageId]->title,
'body' => '
<p><small>'.trans($allPages[$pageId]->module_name).'</small></p>
<p>'.str_limit(strip_tags($allPages[$pageId]->content), 200).'</p>',
'title' => $allPages[$pageId]->title.' <small>'.trans($allPages[$pageId]->module_name).'</small>',
'body' => '<p>'.str_limit(strip_tags($allPages[$pageId]->content), 200).'</p>',
'footerClass' => 'text-right',
'footer' => '
<a href="'.route('content.edit', ['id' => $allPages[$pageId]->id]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>
@@ -59,21 +54,29 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
<div class="card card-default">
<div class="card-header">
<div class="header-block">
<p class="title">{{$page->title}}</p>
<p class="title">{{$page->title}}
<small>@lang($page->module_name)</small>
</p>
</div>
</div>
<div class="card-block">
<p>
<small>(@lang($page->module_name))</small>
</p>
<p>{{str_limit(strip_tags($page->content), 100)}}</p>
{{str_limit(strip_tags($page->content), 100)}}
</div>
<div class="card-footer text-right">
<a href="{{route('content.edit', ['id' => $page->id])}}"
class="btn btn-secondary btn-sm"><i
class="fa fa-fw fa-pencil"></i></a>
@if(!$page->is_homepage)
<a href="{{route('content.setHomepage', ['id' => $page->id])}}"
class="btn btn-secondary confirm btn-sm"
data-toggle="tooltip" title="@lang('admin/contents.setHomepage')">
<i class="fa fa-home"></i>
</a>
@endif
<a href="{{route('template.homepage.addPage', ['id' => $page->id])}}"
class="btn btn-sm btn-primary"><i class="fa green fa-fw fa-plus"></i></a>
class="btn btn-sm btn-primary" data-toggle="tooltip"
title="@lang('template::admin/setHomepage.addToHomepage')"><i
class="fa green fa-fw fa-plus"></i></a>
</div>
</div>
@empty