diff --git a/skolehjem/public/images/icons/calendar.svg b/skolehjem/public/images/icons/calendar.svg new file mode 100644 index 0000000..69de29e --- /dev/null +++ b/skolehjem/public/images/icons/calendar.svg @@ -0,0 +1,2 @@ + + diff --git a/skolehjem/public/images/icons/calendar2.svg b/skolehjem/public/images/icons/calendar2.svg new file mode 100644 index 0000000..973aeae --- /dev/null +++ b/skolehjem/public/images/icons/calendar2.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 895eb1a..2b85809 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -76,6 +76,12 @@ {{ __('msg.aktiviteter') }} @endif + @if(auth()->user()->can('event.show')) + + + {{ __('msg.ugentligaktiviteter') }} + + @endif @if(auth()->user()->can('washing.machine.reservation.show')) diff --git a/skolehjem/resources/views/app/multiple-events/index.blade.php b/skolehjem/resources/views/app/multiple-events/index.blade.php index f831016..e95e0bd 100644 --- a/skolehjem/resources/views/app/multiple-events/index.blade.php +++ b/skolehjem/resources/views/app/multiple-events/index.blade.php @@ -9,15 +9,11 @@ margin-top: 1rem; margin-bottom: 30px; width: auto; - heigt: auto; + height: auto; border-bottom: 2px solid black; } - div.container { - padding: 8px; - text-align: justify; - } .header > img { - border-radius: 10px 10px 0px 0px + border-radius: 10px 10px; } /*Alert box*/ .alert { @@ -45,7 +41,7 @@ margin-top: 1rem; margin-bottom: 30px; width: auto; - heigt: auto; + height: auto; } @@ -75,7 +71,7 @@ @if(!$multiEvents->isEmpty()) @foreach($multiEvents as $multiEvent) - + {{ ucfirst(\Carbon\Carbon::parse($multiEvent->date)->formatLocalized('%A')) }} {{$multiEvent->name}} {{__('msg.af')}}: {{$multiEvent->accountable}} @@ -92,6 +88,8 @@ @endforeach + @else + {{__('msg.dereringenaktiviteter')}}! @endif {{ __('msg.tilbage') }}
{{__('msg.af')}}: {{$multiEvent->accountable}}
{{__('msg.dereringenaktiviteter')}}!