Merge branch 'dev' into test.customwristbands.cz

This commit is contained in:
Michal Kváček
2016-04-06 20:19:27 +02:00
11 changed files with 194 additions and 112 deletions
@@ -15,8 +15,8 @@
<li class="accordion-item" data-accordion-item>
<a class="accordion-title">
<img src="{{\App\Helpers\Gravatar::img($action->email, 20)}}" alt="{{$action->email}}" />
{{date('d.m.Y', strtotime($action->created_at))}} |
<strong>{{$action->name}}</strong>
{{date('d.m.Y', strtotime($action->created_at))}}
</a>
<div class="accordion-content" data-tab-content>
<div class="row">
@@ -1,67 +1,83 @@
<div class="row" id="static-page-overview" data-equalizer data-equalize-by-row="true">
@forelse($pages as $page)
<div class="columns @if(!isset($tileClass)) large-3 @else {{$tileClass}} @endif">
<div class="page callout" data-equalizer-watch>
@if ($page->title_photo)
<img src="{{config('app.upload_url')}}/{{$page->title_photo}}" alt="" />
@endif
@forelse($pages as $page)
<div class="page callout page {{$page->status}} row">
<div class="row column">
@if ($page->parent_id && $page->parent_url)
<span class="parent">
@lang('admin/contents.parentPage'):
<a href="{{route('content.edit', ['id' => $page->parent_id])}}">{{$page->parent_title}}</a>,
</span>
@endif
<h4>{{$page->title}}</h4>
<span class="date">{{date('d.m.Y', strtotime($page->created_at))}}</span>
<span class="author">{{$page->author_name}}</span>
<br />
<span class="moduleName">@lang($page->module_name)</span>
<span class="author">{{$page->author_name}}</span>,
<span class="date">{{date('d.m.Y', strtotime($page->created_at))}}</span>
<p class="perex">
@if (trim($page->meta_description))
{{str_limit($page->meta_description)}}
@else
{{str_limit(strip_tags($page->content))}}
@endif
</p>
@if ($page->meta_keywords)
<p class="keywords">{{$page->meta_keywords}}</p>
@endif
<p class="controls row text-center">
@if($page->is_homepage)
<a class="button tiny disabled"><i class="fa fa-home"></i></a>
@else
<a href="{{route('content.setHomepage', ['id' => $page->id])}}"
class="button tiny success has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.setHomepage', ['name' => $page->title])"><i
class="fa fa-home"></i></a>
@endif
<a href="{{route('content.edit', ['id' => $page->id])}}" class="button tiny success has-tip"
data-tooltip aria-haspopup="true"
title="@lang('admin/contents.edit', ['name' => $page->title])"><i class="fa fa-edit"></i></a>
@if($page->status == \App\Models\Content::STATUS_DRAFT)
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}"
class="button tiny success confirm has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.makePublic')"><i class="fa fa-eye"></i></a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}"
class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.makeProtected')"><i class="fa fa-lock"></i></a>
@else
<a href="{{route('page.content', ['url' => $page->url])}}" target="_blank"
class="button tiny secondary has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.viewPage')"><i class="fa fa-desktop"></i></a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}"
class="button tiny warning confirm has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.makeDraft')"><i class="fa fa-eye-slash"></i></a>
@endif
<a href="{{route('content.delete', ['id' => $page->id])}}"
class="button tiny alert confirm has-tip" data-tooltip aria-haspopup="true"
title="@lang('admin/contents.deletePage')"><i class="fa fa-remove"></i></a>
</p>
</div>
</div>
@empty
<em>@lang('admin/contents.noPagesAvailable')</em>
@endforelse
</div>
<div class="column large-1">
@if ($page->title_photo)
<a href="{{route('content.edit', ['id' => $page->id])}}">
<img src="@upload($page->title_photo)" class="float-left" alt="" />
</a>
@endif
</div>
<div class="column large-8">
<h4>
<a href="{{route('content.edit', ['id' => $page->id])}}">
{{$page->title}}
<small>(@lang($page->module_name))</small>
</a>
</h4>
<p class="perex">
@if (trim($page->meta_description))
{{str_limit($page->meta_description)}}
@else
{{str_limit(strip_tags($page->content))}}
@endif
</p>
</div>
<div class="controls column float-right large-3">
@if($page->is_homepage)
<a class="button tiny disabled">
<i class="fa fa-home"></i>
@lang('admin/contents.alreadyHomepage')
</a>
@else
<a href="{{route('content.setHomepage', ['id' => $page->id])}}"
class="button tiny success">
<i class="fa fa-home"></i>
@lang('admin/contents.setHomepage')
</a>
@endif
<a href="{{route('content.edit', ['id' => $page->id])}}" class="button tiny success">
<i class="fa fa-edit"></i>
@lang('admin/contents.edit', ['name' => $page->title])
</a>
@if($page->status == \App\Models\Content::STATUS_DRAFT)
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PUBLIC])}}"
class="button tiny success confirm">
<i class="fa fa-eye"></i> @lang('admin/contents.makePublic')</a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_PROTECTED])}}"
class="button tiny warning confirm">
<i class="fa fa-lock"></i> @lang('admin/contents.makeProtected')</a>
@else
<a href="{{route('page.content', ['url' => $page->url])}}" target="_blank"
class="button tiny secondary"><i
class="fa fa-desktop"></i> @lang('admin/contents.viewPage')</a>
<a href="{{route('content.changeStatus', ['id' => $page->id, 'status' => \App\Models\Content::STATUS_DRAFT])}}"
class="button tiny warning confirm"><i
class="fa fa-eye-slash"></i> @lang('admin/contents.makeDraft')</a>
@endif
<a href="{{route('content.delete', ['id' => $page->id])}}"
class="button tiny alert confirm"><i
class="fa fa-remove"></i> @lang('admin/contents.deletePage')</a>
</div>
</div>
@empty
<em>@lang('admin/contents.noPagesAvailable')</em>
@endforelse
@@ -0,0 +1,29 @@
<label>
@lang('admin/settings.social.facebook')
<input type="text" name="facebookProfile" value="{{old('facebookProfile', isset($settings->facebookProfile) ? $settings->facebookProfile : '')}}" />
</label>
<label>
@lang('admin/settings.social.twitter')
<input type="text" name="twitterProfile" value="{{old('twitterProfile', isset($settings->twitterProfile) ? $settings->twitterProfile : '')}}" />
</label>
<label>
@lang('admin/settings.social.pinterest')
<input type="text" name="pinterestProfile" value="{{old('pinterestProfile', isset($settings->pinterestProfile) ? $settings->pinterestProfile : '')}}" />
</label>
<label>
@lang('admin/settings.social.gplus')
<input type="text" name="gplusProfile" value="{{old('gplusProfile', isset($settings->gplusProfile) ? $settings->gplusProfile : '')}}" />
</label>
<label>
@lang('admin/settings.social.instagram')
<input type="text" name="instagramProfile" value="{{old('instagramProfile', isset($settings->instagramProfile) ? $settings->instagramProfile : '')}}" />
</label>