From a740bdfe96932085a3dc868a8dcf117fdc8a709a Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Tue, 21 Jan 2020 00:06:51 +0100 Subject: [PATCH] Bugfix radioprogrammas niet op hele uren --- .../resources/views/partial/radioscheduleweek.blade.php | 4 ++-- website/resources/views/radioschedule.blade.php | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/website/resources/views/partial/radioscheduleweek.blade.php b/website/resources/views/partial/radioscheduleweek.blade.php index d061c033..0e6cffc3 100644 --- a/website/resources/views/partial/radioscheduleweek.blade.php +++ b/website/resources/views/partial/radioscheduleweek.blade.php @@ -14,7 +14,7 @@ @php($now = new \DateTime("now")) @foreach($schedule as $item) @php($diff = $item['endtime']->diff($item['starttime'])) - @php($duration = $diff->d * 24 + $diff->h + $diff->m / 60) + @php($duration = $diff->d * 24 + $diff->h + $diff->i / 60) @php($isCurrent = ($now >= $item['starttime']) && ($now <= $item['endtime'])) @php($class = ($item['program']->priority < 2 ? ' special' : '') . ($item['program']->nonstop || $item['program']->rerun ? ' non-stop' : '') @@ -37,7 +37,7 @@
{{$item['program']->name}}
@if($isCurrent)
Nu op NH Gooi
@endif
-
{{$item['starttime']->format('H:i')}} – {{$item['endtime']->format('H:i')}} uur.
+
{{$item['starttime']->format('H:i')}} – {{$item['endtime']->format('H:i')}} uur.
{{Formatter::excerpt($item['program']->description, 150)}}
diff --git a/website/resources/views/radioschedule.blade.php b/website/resources/views/radioschedule.blade.php index e164e985..ec845dbc 100644 --- a/website/resources/views/radioschedule.blade.php +++ b/website/resources/views/radioschedule.blade.php @@ -144,8 +144,13 @@ } .schedule .program.non-stop { - color: #6c757d; + border-color: #6C757D; + color: #6C757D; } + + .schedule .program.non-stop .program-title { + background-color: #8F9BA6; + } .schedule .program.special { color: #03A6E0;