Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

 Conflicts:

	skolehjem/database/migrations/2020_08_06_092000_create_news_table.php

	skolehjem/resources/views/admin/news/create.blade.php

	skolehjem/resources/views/admin/news/edit.blade.php

skolehjem/resources/views/admin/guides/create.blade.php

@@ -38,6 +38,8 @@
             </select> <label>Vælg en kategori</label>
             <a class="btn btn-inline btn-sde-blue mb-0 ml-1" href="{{ route('guides-category.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret kategori</a>
         </div>
+        <label for="editor">Vejledning</label>
+        <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
         <div id="editor"></div>
         <textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
         <label class="toggle">
@@ -67,7 +69,7 @@
                     [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
                     [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
                     [ {'direction': 'rtl'}, { 'align': [] }],
-                    [ 'link', 'video' ],
+                    [ 'link', 'image', 'video' ],
                     [ 'clean' ]
                 ],
             },

skolehjem/resources/views/admin/guides/edit.blade.php

@@ -44,6 +44,7 @@
             <a class="btn btn-inline btn-sde-blue mb-0 ml-1" href="{{ route('guides-category.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret kategori</a>
         </div>
         <label for="editor">Vejledning</label>
+        <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
         <div id="editor">{!! $guide->guide_articles !!}</div>
         <textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
         <label class="toggle">
@@ -67,7 +68,7 @@
                     [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
                     [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
                     [ {'direction': 'rtl'}, { 'align': [] }],
-                    [ 'link', 'video' ],
+                    [ 'link', 'image', 'video' ],
                     [ 'clean' ]
                 ],
             },

skolehjem/resources/views/admin/guides/index.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('guides.index') }}" class="text-white">Opret Vejledning</a> /
+    <a href="{{ route('guides.index') }}" class="text-white">Vis Vejledning</a> /
 @endsection
 
 @section("content")
@@ -47,6 +47,11 @@
                 @endif
             </tr>
         @endforeach
+        @if(count($guides) == 0)
+            <tr>
+                <td colspan="4">Ingen vejledninger</td>
+            </tr>
+        @endif
     </table>
     </div>