From c74f48dde5d75d21f85d190b1d5d4ebc05624810 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 24 Nov 2020 13:14:25 +0100 Subject: [PATCH] v1.4.8k Fixed overflow hidden. forgot password and signup now works on pc --- .../app/Http/Controllers/UserController.php | 2 +- .../app/Providers/DetectorServiceProvider.php | 2 +- skolehjem/public/css/admin.css | 5 +++ .../resources/sass/admin/content/content.scss | 5 +++ .../views/admin/contacts/index.blade.php | 2 +- .../views/admin/events/index.blade.php | 2 +- .../views/admin/guides/index.blade.php | 2 +- .../resources/views/admin/index.blade.php | 43 +++++++++---------- .../views/admin/news/index.blade.php | 2 +- .../views/admin/users/account.blade.php | 2 +- .../views/admin/users/forgot.blade.php | 2 +- .../views/admin/users/index.blade.php | 2 +- .../admin/washing-machines/index.blade.php | 2 +- .../washing-reservations/index.blade.php | 2 +- 14 files changed, 42 insertions(+), 33 deletions(-) mode change 100644 => 100755 skolehjem/resources/views/admin/users/forgot.blade.php diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index fbd99f4..76aed12 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -24,7 +24,7 @@ class UserController extends Controller { $this->middleware([ "auth" ])->only(["accountupdate", "accountedit", "accounteditpass", "account", "logout"]); - $this->middleware([ "guest" ])->only(["login", "signup", "signupStore"]); + $this->middleware([ "guest" ])->only(["login", "signup", "signupStore", "showForgot", "forgot"]); $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot", "signup", "nameCheck", "signupStore"]); $this->middleware([ "check.auth:user.show" ])->only("show", "index"); diff --git a/skolehjem/app/Providers/DetectorServiceProvider.php b/skolehjem/app/Providers/DetectorServiceProvider.php index 93a05fc..1c4f282 100644 --- a/skolehjem/app/Providers/DetectorServiceProvider.php +++ b/skolehjem/app/Providers/DetectorServiceProvider.php @@ -33,7 +33,7 @@ class DetectorServiceProvider extends ServiceProvider if(Auth()->user()->can('admin.panel.show') == true) return view(config("detector.defaultPath") . "." . $view, $args); } - if($view == "users.login" || $view == "users.logout") + if($view == "users.login" || $view == "users.logout" || $view == "users.forgot" || $view == "users.signup") return view(config("detector.mobilePath") . "." . $view, $args); return view("errors.403", $args); diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index e7917cf..b164a5c 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6769,6 +6769,11 @@ nav > .pagination { font-weight: bold; } +.fixOverflow { + text-overflow: ellipsis; + overflow: hidden; +} + .tbl { border-collapse: collapse; width: 100%; diff --git a/skolehjem/resources/sass/admin/content/content.scss b/skolehjem/resources/sass/admin/content/content.scss index dd4b215..5a45c16 100644 --- a/skolehjem/resources/sass/admin/content/content.scss +++ b/skolehjem/resources/sass/admin/content/content.scss @@ -39,3 +39,8 @@ nav > .pagination { .pagination > .page-item.active { font-weight: bold; } + +.fixOverflow{ + text-overflow: ellipsis; + overflow: hidden; +} diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 3462d32..7d59118 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -20,7 +20,7 @@ CreateOpret Kontakt @endif - +
diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 7fdcf08..46619ed 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -24,7 +24,7 @@ @endif -
Kontakt Navn Titel
+
diff --git a/skolehjem/resources/views/admin/guides/index.blade.php b/skolehjem/resources/views/admin/guides/index.blade.php index e74748e..0398cfb 100644 --- a/skolehjem/resources/views/admin/guides/index.blade.php +++ b/skolehjem/resources/views/admin/guides/index.blade.php @@ -23,7 +23,7 @@ @endif
-
Aktivitet Navn Aktivitet Ansvarlig
+
diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php index 3ba9446..c21b039 100644 --- a/skolehjem/resources/views/admin/index.blade.php +++ b/skolehjem/resources/views/admin/index.blade.php @@ -59,14 +59,19 @@ letter-spacing: 2px; } - .fixOverflow{ - overflow: hidden !important; + + .dot { + height: 10px; + width: 10px; + background-color: #bbb; + border-radius: 50%; + display: inline-block; } -
+
@@ -80,13 +85,13 @@
@for($i = 0; $i < 10 && $i < count(\App\User::query()->orderByDesc("id")->get()); $i++) - + @endfor
Navn Kategori
{!! \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) ) !!}{!! (ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first))) . ' ' . \App\Helpers::closetags(substr(ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)), 0, 23) ) !!}
-
+
@@ -109,25 +114,20 @@
- - - + - - - + - - +
{!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->name, 0, 15)) !!}
Af: {!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->accountable, 0, 15) ) !!}
{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->orderBy("date", "asc")->first()->date))->format('d/m/Y \k\l\. H:i') }}
- +
{!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->description, 0, 300) )!!} {!!(\App\Event::query()->orderBy("date", "asc")->first()->description)!!}
first()->id }}"> @@ -139,7 +139,7 @@ @endif
-
+
@@ -165,7 +165,7 @@
-
+
@@ -181,23 +181,22 @@ {{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}} - \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()->monday) !!} - {!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday, 0, 45) ) !!} + {!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday) !!} - {!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday, 0, 45) ) !!} + {!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday) !!} - {!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday, 0, 45) ) !!} + {!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday) !!} @else - Der er ingen menuplan for denne uge + Ingen menuplan @endif diff --git a/skolehjem/resources/views/admin/news/index.blade.php b/skolehjem/resources/views/admin/news/index.blade.php index 1da1186..3e43294 100644 --- a/skolehjem/resources/views/admin/news/index.blade.php +++ b/skolehjem/resources/views/admin/news/index.blade.php @@ -20,7 +20,7 @@ CreateOpret Nyheder
@endif - +
diff --git a/skolehjem/resources/views/admin/users/account.blade.php b/skolehjem/resources/views/admin/users/account.blade.php index 72bbb6b..d7a1398 100644 --- a/skolehjem/resources/views/admin/users/account.blade.php +++ b/skolehjem/resources/views/admin/users/account.blade.php @@ -10,7 +10,7 @@ @endsection @section("content") -
Navn Udløbsdato
+
diff --git a/skolehjem/resources/views/admin/users/forgot.blade.php b/skolehjem/resources/views/admin/users/forgot.blade.php old mode 100644 new mode 100755 index 4fe1936..57a2fcd --- a/skolehjem/resources/views/admin/users/forgot.blade.php +++ b/skolehjem/resources/views/admin/users/forgot.blade.php @@ -1,7 +1,7 @@ @extends("user.layout.base") @section("title") - Login + Login Forgot @endsection @section("content") diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index aa9b8a8..4d1fd95 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -55,7 +55,7 @@ CreateOpret Bruger @endif -
Fornavn Efternavn
+
diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php index e8f92d1..6a64264 100644 --- a/skolehjem/resources/views/admin/washing-machines/index.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -33,7 +33,7 @@
-
Fornavn Efternavn
+
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index c6adf75..0e64205 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -18,7 +18,7 @@ letter-spacing: 1.2px; } -
Navn Lokation
+
Lokation Vaskemaskine