From a93addfb6d32ae714f286fdb3059d03fc4d533f1 Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Sat, 18 Jan 2020 00:45:07 +0100 Subject: [PATCH] Programmaschema met flexbox --- website/public/css/nhgooi.css | 42 ++++ website/resources/views/newslist.blade.php | 4 +- .../views/partial/nh_story.blade.php | 4 +- .../views/partial/radioscheduleweek.blade.php | 191 +++++++++++++++--- website/routes/web.php | 4 +- 5 files changed, 208 insertions(+), 37 deletions(-) diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css index f7873765..2f7a7488 100644 --- a/website/public/css/nhgooi.css +++ b/website/public/css/nhgooi.css @@ -71,6 +71,10 @@ button[disabled]:hover color: #1F3977; } +.post_details.simple li.category a.over_image { + color: white; +} + .post_details date.edited { font-weight: bold; } @@ -187,3 +191,41 @@ button[disabled]:hover background-color: transparent; } */ + +/* Responsiveness */ +@media (min-width: 576px) { + .d-sm-none { + display: none !important; + } + .d-md-only, .d-lg-only, .d-xl-only { + display: none !important; + } +} + +@media (min-width: 768px) { + .d-md-none { + display: none !important; + } + .d-sm-only, .d-lg-only, .d-xl-only { + display: none !important; + } +} + +@media (min-width: 992px) { + .d-lg-none { + display: none !important; + } + .d-sm-only, .d-md-only, .d-xl-only { + display: none !important; + } +} + +@media (min-width: 1200px) { + .d-xl-none { + display: none !important; + } + .d-sm-only, .d-md-only, .d-lg-only { + display: none !important; + } +} + diff --git a/website/resources/views/newslist.blade.php b/website/resources/views/newslist.blade.php index 076c7972..86f5ba24 100644 --- a/website/resources/views/newslist.blade.php +++ b/website/resources/views/newslist.blade.php @@ -30,7 +30,7 @@

{{$item->title}}

@@ -53,7 +53,7 @@
{{$item->title}}
diff --git a/website/resources/views/partial/nh_story.blade.php b/website/resources/views/partial/nh_story.blade.php index 6dd198ab..591502d4 100644 --- a/website/resources/views/partial/nh_story.blade.php +++ b/website/resources/views/partial/nh_story.blade.php @@ -17,12 +17,12 @@ @elseif($block->type == "quote")
{!!$block->text!!} -
{{$block->name}}
+
{{$block->name}}
@elseif($block->type == "image")
{{$block->image->title}} - {{$block->image->imageWide}} + {{$block->image->title}} © {{$block->image->author}}
@elseif($block->type == "video") @include('widgets/mediaplayer') diff --git a/website/resources/views/partial/radioscheduleweek.blade.php b/website/resources/views/partial/radioscheduleweek.blade.php index df2df645..9b7b7a51 100644 --- a/website/resources/views/partial/radioscheduleweek.blade.php +++ b/website/resources/views/partial/radioscheduleweek.blade.php @@ -1,3 +1,132 @@ + + + +
+
+
+ @for($h = 0; $h < 24; $h += 0.5) +
{{$time = gmdate("H:i", $h * 3600)}} uur
+ @endfor +
+ + + @php($date = null) + @php($now = new \DateTime("now")) + @foreach($schedule as $item) + @if(($formattedDate = Formatter::fullDate($item['starttime'], 'W d m')) != $date) + @if($date != null) +
+ @endif +
+
{{$formattedDate}}
+ @php($date = $formattedDate) + @endif + @php($diff = $item['endtime']->diff($item['starttime'])) + @php($duration = $diff->d * 24 + $diff->h + $diff->m / 60) + @php($isCurrent = ($now >= $item['starttime']) && ($now <= $item['endtime'])) + @php($class = ($item['program']->priority < 2 ? ' special' : '') + . ($item['program']->nonstop || $item['program']->rerun ? ' non-stop' : '') + . ($isCurrent ? ' current' : '')) + + +
{{$item['program']->name}}
+ @if($isCurrent)
Nu op NH Gooi
@endif +
+ {{Formatter::excerpt(strip_tags($item['program']->description), 150)}} +
+ + + @endforeach +
+ +
+ +
+ + - - - - @for($d = 0; $d < 7; ++$d) + + + + @for($d = 0; $d < 7; ++$d) @endfor - - - + + + @for($h = 0; $h < 24; $h += 0.5) @endif @endfor @endfor - +
{{$dates[$d]}}
@@ -55,48 +184,48 @@
{{$item['program']->name}} -
{!!Formatter::excerpt($item['program']->description, 200)!!}
- -
+
+ --> +
@php($date = null) @foreach($schedule as $item) @if(($formattedDate = Formatter::fullDate($item['starttime'], 'W d m')) != $date) - @php($date = $formattedDate) - @if($date != null) @endif -
{{$formattedDate}}
-
    + @php($date = $formattedDate) + @if($date != null)
@endif +
{{$formattedDate}}
+
    @endif - @php($isCurrent = ($now >= $item['starttime']) && ($now <= $item['endtime'])) - @php($class =( $item['program']->priority < 2 ? 'bg-primary' - :( $item['program']->nonstop || $item['program']->rerun ? 'text-muted' - :( $isCurrent ? 'bg-info active text-primary' - :( '' - ))))) + @php($isCurrent = ($now >= $item['starttime']) && ($now <= $item['endtime'])) + @php($class =( $item['program']->priority < 2 ? 'bg-primary' + :( $item['program']->nonstop || $item['program']->rerun ? 'text-muted' + :( $isCurrent ? 'bg-info active text-primary' + :( '' + ))))) -
  • +
  • {{$item['program']->name}} - @if($isCurrent) Nu op NH Gooi @endif -

    -

    {{Formatter::excerpt(strip_tags($item['program']->description), 200)}}

    - - + @if($isCurrent) Nu op NH Gooi @endif +

    +

    {{Formatter::excerpt(strip_tags($item['program']->description), 200)}}

    + + @endforeach -
+ diff --git a/website/routes/web.php b/website/routes/web.php index 4ad518bf..db1a950f 100644 --- a/website/routes/web.php +++ b/website/routes/web.php @@ -11,9 +11,9 @@ | */ -Route::get('/', function() { return redirect()->route('gemist'); }); +Route::get('/', function() { return redirect()->route('nieuws'); }); -Route::get('/nieuws', 'NewsController@overview'); +Route::get('/nieuws', ['as' => 'nieuws', 'uses' => 'NewsController@overview']); Route::get('/nieuws/regio/{region}', 'NewsController@regionlist' )->where(['region' => '[a-z0-9]+']); Route::get('/nieuws/thema/{theme}', 'NewsController@themelist' )->where(['themelist' => '[a-z0-9]+']); Route::get('/nieuws/{id}/{title}', 'NewsController@show')->where(['id' => '\d+']);