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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

Browse Source 
 Conflicts:
	skolehjem/app/Http/Controllers/EventController.php
This commit is contained in:
frederikpyt
2020-08-14 07:39:27 +02:00
parent 9e0f449bd3 9232ed99a1
commit 55eed84b86
8 changed files with 145 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/views/app/events/index.blade.php
+3 -3
View File
@@ -51,9 +51,9 @@
<div class="card">
@if($event->resource_id !== null)
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}');">
<h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $event->name }}</h3>
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $event->name }}</h3>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
</div>
@else
<div class="header">
skolehjem/resources/views/app/events/yourevents.blade.php
+3 -3
View File
@@ -43,9 +43,9 @@
<div class="card">
@if($userevent->resource_id !== null)
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $userevent->resource_id)->first()->filename) }}');">
<h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $userevent->name }}</h3>
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $userevent->name }}</h3>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
</div>
@else
<div class="header">