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 9b61c21..0f63ca0 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,8 +17,8 @@ class CreateNewsTable extends Migration $table->id(); $table->string("name"); $table->string('subname'); + $table->longText("content"); $table->date('news_expiration_date')->nullable(); - $table->text("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/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/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index 889d1f9..75433c4 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -9,6 +9,7 @@ return[ "vagttelefon" => "Vagttelefon", "vejledning" => "Vejledninger", "konto" => "Konto", + "nyheder" => "Nyheder", "logud" => "Log ud", "allekategorier" => "Alle kategorier", "kategorier" => "Kategorier", diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php index 62065c9..a61b5d4 100644 --- a/skolehjem/resources/lang/en/msg.php +++ b/skolehjem/resources/lang/en/msg.php @@ -57,6 +57,7 @@ return[ "nytpassword" => "New password", "confirmpassword" => "Confirm password", "ingennyheder" => "No news were found", + "nyheder" => "News", "mørk" => "Dark", "lys" => "Light", "indstillinger" => "Settings", 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.Tilmeldtes Fornavn | Tilmeldtes Efternavn | Tilmeldtes Tlf Nr | - - @foreach($events as $event) - @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null) - |
---|---|---|---|
{{ $event->name_first }} | -{{ $event->name_last }} | -{{ $event->phone }} | -|
{{ $event->name_first }} | +{{ $event->name_last }} | +{{ $event->phone }} | +- | -
{{__('msg.dereringenkontakter')}}!
@endif - {{__('msg.sendfeedback')}} - {{__('msg.givfeedback')}} @endsection 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 diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index c54a1a2..5ae7e34 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -30,8 +30,8 @@