Merge branch 'binarity.cz' into refactoring

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

@@ -17,14 +17,15 @@
 
             @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>
+                    <a href="./blog?category={{$page->category->url}}"><i
+                                class="fa fa-tag"></i> {{$page->category->name}}</a>
                 </div>
             @endif
 
 
-            @if(isset($page->moduleSettings->allowComments) && $page->moduleSettings->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>
+                    <a href="#comments">{{count($page->comments)}} <i class="fa fa-comments"></i></a>
                 </div>
             @endif
         </aside>
@@ -32,15 +33,13 @@
             <article class="text-justify">
                 <h1>{{$page->title}}</h1>
 
-                {!! $page->content !!}
+                {!! $page->pageContent !!}
             </article>
         </div>
     </div>
-    @if(isset($page->moduleSettings->allowComments) && $page->moduleSettings->allowComments != 0)
+    @if(isset($page->moduleSettings['allowComments']) && $page->moduleSettings['allowComments'] != 0)
         <div class="row m-t-50">
             <a name="comments"></a>
-
-
             <h2 class="column large-11" style="float: right;">Komentáře</h2>
             @foreach($page->comments as $comment)
 
@@ -58,7 +57,7 @@
                             <h6><a href="#{{$comment->id}}">{{$comment->author->name}}</a></h6>
                         </header>
                         <article>
-                            {{$comment->content}}
+                            {{$comment->ontent}}
                         </article>
                     </div>
                     <div class="clearfix"></div>
@@ -81,7 +80,7 @@
                         </div>
                     @endif
 
-                    <form method="post" action="{{route('comments.new', ['id' => $page->id])}}">
+                    <form method="post" action="{{route('comments.new', ['article' => $page])}}">
                         {!! csrf_field() !!}
 
                         @if(!$loggedUser)

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

@@ -32,16 +32,16 @@
                     </h3>
                 </header>
                 <article class="p-0 column text-justify large-9">
-                    {{str_limit($article->meta_description, 250)}}
+                    {{str_limit($article->metaDescription, 250)}}
 
                     <a href="{{route('page.content', ['url' => $article->url])}}">více</a>
                 </article>
 
-                @if(isset($article->moduleSettings->allowComments) && $article->moduleSettings->allowComments != 0 || $article->category)
+                @if(isset($article->moduleSettings['allowComments']) && $article->moduleSettings['allowComments'] != 0 || $article->category)
                     <footer class="text-right">
 
                         @if($article->category)
-                                <a href="./seznam-clanku?category={{$article->category->url}}"><i
+                                <a href="./blog?category={{$article->category->url}}"><i
                                             class="fa fa-tag"></i> {{$article->category->name}}</a>
                         @endif