Paar kleine fixes
This commit is contained in:
11
website/.env
11
website/.env
@@ -1,9 +1,10 @@
|
|||||||
APP_NAME="NH Gooi"
|
APP_NAME="NH Gooi"
|
||||||
APP_ENV=development
|
APP_ENV=development
|
||||||
APP_KEY=I@#323ddu3dN(@#d(NU@#U2ij2dd4RJE
|
APP_KEY=I@#323ddu3dN(@#d(NU@#U2ij2dd4RJE
|
||||||
APP_DEBUG=true
|
APP_DEBUG=false
|
||||||
APP_LOG_LEVEL=error
|
APP_LOG_LEVEL=error
|
||||||
APP_URL=http://localhost
|
APP_URL=http://localhost
|
||||||
|
IMAGE_BASE_URL=https://nhgooi.nl/
|
||||||
|
|
||||||
API_URL=http://api-dev.6fm.nl/
|
API_URL=http://api-dev.6fm.nl/
|
||||||
|
|
||||||
@@ -26,3 +27,11 @@ MAIL_ENCRYPTION=null
|
|||||||
PUSHER_APP_ID=
|
PUSHER_APP_ID=
|
||||||
PUSHER_APP_KEY=
|
PUSHER_APP_KEY=
|
||||||
PUSHER_APP_SECRET=
|
PUSHER_APP_SECRET=
|
||||||
|
|
||||||
|
DB_CONNECTION=mysql
|
||||||
|
DB_HOST=www.6fm.nl
|
||||||
|
DB_PORT=3306
|
||||||
|
DB_DATABASE=radio6fm_web
|
||||||
|
DB_USERNAME=6fmstats
|
||||||
|
DB_PASSWORD=C6h938EJ2cd5p4cT
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class Controller extends BaseController
|
|||||||
{
|
{
|
||||||
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
|
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
|
||||||
|
|
||||||
protected $API_URL;
|
protected $API_URL;
|
||||||
|
|
||||||
private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0)
|
private function getDataFromFileAndConvert($file, $path, $class, $maxItems = 0)
|
||||||
{
|
{
|
||||||
@@ -34,6 +34,7 @@ class Controller extends BaseController
|
|||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
View::share('apiUrl', $this->API_URL = env('API_URL', 'http://api.6fm.nl/'));
|
View::share('apiUrl', $this->API_URL = env('API_URL', 'http://api.6fm.nl/'));
|
||||||
|
View::share('imgBase', env('IMAGE_BASE_URL', '/'));
|
||||||
//View::share('onAir', file_get_contents(url('onair')));
|
//View::share('onAir', file_get_contents(url('onair')));
|
||||||
View::composer('widgets.laatstenieuws', function($view) {
|
View::composer('widgets.laatstenieuws', function($view) {
|
||||||
$view->with('data', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'));
|
$view->with('data', $this->getDataFromFileAndConvert('laatste_nieuws.json', ['news'], '\Model\NewsItem'));
|
||||||
@@ -66,9 +67,9 @@ class Controller extends BaseController
|
|||||||
|
|
||||||
protected function registerView(Request $request, $type, $id)
|
protected function registerView(Request $request, $type, $id)
|
||||||
{
|
{
|
||||||
if(config('app.debug')) {
|
if(config('app.debug')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)', [
|
app('db')->insert('INSERT INTO `pagestats`(`type`, `item_id`, `visitor_ip`, `session`, `referer`) VALUES(:type, :id, :ip, :session, :referer)', [
|
||||||
'type' => $type,
|
'type' => $type,
|
||||||
|
|||||||
2
website/public/css/nhgooi.css
vendored
2
website/public/css/nhgooi.css
vendored
@@ -9,7 +9,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@media screen and (max-width:1069px) {
|
@media screen and (max-width:767px) {
|
||||||
.row .column {
|
.row .column {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@php($imgBase = 'https://nhgooi.nl')
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="post single small_image">
|
<div class="post single small_image">
|
||||||
|
|||||||
@@ -26,7 +26,6 @@
|
|||||||
<h4 class="box_header page_margin_top_section">Komende week</h4>
|
<h4 class="box_header page_margin_top_section">Komende week</h4>
|
||||||
<ul class="blog big">
|
<ul class="blog big">
|
||||||
|
|
||||||
@php($imgBase = 'https://nhgooi.nl')
|
|
||||||
@php($nextWeek = new \DateTimeImmutable('midnight +7 days'))
|
@php($nextWeek = new \DateTimeImmutable('midnight +7 days'))
|
||||||
@php($heading = null)
|
@php($heading = null)
|
||||||
@php($month = 0)
|
@php($month = 0)
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@php($imgBase = 'https://nhgooi.nl')
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="post single small_image">
|
<div class="post single small_image">
|
||||||
|
|||||||
@@ -16,9 +16,8 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@php($imgBase = 'https://nhgooi.nl')
|
|
||||||
|
|
||||||
@yield('breadcrumb')
|
@yield('breadcrumb')
|
||||||
|
|
||||||
<div class="page_layout page_margin_top clearfix">
|
<div class="page_layout page_margin_top clearfix">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@@ -96,7 +95,9 @@
|
|||||||
<a title="Regio: {{$item->region->title}}" href="{{url('nieuws/regio/' . $item->region->slug)}}" class="over_image">{{$item->region->title}}</a>
|
<a title="Regio: {{$item->region->title}}" href="{{url('nieuws/regio/' . $item->region->slug)}}" class="over_image">{{$item->region->title}}</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h2><a href="{{url($item->url)}}" title="{{$item->title}}">{{$item->title}}</a></h2>
|
<h2 style="display:none;"><a href="{{url($item->url)}}" title="{{$item->title}}">{{Formatter::excerpt($item->title, 50)}}</a></h2>
|
||||||
|
<h5><a href="{{url($item->url)}}" title="sfd">{{$item->title}}</a></h5>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
@php($imgBase = 'https://nhgooi.nl')
|
|
||||||
@foreach($news as $item)
|
@foreach($news as $item)
|
||||||
@if($loop->index % 3 == 0)
|
@if($loop->index % 3 == 0)
|
||||||
<div class="row grid">
|
<div class="row grid">
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ $(".vertical_carousel").each(function() {
|
|||||||
<div class="row page_margin_top">
|
<div class="row page_margin_top">
|
||||||
<div class="column column_2_3">
|
<div class="column column_2_3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="post single">
|
<div class="post single small_image">
|
||||||
<h1>Fragment gemist</h1>
|
<h1>Fragment gemist</h1>
|
||||||
<ul class="post_details clearfix">
|
<ul class="post_details clearfix">
|
||||||
@if($podcast->program)
|
@if($podcast->program)
|
||||||
@@ -88,15 +88,30 @@ $(".vertical_carousel").each(function() {
|
|||||||
<li class="detail date">{{ Formatter::relativeDate($podcast->created) }}</li>
|
<li class="detail date">{{ Formatter::relativeDate($podcast->created) }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="post_content page_margin_top_section clearfix">
|
<div class="announcement">
|
||||||
|
<audio controls autoplay="true">
|
||||||
|
<source src="{{$audioUrl}}" type="audio/mpeg" />
|
||||||
|
</audio>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="content_box">
|
||||||
|
|
||||||
|
@if($podcast->image)
|
||||||
|
<div class="post_image_box">
|
||||||
|
<a href="{{$imgBase . $podcast->image->url}}" class="post_image prettyPhoto" title="{{$podcast->image->title}}">
|
||||||
|
<img src="{{$imgBase . $podcast->image->url}}" title="{{$podcast->image->title}}" style="display: block;"/>
|
||||||
|
</a>
|
||||||
|
<div class="sentence">
|
||||||
|
<span class="text">{{$podcast->image->title}}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
<div class="post_content page_margin_top_section ">
|
||||||
<h3>{!!$podcast->content!!}</h3>
|
<h3>{!!$podcast->content!!}</h3>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<p>
|
|
||||||
<audio controls autoplay="true">
|
<div class="clearfix"></div>
|
||||||
<source src="{{$audioUrl}}" type="audio/mpeg" />
|
|
||||||
</audio>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div class="row page_margin_top">
|
<div class="row page_margin_top">
|
||||||
<div class="share_box clearfix">
|
<div class="share_box clearfix">
|
||||||
@@ -159,6 +174,8 @@ $(".vertical_carousel").each(function() {
|
|||||||
-->
|
-->
|
||||||
</div>
|
</div>
|
||||||
<div class="column column_1_3">
|
<div class="column column_1_3">
|
||||||
|
|
||||||
|
|
||||||
@if(count($related) > 1)
|
@if(count($related) > 1)
|
||||||
<h4 class="box_header page_margin_top_section">Meer uit deze uitzending</h4>
|
<h4 class="box_header page_margin_top_section">Meer uit deze uitzending</h4>
|
||||||
<div class="vertical_carousel_container clearfix">
|
<div class="vertical_carousel_container clearfix">
|
||||||
@@ -184,6 +201,7 @@ $(".vertical_carousel").each(function() {
|
|||||||
<a href="{{url('radio/gemist/programma' . $podcast->program->url)}}" class="more">Meer {{$podcast->program->name}}</a>
|
<a href="{{url('radio/gemist/programma' . $podcast->program->url)}}" class="more">Meer {{$podcast->program->name}}</a>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
||||||
<h4 class="box_header page_margin_top_section">Meer fragmenten</h4>
|
<h4 class="box_header page_margin_top_section">Meer fragmenten</h4>
|
||||||
<nav>
|
<nav>
|
||||||
<ul class="blog podcasts">
|
<ul class="blog podcasts">
|
||||||
|
|||||||
@@ -9,7 +9,9 @@
|
|||||||
<a href="{{url('radio/gemist/fragment/' . $podcast->url)}}" title="{{$podcast->title}}">{{$podcast->title}}</a>
|
<a href="{{url('radio/gemist/fragment/' . $podcast->url)}}" title="{{$podcast->title}}">{{$podcast->title}}</a>
|
||||||
</h5>
|
</h5>
|
||||||
<ul class="post_details simple">
|
<ul class="post_details simple">
|
||||||
|
@if($podcast->program)
|
||||||
<li class="category"><a href="{{url('radio/gemist/programma' . $podcast->program->url)}}" title="{{$podcast->program->name}}">{{$podcast->program->name}}</a></li>
|
<li class="category"><a href="{{url('radio/gemist/programma' . $podcast->program->url)}}" title="{{$podcast->program->name}}">{{$podcast->program->name}}</a></li>
|
||||||
|
@endif
|
||||||
<li class="date">
|
<li class="date">
|
||||||
{{Formatter::relativeDate($podcast->created)}}
|
{{Formatter::relativeDate($podcast->created)}}
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
"Regioagenda" => "/agenda",
|
"Regioagenda" => "/agenda",
|
||||||
"Contact" => "/contact");
|
"Contact" => "/contact");
|
||||||
?>
|
?>
|
||||||
@php($imgBase = 'https://nhgooi.nl')
|
|
||||||
<?php
|
<?php
|
||||||
function isActive($link, $checksubmenus) {
|
function isActive($link, $checksubmenus) {
|
||||||
if(is_array($link)) {
|
if(is_array($link)) {
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
@php($imgBase = '//nhgooi.nl')
|
|
||||||
<div class="vertical_carousel_container clearfix">
|
<div class="vertical_carousel_container clearfix">
|
||||||
<ul class="blog small vertical_carousel autoplay-1 scroll-1 navigation-1 easing-easeInOutQuint duration-750">
|
<ul class="blog small vertical_carousel autoplay-1 scroll-1 navigation-1 easing-easeInOutQuint duration-750">
|
||||||
@foreach($data as $news)
|
@foreach($data as $news)
|
||||||
|
|||||||
Reference in New Issue
Block a user