From 511e0b783f0c6d505a31b4f3c819b07831553038 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 11 Aug 2020 18:21:51 +0200 Subject: [PATCH] v0.7.7 - Various fixes --- .../resources/views/app/contacts/index.blade.php | 2 +- .../resources/views/app/events/signups.blade.php | 6 +++++- .../resources/views/app/menuplans/index.blade.php | 2 +- .../resources/views/app/settings/index.blade.php | 9 ++++----- skolehjem/resources/views/app/users/account.blade.php | 4 ++-- skolehjem/resources/views/app/users/edit.blade.php | 6 +++--- .../resources/views/app/users/editpass.blade.php | 6 +++--- .../resources/views/app/vagttelefons/index.blade.php | 6 +++--- .../views/app/washing-reservations/create.blade.php | 11 +++++++---- 9 files changed, 29 insertions(+), 23 deletions(-) diff --git a/skolehjem/resources/views/app/contacts/index.blade.php b/skolehjem/resources/views/app/contacts/index.blade.php index 8c338a4..966ed1f 100644 --- a/skolehjem/resources/views/app/contacts/index.blade.php +++ b/skolehjem/resources/views/app/contacts/index.blade.php @@ -4,7 +4,7 @@ @endsection @section("content") -
+

{{__('msg.kontakter')}}

@if(!$contacts->isEmpty()) @foreach($contacts as $contact) diff --git a/skolehjem/resources/views/app/events/signups.blade.php b/skolehjem/resources/views/app/events/signups.blade.php index 0175c46..107edb8 100644 --- a/skolehjem/resources/views/app/events/signups.blade.php +++ b/skolehjem/resources/views/app/events/signups.blade.php @@ -14,7 +14,11 @@ .tbl td, .tbl th { - border: 1px solid #ddd; + @if(request()->cookie("mode") == "dark") + border: 0px solid #ddd; + @else + border: 1px solid #ddd; + @endif padding: 8px; overflow: hidden; text-overflow: ellipsis; diff --git a/skolehjem/resources/views/app/menuplans/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php index e828497..b29f4f2 100644 --- a/skolehjem/resources/views/app/menuplans/index.blade.php +++ b/skolehjem/resources/views/app/menuplans/index.blade.php @@ -7,7 +7,7 @@ -
+
@if($menuPlans->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}} @foreach($menuPlans as $menuplan) @if($menuplan->week == $Week) diff --git a/skolehjem/resources/views/app/settings/index.blade.php b/skolehjem/resources/views/app/settings/index.blade.php index cdbcbf9..1490717 100644 --- a/skolehjem/resources/views/app/settings/index.blade.php +++ b/skolehjem/resources/views/app/settings/index.blade.php @@ -10,14 +10,14 @@ @@ -34,7 +34,6 @@ @endif
- -
-

{{__('msg.konto')}}

+
+

{{__('msg.konto')}}

{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}

{{__('msg.email')}}: {{ Auth::user()->email }}

{{__('msg.telefon')}} Nr.: {{ Auth::user()->phone }}

diff --git a/skolehjem/resources/views/app/users/edit.blade.php b/skolehjem/resources/views/app/users/edit.blade.php index 5d24194..9b723ee 100644 --- a/skolehjem/resources/views/app/users/edit.blade.php +++ b/skolehjem/resources/views/app/users/edit.blade.php @@ -5,9 +5,9 @@ @endsection @section("content") -
-

{{__('msg.konto')}}

-
Auth::user()]) }}"> +
+

{{__('msg.konto')}}

+ Auth::user()]) }}"> @csrf @method("put") {{__('msg.navn')}}: diff --git a/skolehjem/resources/views/app/users/editpass.blade.php b/skolehjem/resources/views/app/users/editpass.blade.php index 10f32a5..030d164 100644 --- a/skolehjem/resources/views/app/users/editpass.blade.php +++ b/skolehjem/resources/views/app/users/editpass.blade.php @@ -5,8 +5,8 @@ @endsection @section("content") -
-

{{__('msg.konto')}}

+
+

{{__('msg.konto')}}

Auth::user()]) }}"> @csrf @method("put") @@ -27,7 +27,7 @@ {!! session()->get('error#notsamepass') !!} {!! session()->get('error#oldpass') !!} - + {{__('msg.tilbage')}} diff --git a/skolehjem/resources/views/app/vagttelefons/index.blade.php b/skolehjem/resources/views/app/vagttelefons/index.blade.php index 859c907..d5cb01b 100644 --- a/skolehjem/resources/views/app/vagttelefons/index.blade.php +++ b/skolehjem/resources/views/app/vagttelefons/index.blade.php @@ -4,7 +4,7 @@ @endsection @section("content") -
+
Vagttelefon

{{__('msg.vagttelefon')}}

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.

@@ -14,8 +14,8 @@ {{__('msg.accepter')}} - +45 24 62 94 50 - {{__('msg.ring')}} + +45 24 62 94 50 + {{__('msg.ring')}}
@endsection diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php index ce55a6d..9eb9f85 100644 --- a/skolehjem/resources/views/app/washing-reservations/create.blade.php +++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php @@ -5,10 +5,10 @@ @endsection @section("content") -
+

{{__('msg.bookingliste')}}

{!! session()->get('ReservationExists') !!} -
+