diff --git a/.hgignore b/.hgignore index 72747275..1f45e676 100644 --- a/.hgignore +++ b/.hgignore @@ -1,2 +1 @@ -website/storage/framework -website/storage/logs +glob:website/storage diff --git a/website/app/Http/Controllers/NewsController.php b/website/app/Http/Controllers/NewsController.php index 07e37dc4..5fd961dd 100644 --- a/website/app/Http/Controllers/NewsController.php +++ b/website/app/Http/Controllers/NewsController.php @@ -11,9 +11,18 @@ class NewsController extends Controller { parent::registerView($request, 'nieuws', $id); $apiResult = $this->API('nieuws/bericht/' . $id); - $newsItem = new \Model\NewsItem($apiResult); - return view('newsitem', ['news' => $newsItem, 'meta_featuredImage' => count($newsItem->images) ? $newsItem->images[0]->url : null]); + switch($apiResult->version) { + case 1: + $newsItem = new \Model\NewsItem($apiResult->news); + return view('newsitem', ['news' => $newsItem, 'meta_featuredImage' => count($newsItem->images) ? $newsItem->images[0]->url : null]); + break; + + case 2: + $newsItem = $apiResult->news; + $newsItem->published = new \DateTimeImmutable('@' . $newsItem->created); + return view('newsitem_nh', ['news' => $newsItem, 'podcast' => $apiResult->podcast]); + } } public function overview(Request $request) diff --git a/website/resources/views/newsitem_nh.blade.php b/website/resources/views/newsitem_nh.blade.php new file mode 100644 index 00000000..077543b2 --- /dev/null +++ b/website/resources/views/newsitem_nh.blade.php @@ -0,0 +1,98 @@ +@extends('page') + +@section('title') + Nieuws | {{$news->title}} +@endsection + +@include('_mediaplayer') + +@section('content') +
+
+
+ + {{Formatter::relativeDate($news->published)}}, {{$news->published->format("H:i")}} + +
+ +
+ +

{{$news->title}}

+{{-- +@if($news->media && count($news->media) > 0) +@if(!$news->media[0]->title) @php($news->media[0]->title = $news->title) @endif +
+
+
+
+ {{strip_tags($news->media[0]->title)}} + {{$news->media[0]->title}} +
+
+ +
+ +
+@if(count($news->media) > 1) @foreach($news->media as $image) +
+ {{strip_tags($image->title)}} +
+@endforeach @endif +
+ +
+ + +@endif +--}} + + @foreach($news->blocks as $block) + @if($block->type == "text") + {!!$block->text!!} + @elseif($block->type == "intro") +
{!!$block->text!!}
+ @elseif($block->type == "quote") +
+ {!!$block->text!!} +
{{$block->name}}
+
+ @elseif($block->type == "image") +
+ {{$block->image->title}} + {{$block->image->imageWide}} +
+ @elseif($block->type == "video") + + {{$block->video->author}} + @endif + @endforeach + + @if($podcast) +
+

Fragment

+

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

+

+ +

+

Meer over dit fragment

+
+ @endif +
+ + +
+
+
+ Correctie melden +
+
+
+ +@endsection + diff --git a/website/resources/views/newslistitems.blade.php b/website/resources/views/newslistitems.blade.php index 7f3060e7..00bcc86e 100644 --- a/website/resources/views/newslistitems.blade.php +++ b/website/resources/views/newslistitems.blade.php @@ -1,7 +1,7 @@
@php($i = 0) @foreach($news as $newsItem) - @php($image = count($newsItem->images) ? $newsItem->images[0] : null) + @php($image = isset($newsItem->images) && count($newsItem->images) ? $newsItem->images[0] : null)
diff --git a/website/resources/views/radioschedule.blade.php b/website/resources/views/radioschedule.blade.php index dcab4515..bc17ed0a 100644 --- a/website/resources/views/radioschedule.blade.php +++ b/website/resources/views/radioschedule.blade.php @@ -28,35 +28,1352 @@