vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-08-10 12:29:44 +02:00
parent 2e187524bf 50b495ee01
commit 2cc78c5d7c
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skolehjem/app/Http/Controllers/EventController.php
View File

@ -85,7 +85,7 @@ class EventController extends Controller
$news->content = "<p>" . $this->closetags(substr($event->description, 0, 300)) . "</p>" . $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300)) . "</p>" .
'<div class="row align-items-center">'. '<div class="row align-items-center">'.
'<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'. '<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
'<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere...</a>'. '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'.
'<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event" => $event->id ]) .'">Se deltagere</a>'. '<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event" => $event->id ]) .'">Se deltagere</a>'.
'</div>'; '</div>';
$news->save(); $news->save();
@ -182,7 +182,7 @@ class EventController extends Controller
$news->content = "<p>" . $this->closetags(substr($event->description, 0, 300)). "</p>" . $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300)). "</p>" .
'<div class="row align-items-center">'. '<div class="row align-items-center">'.
'<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'. '<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
'<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere...</a>'. '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'.
'<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'. '<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
'</div>'; '</div>';
$news->save(); $news->save();

4
skolehjem/app/Http/Controllers/GuideController.php
View File

@ -77,7 +77,7 @@ class GuideController extends Controller
$news->name = "Ny Vejledning"; $news->name = "Ny Vejledning";
$news->subname = $guide->name; $news->subname = $guide->name;
$news->content = $this->closetags(substr($guide->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læse mere...</a>'; $news->content = $this->closetags(substr($guide->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læs mere</a>';
$news->save(); $news->save();
@ -139,7 +139,7 @@ class GuideController extends Controller
$news->name = "Vejledning opdateret"; $news->name = "Vejledning opdateret";
$news->subname = $guidee->name; $news->subname = $guidee->name;
$news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læse mere...</a>'; $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læs mere</a>';
$news->save(); $news->save();
} }

2
skolehjem/app/Providers/AppServiceProvider.php
View File

@ -23,6 +23,6 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
// url()->forceScheme('https');
} }
} }

2
skolehjem/database/migrations/2020_06_29_065007_create_contact.php
View File

@ -21,7 +21,7 @@ class CreateContact extends Migration
$table->string('contactname', 255); $table->string('contactname', 255);
$table->string('title', 255); $table->string('title', 255);
$table->string('email', 255); $table->string('email', 255);
$table->integer('phone'); $table->integer('phone')->nullable(true);
$table->string('phonetimes'); $table->string('phonetimes');
}); });
} }

8
skolehjem/database/seeds/ContactSeeder.php
View File

@ -30,28 +30,28 @@ class ContactSeeder extends Seeder
'contactname' => "Thomas Thomsen", 'contactname' => "Thomas Thomsen",
'email' => "thth@sde.dk", 'email' => "thth@sde.dk",
'title' => "Kollegieassistent", 'title' => "Kollegieassistent",
'phone' => "", 'phone' => null,
'phonetimes' => "", 'phonetimes' => "",
], ],
[ [
'contactname' => "Anja Holm Brix", 'contactname' => "Anja Holm Brix",
'email' => "ahb@sde.dk", 'email' => "ahb@sde.dk",
'title' => "Kollegieassistent", 'title' => "Kollegieassistent",
'phone' => "", 'phone' => null,
'phonetimes' => "", 'phonetimes' => "",
], ],
[ [
'contactname' => "Britta Overgaard Brink Olsen", 'contactname' => "Britta Overgaard Brink Olsen",
'email' => "brio@sde.dk", 'email' => "brio@sde.dk",
'title' => "Kollegieassistent", 'title' => "Kollegieassistent",
'phone' => "", 'phone' => null,
'phonetimes' => "", 'phonetimes' => "",
], ],
[ [
'contactname' => "Jesper Sandberg", 'contactname' => "Jesper Sandberg",
'email' => "jesa@sde.dk", 'email' => "jesa@sde.dk",
'title' => "Kollegieassistent", 'title' => "Kollegieassistent",
'phone' => "", 'phone' => null,
'phonetimes' => "", 'phonetimes' => "",
], ],
]; ];