Merge remote-tracking branch 'origin/dev'

app/Http/Controllers/Controller.php

@@ -39,11 +39,6 @@ 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'));

resources/views/layouts/master.blade.php

@@ -93,13 +93,6 @@
 
     <div class="page @yield('page_container_class')">
         <a name="top"></a>
-        @if($activeBlog != null)
-            <p style="float: left; border: solid 1px #1f3977; border-radius: 10px; padding: 0 10px 0.4em 10px; margin: 10px 0 10px 0; width: 100%;">
-                <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-->