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/app/contacts/index.blade.php

@@ -23,7 +23,5 @@
         @else
             <p class="text-center">{{__('msg.dereringenkontakter')}}!</p>
         @endif
-        <span class="text-center sde-black-20 mt-1">{{__('msg.sendfeedback')}}</span>
-        <a class="btn text-center btn-sde-blue mt-1" href="{{ route('feedbacks.create') }}">{{__('msg.givfeedback')}}</a>
     </main>
 @endsection

skolehjem/resources/views/app/events/show.blade.php

@@ -23,13 +23,5 @@
         {!!$event->description!!}
         </div>
         <button style="margin-top: auto" onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
-
     </main>
-
-
-
-
-
-
-
 @endsection

skolehjem/resources/views/app/layout/base.blade.php

@@ -30,8 +30,8 @@
 </header>
 <div class="d-none bg-sde-blue col" id="menu">
     <a href="{{ route("root.index") }}">
-        <img src="{{URL::asset('/images/icons/Home.svg')}}" alt="Home">
-        Home
+        <img src="{{URL::asset('/images/icons/Home.svg')}}" alt="Nyheder">
+        {{ __('msg.nyheder') }}
     </a>
     @if(auth()->user()->can('menuplan.show'))
     <a href="{{ route("menu-plans.index") }}">
@@ -67,6 +67,12 @@
         {{ __('msg.vejledning') }}
     </a>
     @endif
+    @if(auth()->user()->can('feedback.create'))
+        <a href="{{ route('feedbacks.create') }}">
+            <img src="{{URL::asset('/images/icons/feedback.svg')}}" alt="Feedback">
+            {{__('msg.givfeedback')}}
+        </a>
+    @endif
     <a href="{{ route("users.account") }}">
         <img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
         {{ __('msg.konto') }}