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-10 19:03:55 +02:00
parent 7e63047313 08e97fe2cb
commit 284dfa3fe8
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/Blog/ArticleList/Handlers/ArticleList.php
+1 -1
View File
@@ -71,7 +71,7 @@ class ArticleList extends Handler
if ($categoryUrl && $categoriesEnabled) { if ($categoryUrl && $categoriesEnabled) {
$category = Category::where('url', $categoryUrl) $category = Category::where('url', $categoryUrl)
->firstOrFail(); ->first();
$subcategories = $category->getChildren() $subcategories = $category->getChildren()
->toArray(); ->toArray();
templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
-7
View File
@@ -17,13 +17,6 @@
<small>{{$page->author->name}}</small> <small>{{$page->author->name}}</small>
</div> </div>
@if($page->category)
<div class="m-t-25 text-center">
<a href="./seznam-clanku?category={{$page->category->url}}"><i class="fa fa-tag"></i> {{$page->category->name}}</a>
</div>
@endif
@if(isset($page->module_settings->allowComments) && $page->module_settings->allowComments != 0) @if(isset($page->module_settings->allowComments) && $page->module_settings->allowComments != 0)
<div class="m-t-25 text-center"> <div class="m-t-25 text-center">
<a href="#comments"><i class="fa fa-comments"></i> {{$page->comments->count()}}</a> <a href="#comments"><i class="fa fa-comments"></i> {{$page->comments->count()}}</a>
templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php
+1 -7
View File
@@ -37,14 +37,8 @@
<a href="{{route('page.content', ['url' => $article->url])}}">více</a> <a href="{{route('page.content', ['url' => $article->url])}}">více</a>
</article> </article>
@if(isset($article->module_settings->allowComments) && $article->module_settings->allowComments != 0 || $article->category) @if(isset($article->module_settings->allowComments) && $article->module_settings->allowComments != 0)
<footer class="text-right"> <footer class="text-right">
@if($article->category)
<a href="./seznam-clanku?category={{$article->category->url}}"><i
class="fa fa-tag"></i> {{$article->category->name}}</a>
@endif
<a href="{{route('page.content', ['url' => $article->url])}}#comments"> <a href="{{route('page.content', ['url' => $article->url])}}#comments">
<i class="fa fa-fw fa-comments"></i> {{$article->comments->count()}} <i class="fa fa-fw fa-comments"></i> {{$article->comments->count()}}
</a> </a>