From 159c3f376450aeeb7608f740ef85351d0420ba00 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 7 Oct 2020 08:23:26 +0200 Subject: [PATCH 1/4] v1.4.1 - Small fixes --- ...7_01_061911_create_resource_categories.php | 2 +- ...07_01_064512_create_resource_extension.php | 2 +- ..._08_19_000000_create_failed_jobs_table.php | 4 +- .../2020_06_23_070657_create_menu_plans.php | 2 +- .../2020_08_06_092000_create_news_table.php | 2 +- skolehjem/database/seeds/ContactSeeder.php | 16 +---- .../views/admin/events/signups.blade.php | 68 +++++++++---------- .../resources/views/admin/index.blade.php | 6 +- .../views/admin/news/index.blade.php | 2 +- .../resources/views/app/events/show.blade.php | 8 --- 10 files changed, 44 insertions(+), 68 deletions(-) diff --git a/skolehjem/database/migrations/2013_07_01_061911_create_resource_categories.php b/skolehjem/database/migrations/2013_07_01_061911_create_resource_categories.php index 2e4231a..362ab36 100644 --- a/skolehjem/database/migrations/2013_07_01_061911_create_resource_categories.php +++ b/skolehjem/database/migrations/2013_07_01_061911_create_resource_categories.php @@ -18,7 +18,7 @@ class CreateResourceCategories extends Migration Schema::create('resource_categories', function (Blueprint $table) { $table->id(); $table->string("name", 60)->unique(); - $table->text("description"); + $table->longText("description"); $table->string("slug", 255)->unique(); $table->timestamps(); }); diff --git a/skolehjem/database/migrations/2013_07_01_064512_create_resource_extension.php b/skolehjem/database/migrations/2013_07_01_064512_create_resource_extension.php index e38d0aa..c901c8d 100644 --- a/skolehjem/database/migrations/2013_07_01_064512_create_resource_extension.php +++ b/skolehjem/database/migrations/2013_07_01_064512_create_resource_extension.php @@ -18,7 +18,7 @@ class CreateResourceExtension extends Migration Schema::create('resource_extensions', function (Blueprint $table) { $table->id(); $table->string("extension", 60)->unique(); - $table->text("description"); + $table->longText("description"); $table->timestamps(); $table->foreignid("resource_category_id")->constrained("resource_categories", "id"); diff --git a/skolehjem/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/skolehjem/database/migrations/2019_08_19_000000_create_failed_jobs_table.php index 6b2cca4..1bd21ad 100644 --- a/skolehjem/database/migrations/2019_08_19_000000_create_failed_jobs_table.php +++ b/skolehjem/database/migrations/2019_08_19_000000_create_failed_jobs_table.php @@ -18,8 +18,8 @@ class CreateFailedJobsTable extends Migration { Schema::create('failed_jobs', function (Blueprint $table) { $table->id(); - $table->text('connection'); - $table->text('queue'); + $table->longText('connection'); + $table->longText('queue'); $table->longText('payload'); $table->longText('exception'); $table->timestamp('failed_at')->useCurrent(); diff --git a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php index ee6d5c9..bb3ed6b 100644 --- a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php +++ b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php @@ -23,7 +23,7 @@ class CreateMenuPlans extends Migration $table->string('wednesday', 255); $table->string('thursday', 255); $table->timestamps(); - //$table->text('description'); + //$table->longText('description'); }); } diff --git a/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php b/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php index a2c2a60..e93a363 100644 --- a/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php +++ b/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php @@ -17,7 +17,7 @@ class CreateNewsTable extends Migration $table->id(); $table->string("name"); $table->string('subname'); - $table->text("content"); + $table->longText("content"); $table->foreignId('resource_id')->nullable()->constrained('resources', 'id'); $table->integer("arrangement_id")->nullable(); //Gets ID from given event, menu, guide or news $table->foreignid("type_id")->nullable()->constrained("news_types", "id"); diff --git a/skolehjem/database/seeds/ContactSeeder.php b/skolehjem/database/seeds/ContactSeeder.php index 6324cf2..ed16123 100644 --- a/skolehjem/database/seeds/ContactSeeder.php +++ b/skolehjem/database/seeds/ContactSeeder.php @@ -16,7 +16,7 @@ class ContactSeeder extends Seeder 'contactname' => "Claus Trasbo", 'email' => "ctr@sde.dk", 'title' => "Forstander for Erhvervskollegiet", - 'phone' => "40886515", + 'phone' => "", 'phonetimes' => "", ], [ @@ -33,20 +33,6 @@ class ContactSeeder extends Seeder 'phone' => null, 'phonetimes' => "", ], - [ - 'contactname' => "Anja Holm Brix", - 'email' => "ahb@sde.dk", - 'title' => "Kollegieassistent", - 'phone' => null, - 'phonetimes' => "", - ], - [ - 'contactname' => "Britta Overgaard Brink Olsen", - 'email' => "brio@sde.dk", - 'title' => "Kollegieassistent", - 'phone' => null, - 'phonetimes' => "", - ], [ 'contactname' => "Jesper Sandberg", 'email' => "jesa@sde.dk", diff --git a/skolehjem/resources/views/admin/events/signups.blade.php b/skolehjem/resources/views/admin/events/signups.blade.php index 53a77ae..aa62dbc 100644 --- a/skolehjem/resources/views/admin/events/signups.blade.php +++ b/skolehjem/resources/views/admin/events/signups.blade.php @@ -10,47 +10,41 @@ @endsection @section("content") - - +
+ - - @foreach($events as $event) - @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null) - - - - - + + @foreach($events as $event) + @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null) + + + + + - - @endif - @endforeach + + + + + @endif + @endforeach +
Tilmeldtes Fornavn Tilmeldtes Efternavn Tilmeldtes Tlf Nr Delete
{{ $event->name_first }}{{ $event->name_last }}{{ $event->phone }}
$event->event_id ]) }}" class="w-100 nostyle"> - @csrf - @method("delete") +
{{ $event->name_first }}{{ $event->name_last }}{{ $event->phone }} $event->event_id ]) }}" class="w-100 nostyle"> + @csrf + @method("delete") - - -
- - - - +@endsection +@section('scripts') + @endsection diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php index a96a076..1ab9406 100644 --- a/skolehjem/resources/views/admin/index.blade.php +++ b/skolehjem/resources/views/admin/index.blade.php @@ -2,7 +2,11 @@ @extends("admin.layout.header") @section("title") - Home - Admin Panel + Dashboard - Admin Panel +@endsection + +@section("path") + Dashboard / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/news/index.blade.php b/skolehjem/resources/views/admin/news/index.blade.php index 3902ddf..9e8c370 100644 --- a/skolehjem/resources/views/admin/news/index.blade.php +++ b/skolehjem/resources/views/admin/news/index.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Opret Nyheder / + Vis Nyheder / @endsection @section("content") diff --git a/skolehjem/resources/views/app/events/show.blade.php b/skolehjem/resources/views/app/events/show.blade.php index 176e0de..d29f6f0 100644 --- a/skolehjem/resources/views/app/events/show.blade.php +++ b/skolehjem/resources/views/app/events/show.blade.php @@ -23,13 +23,5 @@ {!!$event->description!!} - - - - - - - - @endsection From 1d92c12ecfc875ba8b0e74082b0139666fa261e3 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 7 Oct 2020 08:25:00 +0200 Subject: [PATCH 2/4] v1.4.1 - Small fixes --- skolehjem/resources/views/admin/guides/index.blade.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/guides/index.blade.php b/skolehjem/resources/views/admin/guides/index.blade.php index 186b062..e84cedf 100644 --- a/skolehjem/resources/views/admin/guides/index.blade.php +++ b/skolehjem/resources/views/admin/guides/index.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Opret Vejledning / + Vis Vejledning / @endsection @section("content") @@ -47,6 +47,11 @@ @endif @endforeach + @if(count($guides) == 0) + + Ingen vejledninger + + @endif From 491ecc9d6e55c594b4c259279a2a6b2ba2544505 Mon Sep 17 00:00:00 2001 From: Anders Date: Wed, 7 Oct 2020 11:59:58 +0200 Subject: [PATCH 3/4] v1.4.2 - Fixed QL Editor Added Feedback to menu bar --- skolehjem/public/css/admin.css | 5 +++++ skolehjem/public/css/webappdark.css | 9 --------- skolehjem/resources/views/admin/events/create.blade.php | 3 ++- skolehjem/resources/views/admin/events/edit.blade.php | 3 ++- skolehjem/resources/views/admin/guides/create.blade.php | 4 +++- skolehjem/resources/views/admin/guides/edit.blade.php | 3 ++- skolehjem/resources/views/admin/layout/base.blade.php | 2 +- skolehjem/resources/views/admin/news/create.blade.php | 3 ++- skolehjem/resources/views/admin/news/edit.blade.php | 3 ++- skolehjem/resources/views/app/contacts/index.blade.php | 2 -- skolehjem/resources/views/app/layout/base.blade.php | 6 ++++++ 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index e7917cf..2649753 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6878,3 +6878,8 @@ div.dataTables_wrapper div.dataTables_paginate ul.pagination { outline: unset !important; } +/* QL-Editor */ + +.ql-tooltip { + z-index: 3 !important; +} diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css index ce59563..aceed77 100644 --- a/skolehjem/public/css/webappdark.css +++ b/skolehjem/public/css/webappdark.css @@ -80,15 +80,6 @@ select { margin-bottom: 1rem; } -.select2-container--default, .select2-search, .selection, .select2-selection--single, .select2-results__options * { - color: white !important; - background-color: #2F3136 !important; -} - -.select2-selection__rendered { - color: white !important; -} - input.appinput { border: none; border-bottom: white solid 2px; diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index f2e0f70..58d8e1d 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -32,6 +32,7 @@ + For at kunne indsætte et link, skal du markere den text du vil lave som et link først.
@@ -59,7 +60,7 @@ [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], - [ 'link' ], + [ 'link', 'image', 'video' ], [ 'clean' ] ], }, diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 6758c24..ee48090 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -33,6 +33,7 @@ + For at kunne indsætte et link, skal du markere den text du vil lave som et link først.
{!! $event->description !!}
@@ -58,7 +59,7 @@ [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], - [ 'link' ], + [ 'link', 'image', 'video' ], [ 'clean' ] ], }, diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index c315acf..bea4b63 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -38,6 +38,8 @@ CreateOpret kategori + + For at kunne indsætte et link, skal du markere den text du vil lave som et link først.