From 843e66be6a1473042b7343bcef573c710ca50a5e Mon Sep 17 00:00:00 2001
From: Mischa Spelt <mischa.spelt@nhgooi.nl>
Date: Mon, 23 Mar 2020 14:38:25 +0100
Subject: [PATCH] Balkje naar actief blog bovenaan

---
 app/Http/Controllers/Controller.php      |  7 ++++++-
 resources/views/layouts/master.blade.php |  6 ++++++
 resources/views/widgets/menu.blade.php   | 16 ++++++++--------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index cf673829..36e12b99 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -35,6 +35,12 @@ class Controller extends BaseController
     {
 		View::share('apiUrl', $this->API_URL = env('API_URL', 'http://api.6fm.nl/'));
 		View::share('imgBase', env('IMAGE_BASE_URL', '/'));
+
+		$blogs = $this->getDataFromFileAndConvert('blogs.json', [], '\Model\Blog', 1);
+		$activeBlog = count($blogs) && $blogs[0]->is_active ? $blogs[0] : null;
+		View::share('activeBlog', $activeBlog);
+
+
 		//View::share('onAir', file_get_contents(url('onair')));
 		View::composer('widgets.laatstenieuws', function($view) {
 			$view->with('data', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'));
@@ -77,7 +83,6 @@ class Controller extends BaseController
 		});
 		View::composer('widgets.menu', function($view) {
 			$view->with('news', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'))
-				->with('blogs', $this->getDataFromFileAndConvert('blogs.json', [], '\Model\Blog', 1))
 				->with('popular', $this->getDataFromFileAndConvert('populair_nieuws.json', [], '\Model\NewsItem', 3))
 				->with('podcasts', $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
 		});
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 68a0017f..fd024432 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -261,6 +261,12 @@
 
 <div class="page">
 	<a name="top"></a>
+	@if($activeBlog != null)
+		<p style="border: solid 1px #1f3977; border-radius: 10px; padding: 0 10px 0.4em 10px; margin: 10px 0 0 0;">
+		<b>Live-blog:</b> {{$activeBlog->title}}
+		<a href="{{$activeBlog->url}}" class="action_button" style="float: none; margin-left: 1em;"><span class="fa fa-rss"></span><span>Volg het live-blog</span></a>
+		</p>
+	@endif
 	@yield('page')
 </div><!--/.page-->
 
diff --git a/resources/views/widgets/menu.blade.php b/resources/views/widgets/menu.blade.php
index c324efe1..b0f82b89 100644
--- a/resources/views/widgets/menu.blade.php
+++ b/resources/views/widgets/menu.blade.php
@@ -66,10 +66,10 @@ function buildMenu($menu, $ismobile) {
 			Nieuws
 		</a>
 		<ul>
-			@if(count($blogs) && $blogs[0]->is_active)
-			<li class="{{isActive($blogs[0]->url, false) ? "selected" : ""}}">
-				<a href="{{url($blogs[0]->url)}}" title="Liveblog: {{$blogs[0]->title}}">
-					<b>Live-blog</b> | {{$blogs[0]->title}}
+			@if($activeBlog != null)
+			<li class="{{isActive($activeBlog->url, false) ? "selected" : ""}}">
+				<a href="{{url($activeBlog->url)}}" title="Liveblog: {{$activeBlog->title}}">
+					<b>Live-blog</b> | {{$activeBlog->title}}
 				</a>
 			</li>
 			@endif
@@ -168,10 +168,10 @@ function buildMenu($menu, $ismobile) {
 	<div class="mobile-menu-divider"></div>
 	<nav>
 	<ul class="mobile-menu">
-		@if(count($blogs) && $blogs[0]->is_active)
-		<li class="{{isActive($blogs[0]->url, false) ? "selected" : ""}}">
-			<a href="{{url($blogs[0]->url)}}" title="Liveblog: {{$blogs[0]->title}}">
-				<b>Live-blog</b> | {{$blogs[0]->title}}
+		@if($activeBlog != null)
+		<li class="{{isActive($activeBlog->url, false) ? "selected" : ""}}">
+			<a href="{{url($activeBlog->url)}}" title="Liveblog: {{$activeBlog->title}}">
+				<b>Live-blog</b> | {{$activeBlog->title}}
 			</a>
 		</li>
 		@endif