Merge branch 'dev' into binarity.cz

modules/Blog/ArticleList/Handlers/ArticleList.php

@@ -71,7 +71,7 @@ class ArticleList extends Handler
 
         if ($categoryUrl && $categoriesEnabled) {
             $category = Category::where('url', $categoryUrl)
-                                ->firstOrFail();
+                                ->first();
 
             $subcategories = $category->getChildren()
                                       ->toArray();

templates/Binarity/Resources/views/modules/article/visitor/default.blade.php

@@ -17,13 +17,6 @@
                 <small>{{$page->author->name}}</small>
             </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)
                 <div class="m-t-25 text-center">
                     <a href="#comments"><i class="fa fa-comments"></i> {{$page->comments->count()}}</a>

templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php

@@ -37,14 +37,8 @@
                     <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->module_settings->allowComments) && $article->module_settings->allowComments != 0)
                     <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">
                             <i class="fa fa-fw fa-comments"></i> {{$article->comments->count()}}
                         </a>