From 29a447005c117251bacde5d5d817b21f5999b504 Mon Sep 17 00:00:00 2001
From: Mischa Spelt <mischa.spelt@nhgooi.nl>
Date: Fri, 24 Jan 2020 20:51:04 +0100
Subject: [PATCH] Layoutwijzigingen minor

---
 website/public/css/nhgooi.css                   |  7 +++++--
 website/resources/views/newslist.blade.php      |  2 +-
 .../views/partial/newslist_small.blade.php      |  2 +-
 .../resources/views/partial/nh_story.blade.php  | 17 ++++++++++++-----
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css
index 02d7c62e..d5cbffb4 100644
--- a/website/public/css/nhgooi.css
+++ b/website/public/css/nhgooi.css
@@ -116,11 +116,14 @@ button[disabled]:hover
 }
 
 .blog_grid .post.large {
-    height: 526px; /* small items have 2 x 2px margin, so 3 * 174 + 2 * 2 */
+    /* Width is 787px, so ensure largest photo has 16:9 ratio. */
+    height: 442px;
 }
 
 .blog_grid .post.small {
-    height: 174px;
+    /* Height of main is 442, minus two 2px margins, leaves 146px per item */
+    height: 146px;
+    overflow: hidden;
 }
 
 .blog.podcasts .post {
diff --git a/website/resources/views/newslist.blade.php b/website/resources/views/newslist.blade.php
index eaec05c1..8e2aa0a2 100644
--- a/website/resources/views/newslist.blade.php
+++ b/website/resources/views/newslist.blade.php
@@ -149,7 +149,7 @@
 				@endforeach
 
 				<div id="items">
-					@include('partial/newslist_small', array_slice($news, 10, count($news)))
+					@include('partial/newslist_small', ['news' => array_slice($news, 11, count($news))])
 				</div>
 
 				<div>
diff --git a/website/resources/views/partial/newslist_small.blade.php b/website/resources/views/partial/newslist_small.blade.php
index f5d43349..55374486 100644
--- a/website/resources/views/partial/newslist_small.blade.php
+++ b/website/resources/views/partial/newslist_small.blade.php
@@ -33,7 +33,7 @@
 				</ul>
 			</div>
 		</li>
-@if($loop->index % 3 == 2)
+@if($loop->index % 3 == 2 || $loop->last)
 	</ul>
 </div>
 @endif
diff --git a/website/resources/views/partial/nh_story.blade.php b/website/resources/views/partial/nh_story.blade.php
index 591502d4..ed955ca0 100644
--- a/website/resources/views/partial/nh_story.blade.php
+++ b/website/resources/views/partial/nh_story.blade.php
@@ -20,17 +20,24 @@
 			<div class="author">{{$block->name}}</div>	
 		</blockquote>
 	@elseif($block->type == "image") 
-		<div class="mediabox-image">
-			<img src="{{$block->image->imageWide}}" alt="{{$block->image->title}}" title="{{$block->image->title}} &copy;{{$block->image->author}}"/>
-			<span class="mediabox-image-title">{{$block->image->title}} &copy; {{$block->image->author}}</span>
+		<a class="post_image page_margin_top prettyPhoto" href="{{$block->image->imageWide}}" title="{{$block->image->title}} &copy; {{$block->image->author}}">
+			<img src="{{$block->image->imageWide}}" class="attachment-small-slider-thumb size-small-slider-thumb wp-post-image" alt="{{$block->image->title}}" title="" style="display: block;">
+		</a>
+		<div class="sentence">
+			@if($block->image->title)
+			<span class="text">{{$block->image->title}}</span>
+			@endif
+			@if($block->image->author)
+			<span class="author">{{$block->image->author}}</span>
+			@endif
 		</div>
 	@elseif($block->type == "video")
 		@include('widgets/mediaplayer')
 		<video controls>
 		@foreach($block->video->streams as $stream)
-        	<source src="{!!$stream->stream_url!!}" type="application/x-mpegurl" /> 
+			<source src="{!!$stream->stream_url!!}" type="application/x-mpegurl" /> 
 		@endforeach
-        </video>
+		</video>
 		<span class="author">{{$block->video->author}}</span>
 	@endif
 @endforeach