diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 5b09c39..84075c6 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,6 +7,8 @@ + + diff --git a/skolehjem/public/images/icons/preview-dark.svg b/skolehjem/public/images/icons/preview-dark.svg new file mode 100644 index 0000000..2e0072f --- /dev/null +++ b/skolehjem/public/images/icons/preview-dark.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/public/images/icons/preview.svg b/skolehjem/public/images/icons/preview.svg new file mode 100644 index 0000000..5f87f32 --- /dev/null +++ b/skolehjem/public/images/icons/preview.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/resources/views/admin/guides/index.blade.php b/skolehjem/resources/views/admin/guides/index.blade.php index aa99545..e74748e 100644 --- a/skolehjem/resources/views/admin/guides/index.blade.php +++ b/skolehjem/resources/views/admin/guides/index.blade.php @@ -28,6 +28,7 @@ Navn Kategori @if(auth()->user()->can('guides.edit')) + Update @endif @if(auth()->user()->can('guides.delete')) @@ -39,6 +40,7 @@ {{$guide->name}} {{ \App\GuidesCategory::query()->where('id', '=', $guide->guide_category_id)->first()->guidesCategoryName }} @if(auth()->user()->can('guides.edit')) + $guide ]) }}">Update @endif @if(auth()->user()->can('guides.delete')) @@ -46,7 +48,7 @@ @csrf @method("delete") - + @endif @@ -54,12 +56,11 @@ @endforeach @if(count($guides) == 0) - Ingen vejledninger + Ingen vejledninger @endif -
@@ -83,7 +84,7 @@ @csrf @method("delete") - + @endif @@ -91,4 +92,13 @@ @endforeach
+ + + @endsection diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php index 23cd544..6e7fccd 100644 --- a/skolehjem/resources/views/admin/index.blade.php +++ b/skolehjem/resources/views/admin/index.blade.php @@ -52,12 +52,17 @@ .letterSpaceTable{ letter-spacing: 1.2px; + } .letterSpaceNotTable{ letter-spacing: 2px; } + .fixOverflow{ + overflow: hidden !important; + } + @@ -69,13 +74,13 @@

{{ count(\App\User::all()) }}

- +
@for($i = 0; $i < 10 && $i < count(\App\User::query()->orderByDesc("id")->get()); $i++) - + @endfor
Nyeste brugere
{{ ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first)) . ' ' . ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)) }}{!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first)), 0, 24) ) . ' ' . \App\Helpers::closetags(substr(ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)), 0, 23) ) !!}
@@ -95,7 +100,7 @@ @if(\App\Event::query()->orderBy("date", "asc")->first() == null) - Der er ingen aktiviteter + Der er ingen aktiviteter @endif @@ -105,11 +110,13 @@ - + + - + + @@ -125,7 +132,7 @@
{{ \App\Event::query()->orderBy("date", "asc")->first()->name }}{!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->name, 0, 15)) !!}
Af: {{ \App\Event::query()->orderBy("date", "asc")->first()->accountable }}Af: {!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->accountable, 0, 15) ) !!}
first()->id }}">
- \App\Event::query()->orderBy("date", "asc")->first()->id ])}}">{{__('msg.sedeltagere')}} + \App\Event::query()->orderBy("date", "asc")->first()->id ])}}">Se deltagere
@@ -147,12 +154,12 @@ @if(count(\App\Guide::all()) > 0) @for($i = 0; $i < 10 && $i < count(\App\Guide::query()->orderByDesc("id")->get()); $i++) - {{ ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)) }} + {!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\Guide::query()->orderByDesc("id")->get()[$i]->name)), 0, 45) ) !!} @endfor @else - Der er ingen vejledninger + Der er ingen vejledninger @endif @@ -174,22 +181,23 @@ {{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}} - {{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday }} + \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday, 0, 45) ) + {!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday, 0, 45) ) !!} - {{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday }} + {!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday, 0, 45) ) !!} - {{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday }} + {!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday, 0, 45) ) !!} - {{ \App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday }} + {!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday, 0, 45) ) !!} - + @else - Der er ingen menuplan for denne uge + Der er ingen menuplan for denne uge @endif diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 4f991dd..887d2f2 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -41,7 +41,7 @@ @else @endif - diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 777e272..cae3832 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -102,6 +102,14 @@ @endif } + .dot { + height: 10px; + width: 10px; + background-color: #bbb; + border-radius: 50%; + display: inline-block; + } +
@@ -131,7 +139,7 @@
Menuplan:
{{ $new->subname }} - {{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}} + {{__('msg.opret')}}{{ date('Y-m-d H:i', strtotime($new->created_at))}}
@if($new->resource_id !== null)
@@ -148,11 +156,11 @@
Aktiviteter:
{{ $new->subname }} - {{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}} + {{__('msg.opret')}}{{ date('Y-m-d H:i', strtotime($new->created_at))}}
@if($new->resource_id !== null)
-
{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} | {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}}
+
{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}}
{!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!}
@@ -185,7 +193,7 @@
Vejledninger:
{{ $new->subname }} - {{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}} + {{__('msg.opret')}}{{ date('Y-m-d H:i', strtotime($new->created_at))}}
@if($new->resource_id !== null)