From 746926d43974d686198a72232faa78de7049805a Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 12 Aug 2020 08:42:58 +0200 Subject: [PATCH] v0.7.8 - Added Quill Editor to all sites - Fixed Event name/subname showance in news.index --- .../app/Http/Controllers/NewsController.php | 3 +- skolehjem/public/css/webapp.css | 16 +++++ skolehjem/public/css/webappdark.css | 16 +++++ skolehjem/resources/sass/webapp/_default.scss | 16 +++++ .../views/admin/events/create.blade.php | 6 +- .../views/admin/events/edit.blade.php | 6 +- .../views/admin/guides/create.blade.php | 48 ++++++++++----- .../views/admin/guides/edit.blade.php | 51 ++++++++++------ .../views/admin/menuplans/create.blade.php | 58 ++++++++++++------ .../views/admin/menuplans/edit.blade.php | 59 +++++++++++-------- .../views/admin/news/create.blade.php | 44 +++++++++----- .../resources/views/admin/news/edit.blade.php | 49 +++++++++------ .../views/admin/news/index.blade.php | 2 +- 13 files changed, 261 insertions(+), 113 deletions(-) diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php index 2586ef1..8e802d5 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -50,11 +50,12 @@ class NewsController extends Controller public function store(Request $request) { $data = $request->validate([ - "name" => "required", + "subname" => "required", "content" => "required" ]); $news = new News($data); + $news->name = ""; $news->save(); return redirect()->route("news.index"); diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index 5b62e83..d25f721 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -6977,6 +6977,22 @@ main { display: inline-block; } +.ql-align-left { + text-align: left !important; +} + +.ql-align-center { + text-align: center !important; +} + +.ql-align-right { + text-align: right !important; +} + +.ql-align-justify { + text-align: justify !important; +} + #snackbar { visibility: hidden; width: calc(90% - 16px); diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css index b3471b3..fc174cc 100644 --- a/skolehjem/public/css/webappdark.css +++ b/skolehjem/public/css/webappdark.css @@ -6977,6 +6977,22 @@ main { display: inline-block; } +.ql-align-left { + text-align: left !important; +} + +.ql-align-center { + text-align: center !important; +} + +.ql-align-right { + text-align: right !important; +} + +.ql-align-justify { + text-align: justify !important; +} + #snackbar { visibility: hidden; width: calc(90% - 16px); diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss index 4fdfc07..81e5aa8 100644 --- a/skolehjem/resources/sass/webapp/_default.scss +++ b/skolehjem/resources/sass/webapp/_default.scss @@ -486,6 +486,22 @@ $primary-color: $blue; } } +.ql-align-left { + text-align: left !important; +} + +.ql-align-center { + text-align: center !important; +} + +.ql-align-right { + text-align: right !important; +} + +.ql-align-justify { + text-align: justify !important; +} + #snackbar { visibility: hidden; width: calc(90% - 16px); diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index 40fd4c5..8b87871 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -17,6 +17,10 @@ .toggle__text::before { border-color: black; } + + #editor { + margin-bottom: 1rem; + }

Opret Aktivitet:

@@ -51,7 +55,7 @@ [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], - [ 'link', 'image', 'video', 'formula' ], + [ 'link' ], [ 'clean' ] ], }, diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 1159718..5dd32de 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -17,6 +17,10 @@ .toggle__text::before { border-color: black; } + + #editor { + margin-bottom: 1rem; + }

Rediger Link:

@@ -53,7 +57,7 @@ [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], - [ 'link', 'image', 'video', 'formula' ], + [ 'link' ], [ 'clean' ] ], }, diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index c4a5f4e..4384e31 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -11,23 +11,25 @@ @section("content") - +

Opret Vejledning

@csrf - +
+