NH_Gooi/nhgooi.nl
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add favicon

Browse Source 
Change logo
Add luister and kijk icons
Tip de streekredactie points to whatsapp 088-8505651
Add s to Podcast
Removed waterschapsverkiezingen from menu
Podcast autoplay disabled
Remove Gooische Courant and NH Nieuws
Changed NH Gooi to Over NH Gooi
Added padding and border-radios to homepage posts
Changed header 12px to 14px
Add now and next programs to homepage
Add new button to programs
Changed contact text
Add fallback image to program guide
Make items height equally in program guide
This commit is contained in:
Jorit Tijsen
2024-04-02 17:42:39 +02:00
parent cdd394a8d4
commit 249f7a7d4c
40 changed files with 700 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/sass/components/_blog.scss vendored
View File

@@ -6,6 +6,7 @@
.post {
margin-bottom: 27px;
height: 90px;
img {
width: 100%;
@@ -24,6 +25,10 @@
text-decoration: none;
display: inline-block;
color: $text-color;
&.clipText {
display: -webkit-box;
}
}
}

3
resources/assets/sass/components/_box.scss vendored
View File

@@ -37,6 +37,9 @@
&.full-width {
width: CALC(100% - 60px);
}
&.full-height {
height: CALC(100% - 103px);
}
&.margin_top {
margin-top: 80px;
}

6
resources/assets/sass/components/_main_news.scss vendored
View File

@@ -33,9 +33,10 @@
}
.post {
position: relative;
height: 100%;
height: CALC(100% - 10px);
padding: 5px;
@media (max-width: 768px) {
height: 50%;
height: CALC(50% - 10px);
}
img {
@@ -43,6 +44,7 @@
height: 100%;
object-fit: cover;
filter: brightness(70%);
border-radius: 3px;
}
&.small {

24
resources/assets/sass/components/_menu.scss vendored
View File

@@ -109,17 +109,19 @@
li {
float: left;
padding: 6px 19px;
padding: 0 19px;
margin: 8px;
border-right: 1px solid #fff;
border-right: 1px solid rgba(255, 255, 255, 0.2);
line-height: 2;
&:last-child {
border: none;
line-height: 1;
}
&:nth-child(2) {
/*&:nth-child(2) {
padding: 0 19px;
}
}*/
a {
float: left;
@@ -131,6 +133,20 @@
text-decoration: none;
text-transform: uppercase;
&.with_svg_icon {
position: relative;
margin-right: 30px;
}
svg {
fill: $text-inverted-color;
height: 20px;
width: 20px;
position: absolute;
right: -25px;
top: 2px;
}
i {
font-size: 18px;
position: relative;

14
resources/assets/sass/components/_radio_box.scss vendored
View File

@@ -6,11 +6,23 @@
width: CALC(100% - 38px);
h2 {
font-family: Montserrat, serif;
font-size: 20px;
}
h3 {
font-size: 18px;
}
.post_title {
font-family: Montserrat, serif;
font-weight: 600;
line-height: 1.35;
color: $text-color;
a {
text-decoration: none;
color: $text-color;
}
}
.post_date {

5
resources/assets/sass/components/_schedule.scss vendored
View File

@@ -15,6 +15,11 @@
.program-times {
@include post_date;
}
img {
margin-left: -30px;
margin-top: -30px;
width: CALC(100% + 54px);
}
.no-results, .loading {
font-family: Montserrat, serif;
font-size: 14px;

8
resources/views/home.blade.php
View File

@@ -146,14 +146,14 @@
<div class="row">
<div class="col-md-6 col-12">
<h4 class="box_header"><span>Meer nieuws</span></h4>
<div class="box">
<div class="box full-width">
@include('partial/newslist_small', ['id' => 'items-more-news', 'news' => array_slice($news, 5, 5)])
</div>
</div>
<div class="col-md-6 col-12">
<h4 class="box_header"><span>Meest gelezen</span></h4>
<div class="box">
<div class="box full-width">
@include('partial/newslist_small', ['id' => 'items-most-read', 'news' => $populair])
</div>
</div>
@@ -199,7 +199,7 @@
</div>
<div class="col-12 col-md-auto sidebar">
@include('widgets/nhgooiradiotv', ['headerClass' => 'extra_small'])
@include('widgets/nhgooiradiotv', ['headerClass' => 'small'])
@include('widgets/contact', [])
@@ -209,7 +209,7 @@
<div style="width: 100%;height: 275px;margin: 11px auto 50px auto;background-color: #efefef;"></div>
<div class="podcast_items">
<h4 class="box_header extra_small"><span>Fragment gemist</span></h4>
<h4 class="box_header small"><span>Fragment gemist</span></h4>
<div class="box">
@include('partial/podcastitems', ['showTime' => false, 'showImage' => false, 'podcasts' => $podcasts])
</div>

6
resources/views/layouts/_head.blade.php
View File

@@ -34,7 +34,11 @@
->metaTags();
} ?>
@stack('styles')
<link rel="shortcut icon" href="/images/favicon.ico">
<link rel="shortcut icon" href="/favicon.ico">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<!--rss-->
<link rel="alternate" type="application/rss+xml" title="Abonneren op NH Gooi Nieuws" href="{{env('API_URL')}}rss/nieuws" />
<link rel="alternate" type="application/rss+xml" title="Abonneren op NH Gooi Fragment gemist" href="{{env('API_URL')}}rss/podcasts" />

23
resources/views/layouts/master.blade.php
View File

@@ -18,7 +18,7 @@
<div class="header_container small">
<div class="header clearfix">
<div class="logo">
<a href="{{url('/')}}"><img src="/images/logo-NHGooi.svg"/></a>
<a href="{{url('/')}}"><img src="/images/logo-NHGooi-slogan.svg"/></a>
</div>
<div class="advertisement" style="margin: 11px auto 0 auto;background-color: #efefef;"></div>
@@ -29,12 +29,18 @@
<a href="javascript:void(0)"><i class="fa-solid fa-bars"></i></a>
</div>
<div class="logo_mobile">
<a href="{{url('/')}}"><img src="/images/logo-NHGooi.svg"/></a>
<a href="{{url('/')}}"><img src="/images/logo-NHGooi-slogan.svg"/></a>
</div>
<div class="right_menu_container">
<ul class="right_menu">
<li>
<a href="{{url('contact')}}">Tip <i class="fa-solid fa-circle-plus"></i></a>
<a class="player with_svg_icon" href="{{url('luister/live')}}">{!!file_get_contents(__DIR__ . '/../../../public/images/icons/radio.svg')!!}</a>
</li>
<li>
<a class="player with_svg_icon" href="{{url('kijk/studio')}}">{!!file_get_contents(__DIR__ . '/../../../public/images/icons/television-2.svg')!!}</a>
</li>
<li>
<a href="https://wa.me/088-8505651">Tip <i class="fa-solid fa-circle-plus"></i></a>
</li>
@if(isset($searchURL))
<li>
@@ -55,7 +61,13 @@
<div class="top_menu_container d-none d-md-block">
<ul class="right_menu">
<li>
<a href="{{url('contact')}}">Tip de redactie <i class="fa-solid fa-circle-plus"></i></a>
<a class="player with_svg_icon" href="{{url('luister/live')}}">Luister live radio {!!file_get_contents(__DIR__ . '/../../../public/images/icons/radio.svg')!!}</a>
</li>
<li>
<a class="player with_svg_icon" href="{{url('kijk/studio')}}">Kijk live tv {!!file_get_contents(__DIR__ . '/../../../public/images/icons/television-2.svg')!!}</a>
</li>
<li>
<a href="https://wa.me/31888505651" target="_blank">Tip de streekredactie <i class="fa-solid fa-circle-plus"></i></a>
</li>
@if(isset($searchURL))
<li>
@@ -132,7 +144,7 @@
<div class="row">
<div class="col-12">
<ul class="footer_menu2">
<li><a href="{{url('/')}}" class="logo"><img src="/images/logo-NHGooi-diap.svg"/></a></li>
<li><a href="{{url('/')}}" class="logo"><img src="/images/logo-NHGooi-slogan-diap.svg"/></a></li>
<li><a href="{{url('disclaimer')}}">Disclaimer</a></li>
<li><a href="{{url('privacy-verklaring')}}">Privacy verklaring</a></li>
<li><a href="{{url('cookie-statement')}}">Cookie statement</a></li>
@@ -177,6 +189,7 @@
<script type="text/javascript" src="/js/odometer.min.js"></script>-->
<script type="text/javascript" src="/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="/js/jquery.prettyPhoto.js"></script>
<script type="text/javascript" src="/js/jquery.carouFredSel-6.2.1.min.js"></script>
<script type="text/javascript" src="/js/functions.js"></script>
<script type="text/javascript">
$(window).resize(function () {

6
resources/views/layouts/sidebar.blade.php
View File

@@ -19,12 +19,12 @@
<div class="tabs">
@if (isset($populair) && $populair)
<h4 data-tab-content-id="tab_most_read"
class="box_header extra_small flex-grow-1 active"><span>Meest gelezen</span>
class="box_header small flex-grow-1 active"><span>Meest gelezen</span>
</h4>
@endif
@if (isset($newsItems) && $newsItems)
<h4 data-tab-content-id="tab_more_news"
class="box_header extra_small{{!$populair? ' active' : ''}}">
class="box_header small{{!$populair? ' active' : ''}}">
<span>Meer nieuws</span></h4>
@endif
</div>
@@ -56,7 +56,7 @@
</div>
<div style="width: 100%;height: 275px;margin: 11px auto 50px auto;background-color: #efefef;"></div>
@include('widgets/nhgooiradiotv', ['headerClass' => 'extra_small'])
@include('widgets/nhgooiradiotv', ['headerClass' => 'small'])
@include('widgets/contact', [])
@show

4
resources/views/news.blade.php
View File

@@ -37,7 +37,7 @@
</div>
<div class="col-12 col-md-auto sidebar">
@include('widgets/nhgooiradiotv', ['headerClass' => 'extra_small'])
@include('widgets/nhgooiradiotv', ['headerClass' => 'small'])
@include('widgets/contact', [])
@@ -47,7 +47,7 @@
<div style="width: 100%;height: 275px;margin: 11px auto 50px auto;background-color: #efefef;"></div>
<div class="podcast_items">
<h4 class="box_header extra_small"><span>Fragment gemist</span></h4>
<h4 class="box_header small"><span>Fragment gemist</span></h4>
<div class="box">
@include('partial/podcastitems', ['showTime' => false, 'showImage' => false, 'podcasts' => $podcasts])
</div>

2
resources/views/partial/newslist_small.blade.php
View File

@@ -14,7 +14,7 @@
</a>
</div>
<div class="col-8">
<h2 class="post_title"><a href="{{url($item->url)}}"
<h2 class="post_title"><a class="clipText clipText-3" href="{{url($item->url)}}"
title="{{$item->title}}">{!!$item->title!!}</a></h2>
<?php
$time = Formatter::relativeDate($item->published) . ' om ' . $item->published->format('H:i');

3
resources/views/partial/radioscheduleweek.blade.php
View File

@@ -6,8 +6,9 @@
@foreach($schedule[$day] as $item)
@php($isCurrent = ($now >= $item['starttime']) && ($now <= $item['endtime']))
<div class="col-12 col-md-3">
<a class="box full-width" href="{{route('programma') . $item['program']->url}}"
<a class="box full-width full-height" href="{{route('programma') . $item['program']->url}}"
title="{{$item['program']->name . ($item['program']->tagline ? "\n" . $item['program']->tagline : "")}}">
<img src="{{$item['program']->image ?? 'images/noimage.png'}}">
<div class="program-title">
@if($isCurrent)
<div class="current-marker"><span>On air</span></div>

4
resources/views/podcastitem.blade.php
View File

@@ -106,7 +106,7 @@
</ul>
<div class="announcement">
<audio controls autoplay="true">
<audio controls autoplay="false">
<source src="{{$audioUrl}}" type="audio/mpeg"/>
</audio>
<div class="clearfix">
@@ -150,7 +150,7 @@
<div data-tabs>
<div class="tabs">
<h4 data-tab-content-id="tab_more_fragmenten"
class="box_header extra_small flex-grow-1 active"><span>Meer fragmenten</span>
class="box_header small flex-grow-1 active"><span>Meer fragmenten</span>
</h4>
</div>
<div id="tab_more_fragmenten" class="box tab_content podcast_items active">

2
resources/views/podcastlist.blade.php
View File

@@ -94,7 +94,7 @@
<div data-tabs>
<div class="tabs">
<h4 data-tab-content-id="tab_more_fragmenten"
class="box_header extra_small flex-grow-1 active"><span>Meer fragmenten</span>
class="box_header small flex-grow-1 active"><span>Meer fragmenten</span>
</h4>
</div>
<div id="tab_more_fragmenten" class="box tab_content podcast_items active">

2
resources/views/podcastseries.blade.php
View File

@@ -58,7 +58,7 @@
<div data-tabs>
<div class="tabs">
<h4 data-tab-content-id="tab_more_fragmenten"
class="box_header extra_small flex-grow-1 active"><span>Meer fragmenten</span>
class="box_header small flex-grow-1 active"><span>Meer fragmenten</span>
</h4>
</div>
<div id="tab_more_fragmenten" class="box tab_content podcast_items active">

2
resources/views/programlist.blade.php
View File

@@ -92,7 +92,7 @@
<div data-tabs>
<div class="tabs">
<h4 data-tab-content-id="tab_more_fragmenten"
class="box_header extra_small flex-grow-1 active"><span>Meer fragmenten</span>
class="box_header small flex-grow-1 active"><span>Meer fragmenten</span>
</h4>
</div>
<div id="tab_more_fragmenten" class="box tab_content podcast_items active">

6
resources/views/radioprogram.blade.php
View File

@@ -25,7 +25,7 @@
@section('sidebar')
@php($now = new \DateTimeImmutable())
<div id="komende_uitzendingen">
<h4 class="box_header extra_small"><span>Komende week</span></h4>
<h4 class="box_header small"><span>Komende week</span></h4>
@if(($next = $program->next) && count($next))
<div class="box full-width">
<ul class="blog podcasts">
@@ -62,9 +62,9 @@
<h4 class="box_header"><span>Terugluisteren</span></h4>
<div data-tabs>
<div class="tabs">
<h4 data-tab-content-id="tab_broadcast" class="box_header flex-grow-1 extra_small active">
<h4 data-tab-content-id="tab_broadcast" class="box_header flex-grow-1 small active">
<span>Uitzending</span></h4>
<h4 data-tab-content-id="tab_fragments" class="box_header extra_small"><span>Fragmenten</span></h4>
<h4 data-tab-content-id="tab_fragments" class="box_header small"><span>Fragmenten</span></h4>
</div>
<div id="tab_broadcast" class="box tab_content active">
<p class="page_body">U kunt uitzendingen tot twee weken geleden terugluisteren. <a href="#fragmenten">Fragmenten</a>

7
resources/views/widgets/contact.blade.php
View File

@@ -1,8 +1,9 @@
<div class="box contact_box">
<img class="logo-whatsapp" src="/images/logo-whatsapp.png"/>
<h2>Contact met de redactie</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc vestibulum tincidunt ante id
tincidunt. Cras tempus imperdiet enim ut eleifend. Donec mi nunc, molestie efficitur volutpat
eu, pretium in enim. Vivamus suscipit massa at urna mollis.</p>
<p>Heb jij een tip voor onze streekredactie? Bel of app de tiplijn:
<a href="tel:06 - 42 91 36 37" target="_blank">06 - 42 91 36 37</a>, stuur een
<a href="mailto:info@nhgooi.nl">mail</a> of kom lang op de Gooise Brink,
Kerkstraat 63/27 in Hilversum</p>
<a class="read_more" href="{{url('contact')}}">Lees meer <i class="fa-solid fa-angle-right"></i></a>
</div>

13
resources/views/widgets/menu.blade.php
View File

@@ -20,27 +20,20 @@
// "Winterse 50 (25 december)" => "/programma/1080/winterse-50",
// "Vroeger of Later Luisterlijst (2 januari)" => "/vol-luisterlijst"),
"App" => "/app",
"Podcast" => array(
"Podcasts" => array(
"" => "/podcast",
"Waterschapsverkiezing 2023" => "/podcast/fragment/1356528/podcast-waterschapsverkiezingen-2023.mp3",
"NH Gooi Spreekuur" => "/podcast/1091/nh-gooi-spreekuur",
"Duurzaam Gooi" => "/podcast/1076/podcast-duurzaam-gooi"
),
"Regioagenda" => "/agenda",
"NH Gooi" => array(
"Over NH Gooi" => array(
"" => "/contact",
"Gooische courant" => array(
"Editie 2" => "/uploads/Gooische Courant editie 2.pdf",
"Editie 1 (Huizen)" => "/uploads/NH Gooi Huizen.pdf",
"Editie 1 (Hilversum)" => "/uploads/NH Gooi Hilversum.pdf",
),
"Contact" => "/contact",
// "Vacatures" => "/vacatures",
"Klachtenregeling" => "/klachten",
"Uitgangspunten streekredactie" => "/uploads/Eigen rol en ambities NH Gooi binnen de lokale nieuwsvoorziening.pdf",
"Frequenties" => "/frequenties",
"Adverteren?" => "/adverteren",
"NH Nieuws" => "https://nhnieuws.nl"
"Adverteren?" => "/adverteren"
)
);
?>

7
resources/views/widgets/nhgooiradiotv.blade.php
View File

@@ -7,11 +7,8 @@
</div>
<div id="tab_gooi_radio_live" class="tab_content active box radio_box">
<img class="logo-radio" src="/images/logo-NHGooi-radio.svg"/>
<h2 class="post_title">Muziek & Informatie</h2>
<span class="post_date">
<i class="fa-regular fa-clock"></i> 02:00 - 20:00
</span>
<p>Non-stop muziekmix en regionieuws</p>
@include('widgets.nustraks')
<a class="btn" href="/gids">Programmering</a>
<a class="btn" href="/contact">Contact de studio</a>
<a class="btn player" href="/luister/live">Luister live</a>
<a class="btn" href="/kijk/live">Kijk live mee</a>

87
resources/views/widgets/nustraks.blade.php
View File

@@ -1,52 +1,50 @@
<h4 class="page_margin_top box_header"><span class="fa fa-music"></span> &nbsp; Nu op NH Gooi Radio</h4>
<div class="clearfix">
@php($program = $data[0])
<ul class="blog podcasts">
<li class="post">
<div class="post_content">
<h2><a href="{{route('programma') . $program->url}}" title="{{$program->name}}">{{$program->name}}</a></h2>
@if($program->tagline)
<p>{{$program->tagline}}</p>
@endif
<a class="action_button player" style="margin-top: 0;" href="{{route('luister.live')}}" title="Luister live">
<span class="fa fa-play"></span>
<span>Luister live tot {{$program->end->format('H:i')}} uur.</span>
</a>
</div>
</li>
</ul>
<h2 class="post_title"><a href="{{route('programma') . $program->url}}" title="{{$program->name}}">{{$program->name}}</a></h2>
<span class="post_date">
<i class="fa-regular fa-clock"></i> {{$program->start->format('H:i')}} - {{$program->end->format('H:i')}}
</span>
@if($program->tagline)
<p>{{$program->tagline}}</p>
@endif
<div class="clearfix"></div>
<h5 class="page_margin_top">Daarna:</h5>
<ul class="list no_border spacing">
@php($startDay = $program->start->format('d'))
@foreach($data as $program)
@php($isToday = $program->start->format('d') == $startDay)
@if($loop->index > 5)
@break
@elseif(($loop->index >= 3) && $program->nonstop)
@break
@elseif(!$loop->first)
<li class="bullet style_2"><a href="{{route('programma') . $program->url}}" title="{{$program->name}}">
<b>{{$program->name}}</b></a> |
<span class="text-muted">{{Formatter::relativeDate($program->start)}} om {{$program->start->format('H:i')}}.</span>
</li>
@if($program->tagline)
<li class="bullet text-muted">{{$program->tagline}}</li>
<h3 class="post_title">Daarna:</h3>
<div class="podcast_items">
<ul class="">
@php($startDay = $program->start->format('d'))
@foreach($data as $program)
@php($isToday = $program->start->format('d') == $startDay)
@if($loop->index > 5)
@break
@elseif(($loop->index >= 3) && $program->nonstop)
@break
@elseif(!$loop->first)
<li class="post" style="margin-bottom: 0">
<div class="sub_title">
<a class="program_name" href="{{route('programma') . $program->url}}" title="{{$program->name}}"><strong>{{$program->name}}</strong></a>
<span class="post_date" title="{{Formatter::relativeDate($program->start)}} om {{$program->start->format('H:i')}}.">
<i class="fa-regular fa-clock"></i> {{Formatter::relativeDate($program->start)}} om {{$program->start->format('H:i')}}.
</span>
</div>
</li>
@endif
@endif
@endforeach
</ul>
@endforeach
</ul>
</div>
@if(isset($recent))
<h5 class="page_margin_top box_header">Net gemist?</h5>
<p><b>{{$recent->name}}</b></p>
<span class="text-muted">{{Formatter::relativeDate($recent->start)}} om {{$recent->start->format('H:i')}}.</span>
<p class="clearfix">
<h3 class="post_title">Net gemist?</h3>
<div class="podcast_items">
<ul class="">
<li class="post" style="margin-bottom: 0">
<div class="sub_title">
<a class="program_name" href="{{route('programma') . $recent->url}}" title="{{$recent->name}}"><strong>{{$recent->name}}</strong></a>
<span class="post_date" title="{{Formatter::relativeDate($recent->start)}} om {{$recent->start->format('H:i')}}.">
<i class="fa-regular fa-clock"></i> {{Formatter::relativeDate($recent->start)}} om {{$recent->start->format('H:i')}}.
</span>
</div>
</li>
</ul>
</div>
@php($duration = $recent->end->diff($recent->start)->h)
<a class="action_button player" style="margin-top: 0;" href="{{route('luister.programma') . '/' . $recent->start->format('Y/m/d/H') . '/' . $duration}}" title="Luister live">
<span class="fa fa-history"></span>
@@ -54,4 +52,3 @@
</a>
</p>
@endif
</div>