Merge branch 'module_blog' into dev

resources/views/admin/content/overview.blade.php

@@ -1,6 +1,6 @@
 @extends('admin.layoutWithNavigation')
 
-@section('pageHeading', @trans('admin/contents.overview'))
+@section('pageHeading', @trans(isset($pageHeading) ? $pageHeading : 'admin/contents.overview'))
 @section('headerButtons')
 
     @if($module)

resources/views/admin/fileManager/edit.blade.php

@@ -2,8 +2,8 @@
 
 @section('pageHeading', @trans('admin/fileManager.edit', ['name' => $file->original_filename]))
 @section('headerButtons')
-    <a href="{{route('upload.delete', ['id' => $file->id])}}" class="btn btn-danger btn-sm rounded" title="@lang('admin/fileManager.delete')">
-        <i class="fa fa-remove"></i>
+    <a href="{{route('upload.delete', ['id' => $file->id])}}" class="btn btn-danger btn-sm confirm rounded" title="@lang('admin/fileManager.delete')">
+        <i class="fa fa-trash"></i>
     </a>
     @endsection
 

resources/views/admin/fileManager/filesTiles.blade.php

@@ -9,12 +9,12 @@
 
             <a href="{{route('upload.detail', ['id' => $file->id])}}">
                 {{str_limit($file->original_filename, 10)}}
-            </a>
+            </a>```
 
             @if(!isset($hideDelete) || !$hideDelete)
-                <a href="{{route('upload.delete', ['id' => $file->id])}}" class="btn btn-sm btn-danger"
+                <a href="{{route('upload.delete', ['id' => $file->id])}}" class="btn btn-sm btn-danger confirm"
                    title="@lang('admin/fileManager.delete')">
-                    <i class="fa fa-remove"></i>
+                    <i class="fa fa-trash"></i>
                 </a>
             @endif
         </div>

resources/views/admin/widgets/association.blade.php

@@ -38,7 +38,7 @@
                             @if (in_array($widget->id, $associatedWidgetIds))
                                 <a href="{{route('widgets.deleteAssociation', ['widgetId' => $widget->id, 'widgetArea' => $widgetArea->id])}}"
                                    class="button column confirm large-6 alert">
-                                    <i class="fa fa-remove"></i>
+                                    <i class="fa fa-trash"></i>
                                 </a>
                             @else
                                 <a href="{{route('widgets.makeAssociation', ['widgetId' => $widget->id, 'widgetArea' => $widgetArea->id])}}"

resources/views/visitor/cwbs/modules/Article/content.blade.php

@@ -6,4 +6,16 @@
     <hr>
 
     {!! $page->content !!}
+
+    <form action="{{route('comments.new', ['id' => $page->id])}}" method="post">
+        {!! csrf_field() !!}
+        <input type="text" name="name">
+        <input type="email" name="email">
+
+        <textarea name="message" id="" cols="30" rows="10">
+
+        </textarea>
+
+        <input type="submit">
+    </form>
 @endsection

resources/views/visitor/cwbs/modules/ArticleList/list.blade.php

@@ -0,0 +1 @@
+{{dd($page)}}