diff --git a/website/app/Http/Controllers/RadioController.php b/website/app/Http/Controllers/RadioController.php index 7e7f383c..e346948b 100644 --- a/website/app/Http/Controllers/RadioController.php +++ b/website/app/Http/Controllers/RadioController.php @@ -19,6 +19,7 @@ class RadioController extends Controller $schedule[] = [ 'starttime' => self::JsonToDateTime($program->start), 'endtime' => self::JsonToDateTime($program->end), + 'shift' => (int)$shiftWeeks, 'program' => new \Model\Program($program->program) ]; } diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css index 2f7a7488..e8861c0a 100644 --- a/website/public/css/nhgooi.css +++ b/website/public/css/nhgooi.css @@ -15,6 +15,18 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a } } +.page_header_left { + width: auto; + float: none; + clear: both; +} + +.page_header_right { + float: right; + clear: both; + margin-top: -2em; +} + .tabs_navigation li a:hover, .tabs_navigation li a.selected, .tabs_navigation li.ui-tabs-active a { @@ -107,6 +119,10 @@ button[disabled]:hover width: 100%; } +.post.no_img .post_content { + width: 100%; +} + .action_button { position: relative; @@ -165,67 +181,4 @@ button[disabled]:hover background-color: #E4E4E4; } -/* -.action_button span { - display: inline-block; - line-height: 29px; - height: 29px; - font-size: 12px; - font-weight: bold; -} - -.action_button :not(.fa) { - padding: 0 10px 0 12px !important; -} - -.action_button .fa { - width: 29px; - background-color: #1F3977; - text-align: center; - vertical-align: middle; - color: white; -} - -.action_button:hover span, .action_button:hover .fa { - transition: 500ms; - 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/calendarevent.blade.php b/website/resources/views/calendarevent.blade.php index f5615b80..271419f0 100644 --- a/website/resources/views/calendarevent.blade.php +++ b/website/resources/views/calendarevent.blade.php @@ -1,65 +1,113 @@ -@extends('layouts/full') +@extends('layouts/sidebar') @section('title') - Regioagenda | {{$event->title}} + {{$event->title}} @endsection +@section('breadcrumb') + +@endsection @section('content') -@parent -
-
-
- - {{Formatter::relativeDate($event->starts, 'W d m y?')}} @if($event->ends && $event->starts != $event->ends) t/m {{Formatter::relativeDate($event->ends, 'd m y?')}} @endif - -
+@php($imgBase = 'https://nhgooi.nl') -
+
+
+
    + @if($event->region && $event->region != "Regio") +
  • Regio {{$event->region}}
    • + @endif +
  • + {{Formatter::relativeDate($event->starts, 'W d m y?')}} + @if($event->ends && $event->starts != $event->ends) + t/m {{Formatter::relativeDate($event->ends, 'd m y?')}} + @endif +
    • +
-

{{$event->title}}

-@if($event->images && count($event->images) > 0) -@if(!$event->images[0]->title) @php($event->images[0]->title = $event->title) @endif -
-
+ @if($event->podcast) + @include('widgets/mediaplayer') +
-
- {{strip_tags($event->images[0]->title)}} - {{$event->images[0]->title}} -
+
+ +
+ @endif -
- -
-@if(count($event->images) > 1) @foreach($event->images as $image) -
- {{strip_tags($image->title)}} -
-@endforeach @endif -
- -
- +
+
+ @if($event->images) + @if(count($event->images) == 1) +
+ + {{$event->images[0]->title}} + +
+ {{$event->images[0]->title}} + @if(isset($event->images[0]->author)) + {{$event->images[0]->author}} + @endif +
-@endif -

- {{$event->region}} - {!!$event->content!!} -

+ @else +
+
    + @foreach($event->images as $image) +
  • + +
    • + @endforeach +
+
+
+
    + @foreach($event->images as $image) +
  • + + + {{$image->title}} + +
    • +
+ @endforeach +
+ @endif + @endif + + @if(is_array($event->content)) + @include('partial/nh_story', ['content' => $event->content]); + @else +
+

{!!$event->content!!}

+
+ @endif + + @include('widgets/share') +
+
+
+
+ - @if($event->podcast) -
-

Fragment

-

{{ Formatter::relativeDate($event->podcast->created) }} uitgezonden @if($event->podcast->program) in {{ $event->podcast->program->name }} @endif

-

- -

-

Meer over dit fragment

-
- @endif @endsection - + + diff --git a/website/resources/views/calendarlist.blade.php b/website/resources/views/calendarlist.blade.php index 8e0406b6..b07b127a 100644 --- a/website/resources/views/calendarlist.blade.php +++ b/website/resources/views/calendarlist.blade.php @@ -1,4 +1,4 @@ -@extends('layouts/full') +@extends('layouts/sidebar') @section('title') Regioagenda @@ -13,59 +13,97 @@ -
-

Komende week

-@php($nextWeek = new \DateTimeImmutable('midnight +7 days')) -@php($heading = null) -@php($month = 0) +
+
+

Komende week

+
    -@foreach($events as $event) -@if($event->starts >= ($heading ? $heading : $nextWeek)) -
-
-

{{$heading ? "De agenda van" : "De rest van"}} {{Formatter::fullDate($event->starts, 'm y?')}}

- @php($heading = new \DateTimeImmutable('first day of next month ' . $event->starts->format('Y-m-d'))) -@endif -
- @php($image = isset($event->images) && count($event->images) ? $event->images[0] : null) - -
-

{{$event->title}}

-
- {{Formatter::relativeDate($event->starts, 'W d m y?')}} @if($event->ends && $event->starts != $event->ends) t/m {{Formatter::relativeDate($event->ends, 'd m y?')}} @endif -
- {{$event->region}}. {!!Formatter::excerpt($event->content, 250)!!} -

Lees verder -

-
-@endforeach -
+ @php($imgBase = 'https://nhgooi.nl') + @php($nextWeek = new \DateTimeImmutable('midnight +7 days')) + @php($heading = null) + @php($month = 0) + @foreach($events as $event) + @if($event->starts >= ($heading ? $heading : $nextWeek)) + +
+
+
+
+

{{$heading ? "De agenda van" : "De rest van"}} {{Formatter::fullDate($event->starts, 'm y?')}}

+
    + @php($heading = new \DateTimeImmutable('first day of next month ' . $event->starts->format('Y-m-d'))) + @endif + + @php($image = isset($event->images) && count($event->images) ? $event->images[0] : null) +
  • + @if($image) + + {{$image->title}} + + @endif +
    +

    {{$event->title}}

    +
      +
    • {{$event->region}}
      • +
    • + {{Formatter::relativeDate($event->starts, 'W d m y?')}} + @if($event->ends && $event->starts != $event->ends) + t/m {{Formatter::relativeDate($event->ends, 'd m y?')}} + @endif +
      • +
    +

    {!!Formatter::excerpt($event->content, 250)!!}

    + Lees verder +
    +
    • + @endforeach +
+
+
{{--row--}} +@endsection +@push('styles') + +@endpush + +@push('scripts') @endif -@endsection +@endpush diff --git a/website/resources/views/layouts/full.blade.php b/website/resources/views/layouts/full.blade.php index 2a7318a5..af812f44 100644 --- a/website/resources/views/layouts/full.blade.php +++ b/website/resources/views/layouts/full.blade.php @@ -1,8 +1,16 @@ @extends('layouts/master') -@section('content') -
+@section('page') +
-

@yield('title')

+
+

@yield('title')

+
+
+ @yield('breadcrumb') +
+
+
+ @yield('content')
@endsection diff --git a/website/resources/views/layouts/master.blade.php b/website/resources/views/layouts/master.blade.php index 0adafded..efbb616c 100644 --- a/website/resources/views/layouts/master.blade.php +++ b/website/resources/views/layouts/master.blade.php @@ -276,16 +276,16 @@ - +