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

REFACTORING #1880 @4h30m: another ugly refactoring commit

Browse Source
This commit is contained in:
Michal Kváček
2016-10-25 16:50:04 +02:00
parent 28f67ffe3c
commit cc999dd24e
71 changed files with 827 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
+4 -4
View File
@@ -7,8 +7,8 @@
<div class="row article-list-item">
<aside class="column text-right large-1">
<div class="date">
<span class="date day big">@customDate('j', $page->published_from ?: $page->created_at)</span>
<span class="date uppercase month">@monthName($page->published_from ?: $page->created_at)</span>
<span class="date day big">@customDate('j', $page->publishedFrom ?: $page->created_at)</span>
<span class="date uppercase month">@monthName($page->publishedFrom ?: $page->created_at)</span>
</div>
<div class="m-t-25 author">
<img class="gravatar" src="@gravatar($page->author->email, 50)" alt="">
@@ -22,7 +22,7 @@
@endif
@if(isset($page->module_settings->allowComments) && $page->module_settings->allowComments != 0)
@if(isset($page->moduleSettings->allowComments) && $page->moduleSettings->allowComments != 0)
<div class="m-t-35">
<a href="#comments">{{$page->comments->count()}} <i class="fa fa-comments"></i></a>
</div>
@@ -36,7 +36,7 @@
</article>
</div>
</div>
@if(isset($page->module_settings->allowComments) && $page->module_settings->allowComments != 0)
@if(isset($page->moduleSettings->allowComments) && $page->moduleSettings->allowComments != 0)
<div class="row m-t-50">
<a name="comments"></a>
templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php
+3 -3
View File
@@ -14,9 +14,9 @@
<div class="row">
<aside class="column text-right large-3">
<div class="date">
<span class="date day big">@customDate('j', $article->published_from ?: $article->created_at)</span>
<span class="date day big">@customDate('j', $article->publishedFrom ?: $article->created_at)</span>
<br>
<span class="date uppercase month">@monthName($article->published_from ?: $article->created_at)</span>
<span class="date uppercase month">@monthName($article->publishedFrom ?: $article->created_at)</span>
</div>
<div class="m-t-15 author">
{{--<small>{{str_limit($article->author->name, 15)}}</small>--}}
@@ -37,7 +37,7 @@
<a href="{{route('page.content', ['url' => $article->url])}}">více</a>
</article>
@if(isset($article->module_settings->allowComments) && $article->module_settings->allowComments != 0 || $article->category)
@if(isset($article->moduleSettings->allowComments) && $article->moduleSettings->allowComments != 0 || $article->category)
<footer class="text-right">
@if($article->category)
templates/Binarity/Resources/views/modules/contactform/visitor/default.blade.php
+5 -5
View File
@@ -18,7 +18,7 @@
@if(session('error'))
<div class="callout alert">
Zprávu bohužel nebylo možné odeslat, zkuste nám napsat na {{$page->module_settings->contactEmail}}.
Zprávu bohužel nebylo možné odeslat, zkuste nám napsat na {{$page->moduleSettings->contactEmail}}.
</div>
@endif
@@ -45,15 +45,15 @@
</div>
<div class="small-8 column">
<p><strong>{{$page->module_settings->companyName}}</strong></p>
<p><strong>{{$page->moduleSettings->companyName}}</strong></p>
<p>
{!! nl2br($page->module_settings->address) !!}
{!! nl2br($page->moduleSettings->address) !!}
</p>
<p><br></p>
<p><a class="underline"
href="mailto:{{$page->module_settings->email}}">{{$page->module_settings->email}}</a></p>
href="mailto:{{$page->moduleSettings->email}}">{{$page->moduleSettings->email}}</a></p>
<p><a class="thin"
href="tel:{{str_replace(' ', '', $page->module_settings->phone)}}">{{$page->module_settings->phone}}</a>
href="tel:{{str_replace(' ', '', $page->moduleSettings->phone)}}">{{$page->moduleSettings->phone}}</a>
</p>
</div>
<div class="clearfix m-0"></div>
templates/Binarity/Resources/views/modules/staticpages/visitor/referenceDetail.blade.php
+2 -2
View File
@@ -7,14 +7,14 @@
<div class="row small-11 medium-11 large-11 xlarge-11 m-t-25 reference-gallery">
<div class="row">
<div class="ref-scr column xlarge-8 large-8 medium-4 m-b-25 p-lr-0 b-invo" data-img="" data-label="">
<img class="thumbnail pointer" src="@upload($page->title_photo)" alt="{{$page->title}}">
<img class="thumbnail pointer" src="@upload($page->titlePhoto)" alt="{{$page->title}}">
</div>
@foreach($page->files as $file)
@if(!\Illuminate\Support\Str::startsWith($file->mime_type, 'image'))
@continue;
@endif
<div class="ref-scr b-invo column xlarge-4 large-4 medium-4 small-6"
data-img="@upload($page->title_photo)"
data-img="@upload($page->titlePhoto)"
data-label="{{$file->description}}">
<img class="thumbnail pointer m-b-26" src="@upload($file->filename)"
alt="{{$file->name}}">
templates/Binarity/Resources/views/modules/staticpages/visitor/references.blade.php
+1 -1
View File
@@ -18,7 +18,7 @@
<?php $counter++; ?>
<div class="column reference-item @if($counter > 8) more-references @endif">
<div class="holder">
<img class="thumbnail" data-equalizer-watch src="@thumbnail($reference->title_photo)">
<img class="thumbnail" data-equalizer-watch src="@thumbnail($reference->titlePhoto)">
<div class="item-data">
<h4>{{$reference->title}}</h4>
<p>{{$reference->meta_description}}</p>
templates/Binarity/Resources/views/visitor/metaInformation.blade.php
+1 -1
View File
@@ -3,7 +3,7 @@
@section('pageDescription', $page->meta_description)
@section('pageKeywords', $page->meta_keywords)
@section('pageTitleImage')
@if (!empty($page->title_photo) && \App\CMS\Helpers\Template::upload($page->title_photo))@upload($page->title_photo)
@if (!empty($page->titlePhoto) && \App\CMS\Helpers\Template::upload($page->titlePhoto))@upload($page->titlePhoto)
@else{{asset_path('visitor/images/social-cover.png')}}@endif
@endsection
@endif