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

FIX: fix homepage settings for one-page template when no template is set

Browse Source
This commit is contained in:
Michal Kváček
2016-09-24 03:23:35 +02:00
parent 55ef5e4af1
commit 939610cf9d
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/Base/OnePage/Resources/lang/en/admin/setHomepage.php
+2 -1
View File
@@ -10,6 +10,7 @@ return [
'usedPages' => 'Used pages', 'usedPages' => 'Used pages',
'notUsedPages' => 'Not used pages', 'notUsedPages' => 'Not used pages',
'reallyRemovePage' => 'Do you really want to remove this page from homepage?', 'reallyRemovePage' => 'Do you really want to remove this page from homepage?',
'cannotSetHomepageAsPartOfHomepage' => 'Cannot set currently set homepage as one of homepage pages.' 'cannotSetHomepageAsPartOfHomepage' => 'Cannot set currently set homepage as one of homepage pages.',
'noHomepageSet' => 'No homepage set, following settings will not take effect!'
]; ];
templates/Base/OnePage/Resources/views/admin/homepage/set.blade.php
+13 -9
View File
@@ -12,15 +12,19 @@ Improvement: http://www.html5rocks.com/en/tutorials/dnd/basics/
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-8">
@include('admin.snippets.card', [ @if(isset($homepage))
'type' => 'primary', @include('admin.snippets.card', [
'title' => $homepage->title, 'type' => 'primary',
'body' => ' 'title' => $homepage->title,
<p><small>'.trans($homepage->module_name).'</small></p> 'body' => '
<p>'.str_limit(strip_tags($homepage->content), 200).'</p>', <p><small>'.trans($homepage->module_name).'</small></p>
'footerClass' => 'text-right', <p>'.str_limit(strip_tags($homepage->content), 200).'</p>',
'footer' => '<a href="'.route('content.edit', ['id' => $homepage->id]).'" class="btn btn-secondary btn-sm"><i class="fa fa-fw fa-pencil"></i></a>' '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>'
])
@else
<div class="alert alert-warning">@lang('template::admin/setHomepage.noHomepageSet')</div>
@endif
<h3>@lang('template::admin/setHomepage.usedPages')</h3> <h3>@lang('template::admin/setHomepage.usedPages')</h3>