Merge branch 'release/dev' into release/live

2024-07-01 11:43:13 +02:00
parent e0c11c50f5 e194e93784
commit 16808e6280
45 changed files with 660 additions and 74 deletions
--- a/6
+++ b/6
@@ -33,6 +33,6 @@ RUN mkdir -p storage/framework/{sessions,views,cache,cache/data} && \
  chown -R www-data:www-data storage/framework && \
  chmod -R 775 storage

-# RUN php artisan cache:clear && \
-#   php artisan config:clear && \
-#  php artisan view:clear
+RUN php artisan cache:clear && \
+    php artisan config:clear && \
+    php artisan view:clear
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -0,0 +1,38 @@
+FROM php:8.1-apache
+
+RUN apt-get update \
+    && apt-get -y install \
+            g++ \
+            libcurl4-gnutls-dev \
+            libxml2-dev \
+            libxslt-dev \
+            libzip-dev \
+            zlib1g-dev \
+            msmtp \
+            unzip \
+            git \
+            ssl-cert \
+            locales \
+        --no-install-recommends \
+    && docker-php-ext-install pdo pdo_mysql mysqli xsl xml zip opcache \
+    && a2enmod rewrite ssl proxy proxy_http headers \
+	&& apt-get purge -y g++ \
+    && apt-get autoremove -y \
+    && rm -r /var/lib/apt/lists/*
+
+# Get latest Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Update the default apache site with the config we created.
+ADD docker/apache.dev.conf /etc/apache2/sites-enabled/000-default.conf
+
+WORKDIR /var/www/html
+COPY . /var/www/html
+
+RUN mkdir -p storage/framework/{sessions,views,cache,cache/data} && \
+  chown -R www-data:www-data storage/framework && \
+  chmod -R 775 storage
+
+# RUN php artisan cache:clear && \
+#   php artisan config:clear && \
+#  php artisan view:clear
--- a/app/Http/Controllers/CalendarController.php
+++ b/app/Http/Controllers/CalendarController.php
@@ -16,7 +16,7 @@ class CalendarController extends Controller
            'ends' => '19-04-2024',
            'url' => 'seinconcert-hilversum',
            'images' => [
-                ['url' => 'img/news/rHjgm6CM0D.jpg']
+                ['url' => '/img/news/rHjgm6CM0D.jpg']
            ]
        ],
        2 => [
@@ -28,7 +28,7 @@ class CalendarController extends Controller
            'ends' => '21-04-2024',
            'url' => 'orgelconcert-blaricum',
            'images' => [
-                ['url' => 'img/news/tgrOh0kbIS.jpg']
+                ['url' => '/img/news/tgrOh0kbIS.jpg']
            ]
        ],
    ];
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -96,6 +96,8 @@ class Controller extends BaseController
                ->with('podcasts',
                    $this->getDataFromFileAndConvert('laatste_podcasts.json', ['podcasts'], '\Model\Podcast'));
        });
+
+        View::share('disableBanners', env('DISABLE_BANNERS', true));
    }

    protected function registerView(Request $request, $type, $id)
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -0,0 +1,24 @@
+version: '3.8'
+
+services:
+  web:
+    build:
+      context: ./
+      dockerfile: Dockerfile.dev
+    ports:
+      - 8080:80
+      - 8443:443
+    volumes:
+      - .:/var/www/html
+      - ./srv:/srv
+  db:
+    image: mysql:5.5
+    ports:
+      - "3306:3306"
+    expose:
+      - "3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: development-password
+      MYSQL_DATABASE: forge
+      MYSQL_USER: forge
+      MYSQL_PASSWORD: secret
--- a/docker/apache.dev.conf
+++ b/docker/apache.dev.conf
@@ -0,0 +1,46 @@
+Header set X-Content-Type-Options: "nosniff"
+Header set X-Frame-Options: "sameorigin"
+
+ServerTokens Prod
+
+<VirtualHost *:80>
+  ServerName localhost
+  ServerAdmin support@websight.nl
+  DocumentRoot /var/www/html
+
+  <Directory /var/www/html/>
+      Options -Indexes +FollowSymLinks +MultiViews
+      AllowOverride All
+      Order deny,allow
+      Allow from all
+  </Directory>
+
+  ErrorLog /var/log/apache2/vhost-error.log
+  CustomLog /var/log/apache2/vhost-access.log combined
+</VirtualHost>
+
+<IfModule mod_ssl.c>
+    <VirtualHost *:443>
+      ServerName localhost
+      ServerAdmin support@websight.nl
+      DocumentRoot /var/www/html
+
+      SSLEngine on
+      SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+      SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+      SSLCompression off
+      SSLProtocol All -SSLv2 -SSLv3
+      SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH
+
+      <Directory /var/www/html/>
+          Options -Indexes +FollowSymLinks +MultiViews
+          AllowOverride All
+          Order deny,allow
+          Allow from all
+      </Directory>
+
+      ErrorLog /var/log/apache2/ssl-vhost-error.log
+      CustomLog /var/log/apache2/ssl-vhost-access.log combined
+
+    </VirtualHost>
+</IfModule>
--- a/env.example
+++ b/env.example
@@ -0,0 +1,39 @@
+APP_NAME="NH Gooi"
+APP_ENV=production
+APP_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+APP_DEBUG=false
+APP_LOG_LEVEL=error
+APP_URL=https://dev.nhgooi.nl
+IMAGE_BASE_URL=https://dev.nhgooi.nl
+
+API_URL=https://api.nhgooi.nl/
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=in-v3.mailjet.com 
+MAIL_PORT=25
+MAIL_USERNAME=mailjet_username
+MAIL_PASSWORD=mailjet_password
+MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+
+DB_CONNECTION=mysql
+DB_HOST=nhgooi.nl
+DB_PORT=3306
+DB_DATABASE=dbname
+DB_USERNAME=6fmstats
+DB_PASSWORD=dbpass
+
+CACHE_DRIVER=file
+QUEUE_DRIVER=sync
--- a/public/android-chrome-192x192.png
+++ b/public/android-chrome-192x192.png
--- a/public/android-chrome-512x512.png
+++ b/public/android-chrome-512x512.png
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -31,10 +31,14 @@ body {
 }

@media (min-width: 768px) {
-  .grey_background {
+  .grey_background:not(.site_container) {
    background-color: #f9f9f9;
  }
 }
+.page {
+  padding-top: 20px;
+}
+
 .content_container {
  padding-right: 50px;
 }
@@ -163,10 +167,10 @@ div.pp_default .pp_close:hover {
 }
 .header .logo {
  float: left;
-  margin-top: 18px;
+  margin-top: 10px;
 }
 .header .logo img {
-  height: 75px;
+  height: 95px;
 }
 .header .advertisement {
  float: right;
@@ -198,7 +202,6 @@ div.pp_default .pp_close:hover {
@media (min-width: 767px) {
  .menu_container {
    height: 75px;
-    margin-bottom: 20px;
    background-image: linear-gradient(to right, #0102b0, #4090e3);
  }
 }
@@ -254,7 +257,9 @@ div.pp_default .pp_close:hover {
  display: block;
  width: 33px;
  height: 25px;
-  background-image: URL("/images/menu-corner-1.svg");
+  -webkit-mask-image: URL("/images/menu-corner-1.svg");
+  mask-image: URL("/images/menu-corner-1.svg");
+  background-color: white;
  position: absolute;
  top: 0;
  left: 0;
@@ -265,7 +270,9 @@ div.pp_default .pp_close:hover {
  display: block;
  width: 12px;
  height: 15px;
-  background-image: URL("/images/menu-corner-2.svg");
+  -webkit-mask-image: URL("/images/menu-corner-2.svg");
+  mask-image: URL("/images/menu-corner-2.svg");
+  background-color: white;
  position: absolute;
  bottom: 0;
  right: -1px;
@@ -303,10 +310,15 @@ div.pp_default .pp_close:hover {
  margin: 8px;
  border-right: 1px solid rgba(255, 255, 255, 0.2);
  line-height: 2;
+  height: 28px;
  /*&:nth-child(2) {
    padding: 0 19px;
  }*/
 }
+.top_menu_container ul.right_menu li.collapsed, .menu_mobile_container ul.right_menu li.collapsed {
+  padding: 3px 9px 3px 6px;
+  margin: 8px auto;
+}
 .top_menu_container ul.right_menu li:last-child, .menu_mobile_container ul.right_menu li:last-child {
  border: none;
  line-height: 1;
@@ -320,6 +332,12 @@ div.pp_default .pp_close:hover {
  color: #fff;
  text-decoration: none;
  text-transform: uppercase;
+  display: flex;
+}
+.top_menu_container ul.right_menu li a span, .menu_mobile_container ul.right_menu li a span {
+  overflow: hidden;
+  display: block;
+  height: 28px;
 }
 .top_menu_container ul.right_menu li a.with_svg_icon, .menu_mobile_container ul.right_menu li a.with_svg_icon {
  position: relative;
@@ -349,7 +367,7 @@ div.pp_default .pp_close:hover {
  border: 1px solid #efefef;
  border-radius: 3px;
  background-color: #fff;
-  height: 29px;
+  height: 26px;
  font-family: Montserrat, serif;
  font-size: 16px;
  line-height: 1.25;
@@ -357,7 +375,7 @@ div.pp_default .pp_close:hover {
 }
 .top_menu_container ul.right_menu li .search_form .search_submit, .menu_mobile_container ul.right_menu li .search_form .search_submit {
  float: right;
-  margin: 6px;
+  margin: 4px;
 }
 .top_menu_container ul.right_menu li .search_button, .menu_mobile_container ul.right_menu li .search_button {
  margin-top: 6px;
@@ -576,6 +594,25 @@ div.pp_default .pp_close:hover {
  transform: rotate(90deg);
 }

+.slogan {
+  width: 190px;
+  margin: 8px 0;
+}
+
+.grey_background nav > div {
+  background: #f9f9f9;
+  border-color: #f9f9f9;
+}
+.grey_background .menu > li a {
+  background: #f9f9f9;
+}
+.grey_background .menu > li.selected a:before, .grey_background .menu > li.selected a:after, .grey_background .menu > li:hover a:before, .grey_background .menu > li:hover a:after, .grey_background .menu > li.hover a:before, .grey_background .menu > li.hover a:after {
+  background-color: #f9f9f9;
+}
+.grey_background .menu > li:last-child:after {
+  background: #f9f9f9;
+}
+
 .header .now-playing-header {
  float: right;
 }
@@ -1455,6 +1492,10 @@ div.pp_default .pp_close:hover {
  display: block;
  width: 100%;
 }
+.footer_container .footer_menu .about a {
+  display: inline;
+  text-decoration: underline;
+}
 .footer_container .footer_menu .buttons a {
  text-transform: uppercase;
  margin-bottom: 10px;
--- a/public/css/style.css.map
+++ b/public/css/style.css.map
--- a/public/favicon-16x16.png
+++ b/public/favicon-16x16.png
--- a/public/favicon-32x32.png
+++ b/public/favicon-32x32.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/images/Slogan_DIAP
+++ b/public/images/Slogan_DIAP
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230mm"
+   height="40mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg4553"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="Slogan_DIAP white.svg">
+  <defs
+     id="defs4547" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.47"
+     inkscape:cx="803.9187"
+     inkscape:cy="284.95533"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4550">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g44"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+       transform="matrix(1.3988443,0,0,1.3988443,-949.97686,-1243.7313)">
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 220.9,998.2 c -5.3,-2.3 -12.1,-4.4 -20.6,-6.3 -8,-1.8 -13.6,-3.7 -16.9,-5.8 -3.3,-2.1 -5,-5.1 -5,-9 0,-4.6 1.9,-8.3 5.6,-10.9 3.7,-2.6 8.8,-3.9 15.3,-3.9 10.8,0 20.7,3.6 29.6,10.7 l 6.1,-13.4 c -4.1,-3.7 -9.3,-6.6 -15.7,-8.8 -6.4,-2.1 -13,-3.2 -20.1,-3.2 -7.7,0 -14.5,1.3 -20.3,3.9 -5.9,2.6 -10.4,6.2 -13.7,10.9 -3.2,4.6 -4.8,9.9 -4.8,15.8 0,5.7 1.3,10.4 4,14.1 2.7,3.7 6.6,6.7 11.8,9.1 5.2,2.4 12,4.5 20.3,6.3 8.1,1.8 13.8,3.7 17.3,5.7 3.5,2 5.2,4.9 5.2,8.7 0,4.4 -1.9,7.8 -5.6,10.2 -3.7,2.4 -9.1,3.6 -16,3.6 -6.3,0 -12.1,-0.9 -17.4,-2.6 -5.4,-1.7 -10.5,-4.4 -15.3,-8.1 l -6.1,13.4 c 4.6,3.8 10.3,6.7 17.1,8.8 6.7,2.1 13.9,3.1 21.6,3.1 8.2,0 15.2,-1.2 21.3,-3.6 6,-2.4 10.6,-5.9 13.8,-10.4 3.2,-4.5 4.8,-9.7 4.8,-15.7 0,-5.5 -1.4,-10.1 -4.2,-13.7 -2.8,-3.6 -6.9,-6.5 -12.1,-8.9 z"
+         id="path14"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 274.1,1023.1 v -30 h 18.4 v -13.4 h -18.4 v -20.8 h -17.8 v 20.8 H 243 V 993 h 13.4 v 30.3 c 0,8.9 2.3,15.6 7,20.1 4.6,4.5 11.9,6.8 21.6,6.8 2.4,0 5,-0.1 7.8,-0.4 l 0.9,-13.2 c -2.3,0.3 -4.5,0.4 -6.5,0.4 -8.7,0 -13.1,-4.6 -13.1,-13.9 z"
+         id="path16"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 334,978 c -6.5,0 -12.4,1.5 -17.6,4.6 -5.2,3 -9.2,7.3 -12,12.8 -2.8,5.5 -4.3,11.8 -4.3,18.9 0,11.2 3.3,20 9.9,26.5 6.6,6.5 15.6,9.7 27,9.7 4.9,0 9.8,-0.8 14.7,-2.4 4.9,-1.6 8.9,-3.7 12.2,-6.4 l -5.1,-12.2 c -6.4,4.9 -13.4,7.4 -21.1,7.4 -6.2,0 -10.9,-1.6 -14.2,-4.7 -3.3,-3.1 -5.3,-7.9 -5.8,-14.4 h 47.4 v -5 c 0,-10.8 -2.8,-19.3 -8.3,-25.5 C 351.2,981 343.6,978 334,978 Z m -16.3,30.1 c 0.7,-5.7 2.4,-10.1 5.3,-13.1 2.9,-3 6.7,-4.6 11.5,-4.6 4.7,0 8.4,1.5 11.1,4.5 2.7,3 4.1,7.4 4.3,13.2 z"
+         id="path18"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 462.2,978 c -5,0 -9.6,1.2 -13.7,3.5 -4.1,2.3 -7.2,5.5 -9.4,9.6 -3.4,-8.7 -10.4,-13.1 -20.9,-13.1 -4.7,0 -9,1 -12.7,2.9 -3.7,1.9 -6.6,4.8 -8.7,8.6 v -9.8 h -17.4 v 69.6 h 17.8 v -38.8 c 0,-5.8 1.3,-10.3 4,-13.5 2.7,-3.2 6.3,-4.8 11,-4.8 4.1,0 7,1.2 8.8,3.6 1.8,2.4 2.6,6.3 2.6,11.6 v 42 h 17.8 v -38.8 c 0,-5.8 1.3,-10.3 4,-13.5 2.7,-3.2 6.4,-4.8 11.1,-4.8 4,0 6.9,1.2 8.7,3.6 1.8,2.4 2.7,6.3 2.7,11.6 v 42 h 17.8 v -42.7 c 0,-9.7 -1.9,-16.9 -5.8,-21.6 -3.9,-4.9 -9.8,-7.2 -17.7,-7.2 z"
+         id="path20"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <polygon
+         class="st1"
+         points="562.7,1049.2 578.2,1049.2 608.6,979.8 591.1,979.8 570.9,1028.9 551.3,979.8 532.5,979.8 "
+         id="polygon22"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 646.1,978 c -4.9,0 -10.2,0.8 -15.7,2.4 -5.5,1.6 -10.2,3.7 -14.1,6.1 l 5,12.2 c 3.9,-2.3 7.8,-4.1 11.9,-5.3 4,-1.3 7.9,-1.9 11.6,-1.9 4.7,0 8.1,1 10.2,3.1 2,2.1 3.1,5.5 3.1,10.2 v 3.3 h -3.6 c -10.3,0 -18.4,0.7 -24.3,2 -5.9,1.3 -10.1,3.5 -12.7,6.4 -2.6,2.9 -3.9,7 -3.9,12.1 0,4.1 1.1,7.8 3.3,11.1 2.2,3.3 5.2,5.9 9,7.8 3.8,1.9 8,2.8 12.7,2.8 4.6,0 8.6,-1 12,-3.1 3.5,-2.1 6,-5 7.6,-8.7 v 10.7 h 16.9 V 1007 c 0,-9.9 -2.4,-17.2 -7.1,-21.9 -4.9,-4.8 -12.2,-7.1 -21.9,-7.1 z m 11.9,42.5 c 0,5 -1.5,9.1 -4.5,12.3 -3,3.2 -6.9,4.8 -11.6,4.8 -3.2,0 -5.9,-1 -8,-2.9 -2.1,-1.9 -3.1,-4.4 -3.1,-7.5 0,-2.5 0.8,-4.4 2.3,-5.8 1.5,-1.4 4,-2.4 7.5,-3 3.5,-0.6 8.4,-0.9 14.8,-0.9 h 2.6 z"
+         id="path24"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 733.4,978 c -5,0 -9.5,1 -13.5,3.1 -4,2.1 -7.2,5.1 -9.5,9 V 979.7 H 693 v 69.6 h 17.8 v -39.4 c 0,-5.4 1.5,-9.7 4.6,-12.9 3.1,-3.2 7.2,-4.8 12.3,-4.8 4.4,0 7.6,1.2 9.6,3.7 2,2.5 3.1,6.4 3.1,11.8 v 41.7 h 17.8 v -42.7 c 0,-9.6 -2,-16.7 -6.1,-21.5 -4.1,-4.9 -10.3,-7.2 -18.7,-7.2 z"
+         id="path26"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 855.2,978 c -4.8,0 -9.2,1 -13.2,2.9 -3.9,1.9 -7.1,4.8 -9.5,8.5 V 949 h -17.8 v 100.3 h 17.8 v -39.4 c 0,-5.4 1.5,-9.7 4.6,-12.9 3.1,-3.2 7.2,-4.8 12.3,-4.8 4.4,0 7.6,1.2 9.6,3.7 2,2.5 3.1,6.4 3.1,11.8 v 41.7 H 880 v -42.7 c 0,-9.6 -2,-16.7 -6.1,-21.5 -4.1,-4.9 -10.4,-7.2 -18.7,-7.2 z"
+         id="path28"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 928,978 c -6.5,0 -12.4,1.5 -17.6,4.6 -5.2,3 -9.2,7.3 -12,12.8 -2.8,5.5 -4.3,11.8 -4.3,18.9 0,11.2 3.3,20 9.9,26.5 6.6,6.5 15.6,9.7 27,9.7 4.9,0 9.8,-0.8 14.7,-2.4 4.9,-1.6 8.9,-3.7 12.2,-6.4 l -5.1,-12.2 c -6.4,4.9 -13.4,7.4 -21.1,7.4 -6.2,0 -10.9,-1.6 -14.2,-4.7 -3.3,-3.1 -5.3,-7.9 -5.8,-14.4 h 47.4 v -5 c 0,-10.8 -2.8,-19.3 -8.3,-25.5 C 945.2,981 937.6,978 928,978 Z m -16.3,30.1 c 0.7,-5.7 2.4,-10.1 5.3,-13.1 2.9,-3 6.7,-4.6 11.5,-4.6 4.7,0 8.4,1.5 11.1,4.5 2.7,3 4.1,7.4 4.3,13.2 z"
+         id="path30"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 995.2,1023.1 v -30 h 18.4 v -13.4 h -18.4 v -20.8 h -17.8 v 20.8 H 964 V 993 h 13.4 v 30.3 c 0,8.9 2.3,15.6 7,20.1 4.6,4.5 11.9,6.8 21.6,6.8 2.4,0 5,-0.1 7.8,-0.4 l 0.9,-13.2 c -2.3,0.3 -4.5,0.4 -6.5,0.4 -8.7,0 -13,-4.6 -13,-13.9 z"
+         id="path32"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 1110.9,1008.1 h 21.6 v 25.2 c -6.5,1.8 -12.9,2.7 -19.4,2.7 -21.6,0 -32.4,-12.3 -32.4,-37 0,-12 2.6,-21.1 7.9,-27.2 5.3,-6.1 13.1,-9.2 23.4,-9.2 5.4,0 10.4,0.8 14.9,2.3 4.5,1.6 9.1,4.1 13.7,7.8 l 6.1,-13.2 c -4.1,-3.8 -9.2,-6.7 -15.4,-8.8 -6.2,-2 -12.8,-3.1 -19.8,-3.1 -10.1,0 -18.8,2.1 -26.3,6.2 -7.4,4.1 -13.2,10.1 -17.2,17.8 -4,7.7 -6,16.9 -6,27.4 0,10.6 2,19.8 6,27.5 4,7.7 9.8,13.7 17.4,17.8 7.6,4.1 16.6,6.2 26.9,6.2 6.7,0 13.3,-0.7 19.8,-2 6.5,-1.3 12,-3.1 16.6,-5.4 V 995 h -38 v 13.1 z"
+         id="path34"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 1218.4,982.4 c -5.4,-2.9 -11.6,-4.4 -18.7,-4.4 -7.1,0 -13.4,1.5 -18.7,4.4 -5.4,2.9 -9.5,7.1 -12.4,12.6 -2.9,5.5 -4.4,11.8 -4.4,19.1 0,7.3 1.5,13.7 4.4,19.2 2.9,5.5 7.1,9.7 12.4,12.7 5.4,2.9 11.6,4.4 18.7,4.4 7.1,0 13.3,-1.5 18.7,-4.4 5.4,-2.9 9.5,-7.2 12.4,-12.7 2.9,-5.5 4.3,-11.9 4.3,-19.2 0,-7.3 -1.4,-13.7 -4.3,-19.1 -3,-5.5 -7.1,-9.7 -12.4,-12.6 z m -5.7,48.5 c -3,3.8 -7.4,5.7 -13.2,5.7 -5.7,0 -10.1,-1.9 -13.1,-5.7 -3,-3.8 -4.6,-9.4 -4.6,-16.8 0,-7.3 1.5,-12.9 4.6,-16.7 3.1,-3.8 7.5,-5.8 13.2,-5.8 5.7,0 10.1,1.9 13.1,5.8 3,3.8 4.6,9.4 4.6,16.7 0,7.4 -1.5,13 -4.6,16.8 z"
+         id="path36"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         class="st1"
+         d="m 1300.2,982.4 c -5.4,-2.9 -11.6,-4.4 -18.7,-4.4 -7.1,0 -13.4,1.5 -18.7,4.4 -5.4,2.9 -9.5,7.1 -12.4,12.6 -2.9,5.5 -4.4,11.8 -4.4,19.1 0,7.3 1.5,13.7 4.4,19.2 2.9,5.5 7.1,9.7 12.4,12.7 5.4,2.9 11.6,4.4 18.7,4.4 7.1,0 13.3,-1.5 18.7,-4.4 5.4,-2.9 9.5,-7.2 12.4,-12.7 2.9,-5.5 4.3,-11.9 4.3,-19.2 0,-7.3 -1.4,-13.7 -4.3,-19.1 -2.9,-5.5 -7.1,-9.7 -12.4,-12.6 z m -5.6,48.5 c -3,3.8 -7.4,5.7 -13.2,5.7 -5.7,0 -10.1,-1.9 -13.1,-5.7 -3,-3.8 -4.6,-9.4 -4.6,-16.8 0,-7.3 1.5,-12.9 4.6,-16.7 3.1,-3.8 7.5,-5.8 13.2,-5.8 5.7,0 10.1,1.9 13.1,5.8 3,3.8 4.6,9.4 4.6,16.7 -0.1,7.4 -1.6,13 -4.6,16.8 z"
+         id="path38"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <rect
+         x="1331.5"
+         y="979.70001"
+         class="st1"
+         width="17.799999"
+         height="69.599998"
+         id="rect40"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+      <rect
+         x="1330.5"
+         y="947.40002"
+         class="st1"
+         width="19.6"
+         height="17.5"
+         id="rect42"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
--- a/public/images/Streekomroep
+++ b/public/images/Streekomroep
--- a/public/js/functions.js
+++ b/public/js/functions.js
@@ -193,7 +193,19 @@ $(function () {
    this.click(function (e) {
      e.preventDefault();
      var type = options.types[options.type];
-      if (type !== undefined) {
+      if (options.type == 'native' && navigator.share != undefined) {
+        var text = $('.' + options.excerptClass).text().trim();
+        if (text.length + location.href.length > 278) {
+          text = text.substring(0, 278 - (location.href.length + 3))  + '...';
+        }
+        var data = {
+          url: encodeURI(location.href),
+          text: text,
+          title: $('.page_title').text().trim()
+        };
+        navigator.share(data)
+      }
+      else if (type !== undefined) {
        var extra = '';
        if (type.textOption) {
          var text = $('.' + options.excerptClass).text().trim();
--- a/public/js/functions.min.js
+++ b/public/js/functions.min.js
--- a/nieuwsvoorziening.pdf
+++ b/nieuwsvoorziening.pdf
--- a/resources/assets/js/functions/share.js
+++ b/resources/assets/js/functions/share.js
@@ -23,7 +23,19 @@
    this.click(function (e) {
      e.preventDefault();
      var type = options.types[options.type];
-      if (type !== undefined) {
+      if (options.type == 'native' && navigator.share != undefined) {
+        var text = $('.' + options.excerptClass).text().trim();
+        if (text.length + location.href.length > 278) {
+          text = text.substring(0, 278 - (location.href.length + 3))  + '...';
+        }
+        var data = {
+          url: encodeURI(location.href),
+          text: text,
+          title: $('.page_title').text().trim()
+        };
+        navigator.share(data)
+      }
+      else if (type !== undefined) {
        var extra = '';
        if (type.textOption) {
          var text = $('.' + options.excerptClass).text().trim();
--- a/resources/assets/sass/base/_container.scss
+++ b/resources/assets/sass/base/_container.scss
@@ -20,10 +20,13 @@ body {
  @include container;
 }
@media (min-width: 768px) {
-  .grey_background {
-    background-color: #f9f9f9;
+  .grey_background:not(.site_container) {
+    background-color: $container-bg;
  }
 }
+.page {
+  padding-top: 20px;
+}
 .content_container {
  padding-right: 50px;
 }
--- a/resources/assets/sass/components/_footer.scss
+++ b/resources/assets/sass/components/_footer.scss
@@ -33,6 +33,11 @@
      width: 100%;
    }

+    .about a {
+      display: inline;
+      text-decoration: underline;
+    }
+
    .buttons a {
      text-transform: uppercase;
      margin-bottom: 10px;
--- a/resources/assets/sass/components/_header.scss
+++ b/resources/assets/sass/components/_header.scss
@@ -2,9 +2,9 @@
  height: 111px;
  .logo {
    float: left;
-    margin-top: 18px;
+    margin-top: 10px;
    img {
-      height: 75px;
+      height: 95px;
    }
  }
  .advertisement {
--- a/resources/assets/sass/components/_menu.scss
+++ b/resources/assets/sass/components/_menu.scss
@@ -4,7 +4,6 @@
 .menu_container {
  @media (min-width: 767px) {
    height: 75px;
-    margin-bottom: 20px;
    background-image: linear-gradient(to right, #0102b0, #4090e3);
  }

@@ -62,7 +61,9 @@
          display: block;
          width: 33px;
          height: 25px;
-          background-image: URL('/images/menu-corner-1.svg');
+          -webkit-mask-image: URL("/images/menu-corner-1.svg");
+          mask-image: URL("/images/menu-corner-1.svg");
+          background-color: white;
          position: absolute;
          top: 0;
          left: 0;
@@ -74,7 +75,9 @@
          display: block;
          width: 12px;
          height: 15px;
-          background-image: URL('/images/menu-corner-2.svg');
+          -webkit-mask-image: URL("/images/menu-corner-2.svg");
+          mask-image: URL("/images/menu-corner-2.svg");
+          background-color: white;
          position: absolute;
          bottom: 0;
          right: -1px;
@@ -114,6 +117,12 @@
      margin: 8px;
      border-right: 1px solid rgba(255, 255, 255, 0.2);
      line-height: 2;
+      height: 28px;
+
+      &.collapsed {
+        padding: 3px 9px 3px 6px;
+        margin: 8px auto;
+      }

      &:last-child {
        border: none;
@@ -133,6 +142,13 @@
        color: $text-inverted-color;
        text-decoration: none;
        text-transform: uppercase;
+        display: flex;
+
+        span {
+          overflow: hidden;
+          display: block;
+          height: 28px;
+        }

        &.with_svg_icon {
          position: relative;
@@ -166,7 +182,7 @@
          border: 1px solid #efefef;
          border-radius: 3px;
          background-color: $element-bg;
-          height: 29px;
+          height: 26px;
          font-family: Montserrat, serif;
          font-size: 16px;
          line-height: 1.25;
@@ -174,7 +190,7 @@
        }
        .search_submit {
          float: right;
-          margin: 6px;
+          margin: 4px;
        }
      }
      .search_button {
@@ -410,3 +426,37 @@
    transform: rotate(90deg);
  }
 }
+
+.slogan {
+  width: 190px;
+  margin: 8px 0;
+}
+
+.grey_background {
+  nav {
+    > div {
+      background: $container-bg;
+      border-color: $container-bg;
+    }
+  }
+
+  .menu {
+    > li {
+      a {
+        background: $container-bg;
+      }
+
+      &.selected a, &:hover a, &.hover a {
+        &:before, &:after {
+          background-color: $container-bg;
+        }
+      }
+
+      &:last-child {
+        &:after {
+          background: $container-bg;
+        }
+      }
+    }
+  }
+}
--- a/resources/views/calendarlist.blade.php
+++ b/resources/views/calendarlist.blade.php
@@ -7,7 +7,10 @@
@section('page_class')
    news_post post_container breadcrumb_no_border
@endsection
-@section('container_class')
+@section('page_container_class')
+    grey_background
+@endsection
+@section('site_container_class')
    grey_background
@endsection

--- a/resources/views/contact.blade.php
+++ b/resources/views/contact.blade.php
@@ -31,9 +31,11 @@
                </p>

                <p class="page_margin_top">
-                    <b>Het postadres van NH Gooi is: </b><br>
+                    <b>NHGooi</b><br>
                    Postbus 83<br>
                    1270 AB Huizen<br>
+                    Tel: <a href="tel:+31356424776">035-6424774</a><br>
+                    KvK: 41194132<br>
                    <br>

                    <b>Bezoekadres / Studio:</b><br>
@@ -41,14 +43,21 @@
                    1271 AA Huizen<br><br>

                <p>
-                    <b>Telefoon en email:</b><br>
-                    Tel: 035-6424774<br/>
-                    Studio: 035-6424776<br/>
-                    E-mail: {{Html::mailto('info@nhgooi.nl')}}<br/>
-                    KvK: 41194132</table><br>
+                    <b>NHGooi Radio</b><br>
+                    IJsselmeerstraat 3B<br/>
+                    1271 AA, Huizen<br/>
+                    studio: <a href="tel:+31356424776">035-6424776</a><br/>
+                    KvK: 41194132<br>
                    <br>

-                    <b>Hoofdredactie</b><br>
+                    <b>Streekredactie</b><br>
+                    Gooise Brink, Kerkstraat 63/27<br>
+                    11211 CL Hilversum<br>
+                    Tiplijn: <a href="tel:+31642913637">06 - 42 91 36 37</a><br>
+                    e-mail: {{Html::mailto('info@NHGooi.nl')}}<br>
+                    <br>
+
+                    <b>Chef redactie</b><br>
                    Petra de Beij<br>
                    {{Html::mailto('petra.debeij@nhgooi.nl')}}<br><br>
                </p>
--- a/resources/views/cookie_statement.blade.php
+++ b/resources/views/cookie_statement.blade.php
@@ -14,6 +14,27 @@

@section('content')
    <div class="page_body">
+<!DOCTYPE html>
+    <p>Bij NHGooi hechten we veel waarde aan uw privacy en de gebruiksvriendelijkheid van onze website. Daarom maken we gebruik van cookies om uw ervaring op onze website te verbeteren. Hieronder leest u meer over ons cookiebeleid en hoe wij cookies inzetten.</p>
+    
+    <h2>1. Wat zijn cookies?</h2>
+    <p>Cookies zijn kleine tekstbestanden die op uw computer of mobiele apparaat worden opgeslagen wanneer u onze website bezoekt. Deze cookies helpen ons om uw voorkeuren te onthouden en om onze website beter te laten functioneren.</p>
+    
+    <h2>2. Welke cookies gebruiken we?</h2>
+    <ul>
+        <li><strong>Functionele cookies:</strong> Deze cookies zijn essentieel voor het correct functioneren van onze website. Ze zorgen ervoor dat basisfuncties zoals paginanavigatie en toegang tot beveiligde delen van de website werken. Zonder deze cookies kan de website niet naar behoren functioneren.</li>
+        <li><strong>Analytische cookies:</strong> Met deze cookies kunnen we het gebruik van onze website analyseren en verbeteren. Ze helpen ons te begrijpen hoe bezoekers onze website gebruiken, zodat we de functionaliteit en content kunnen optimaliseren. We gebruiken hiervoor bijvoorbeeld Google Analytics.</li>
+        <li><strong>Advertentie- en trackingcookies:</strong> Deze cookies worden gebruikt om advertenties relevanter voor u te maken. Ze kunnen ook worden gebruikt om de effectiviteit van een advertentiecampagne te meten. Deze cookies worden door derde partijen geplaatst, zoals advertentienetwerken, en kunnen uw internetgedrag volgen.</li>
+    </ul>
+    
+    <h2>3. Beheer van cookies</h2>
+    <p>Bij uw eerste bezoek aan onze website wordt u gevraagd om akkoord te gaan met het plaatsen van cookies. U kunt uw cookievoorkeuren op elk moment wijzigen via de instellingen van uw browser. Houd er echter rekening mee dat het uitschakelen van cookies invloed kan hebben op de functionaliteit van onze website.</p>
+    
+    <h2>4. Uw privacy</h2>
+    <p>Uw privacy is voor ons van groot belang. Raadpleeg onze <a href="/privacy-verklaring">privacyverklaring</a> voor meer informatie over hoe wij omgaan met uw persoonlijke gegevens.</p>
+    
+    <h2>5. Vragen?</h2>
+    <p>Als u vragen heeft over ons cookiebeleid, neem dan gerust contact met ons op via <a href="mailto:info@nhgooi.nl">info@nhgooi.nl</a>.</p>

    </div>
@endsection
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -135,6 +135,7 @@
        {{-- body --}}
        <div class="grey_background">
            <div class="body_container row">
+                @if(!isset($disableBanners) || !$disableBanners)
                <div class="col-12">
                    <div class="d-none d-md-block" style="width: 100%; font-family: Nunito,serif;font-size: 12px;font-weight: 500;line-height: 3.17;text-align: center;color: #666;">
                        - Advertentie -
@@ -142,6 +143,7 @@
                    <div id="nhgooi_homepage_top" class="d-none d-md-block" style="width: 728px; height: 90px;margin: 11px auto 50px auto;background-color: #efefef;"></div>
                    <script type="text/javascript">ootag.queue.push(function () {ootag.defineSlot({adSlot: "nhgooi_homepage_top",targetId: "nhgooi_homepage_top",adShownCallback: (adslot) => { calculateSize(adslot.targetId); }});});</script>
                </div>
+                @endif
                <div class="col-12 col-md content_container">
                    <div class="row">
                        <div class="col-md-6 col-12">
@@ -199,16 +201,9 @@
                <div class="col-12 col-md-auto sidebar">
                    @include('widgets/nhgooiradiotv', ['headerClass' => 'small'])

-                    @include('widgets/contact', [])
-
                    @include('widgets/add_sidebar', ['ad_sidebar' => 'nhgooi_homepage_side', 'ad_sidebarId' => 'nhgooi_sidebar1'])

-                    <div class="podcast_items">
-                        <h4 class="box_header small"><span>Fragment gemist</span></h4>
-                        <div class="box">
-                            @include('partial/podcastitems', ['showTime' => false, 'showImage' => false, 'podcasts' => $podcasts])
-                        </div>
-                    </div>
+                    @include('widgets/contact', [])

                    @include('widgets/add_sidebar', ['ad_sidebar' => 'nhgooi_homepage_side2', 'ad_sidebarId' => 'nhgooi_sidebar2'])
                </div>
--- a/resources/views/jobsitem.blade.php
+++ b/resources/views/jobsitem.blade.php
@@ -17,6 +17,9 @@
@section('page_container_class')
 	grey_background
@endsection
+@section('site_container_class')
+	grey_background
+@endsection
@section('container_class')
 	news_post post_container
@endsection
--- a/resources/views/jobslist.blade.php
+++ b/resources/views/jobslist.blade.php
@@ -15,6 +15,9 @@
@section('page_container_class')
    grey_background
@endsection
+@section('site_container_class')
+    grey_background
+@endsection
@section('container_class')
    news_post post_container
@endsection
--- a/resources/views/layouts/_analytics.blade.php
+++ b/resources/views/layouts/_analytics.blade.php
@@ -12,9 +12,11 @@ cookieconsent.run({"notice_banner_type":"simple","consent_type":"express","palet
 </script>
 <!-- End Google Tag Manager -->

+@if(!isset($disableBanners) || !$disableBanners)
 <script type="text/javascript" src="https://cdn.optoutadvertising.com/script/ootag.v2.js"></script><script>var ootag =
    ootag || {}; ootag.queue = ootag.queue || [];ootag.queue.push(function () { ootag.initializeOo({
    publisher: 4, onlyNoConsent: 1, consentTimeOutMS: 500 });});</script>
+@endif

 <noscript>ePrivacy and GPDR Cookie Consent by <a href="https://www.CookieConsent.com/" rel="nofollow noopener">Cookie Consent</a></noscript>
 <!-- End Cookie Consent by https://www.CookieConsent.com -->
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -12,17 +12,19 @@
            style="display:none; visibility:hidden"></iframe>
 </noscript>
 <!-- End Google Tag Manager (noscript) -->
-<div class="site_container boxed">
+<div class="site_container boxed @yield('site_container_class')">
    <div class="header_top_bar_container style_11 clearfix">
    </div>
    <div class="header_container small">
        <div class="header clearfix">
            <div class="logo">
-                <a href="{{url('/')}}"><img src="/images/logo-NHGooi-slogan.svg"/></a>
+                <a href="{{url('/')}}"><img src="/images/Streekomroep NHGooi.png"/></a>
            </div>

+            @if(!isset($disableBanners) || !$disableBanners)
            <div id="nhgooi_header_top" class="advertisement" style="margin: 11px auto 0 auto;background-color: #efefef;"></div>
-            <script type="text/javascript">ootag.queue.push(function () {ootag.defineSlot({adSlot: "nhgooi_homepage_header",targetId: "nhgooi_header_top",filledCallback: (adslot) => { setTimeout(function(){$('#' + adslot.targetId).height($('#' + adslot.targetId).children(":first").height());}, 500);$('#' + adslot.targetId).css({backgroundColor: 'transparent'}); }});});</script>
+            <script type="text/javascript">ootag.queue.push(function () {ootag.defineSlot({adSlot: "nhgooi_homepage_header",targetId: "nhgooi_header_top",filledCallback: (adslot) => { calculateSize(adslot.targetId); }});});</script>
+            @endif

        </div>
    </div>
@@ -59,15 +61,16 @@
    </div>
    <div class="menu_container sticky clearfix">
        <div class="top_menu_container d-none d-md-block">
+            <img class="slogan" src="/images/Slogan_DIAP white.svg" />
            <ul class="right_menu">
                <li>
-                    <a class="player with_svg_icon" style="margin-top: 2px;" href="{{url('luister/live')}}">Luister live radio {!!file_get_contents(__DIR__ . '/../../../public/images/icons/radio.svg')!!}</a>
+                    <a class="player with_svg_icon" href="{{url('luister/live')}}"><span>Luister live radio </span>{!!file_get_contents(__DIR__ . '/../../../public/images/icons/radio.svg')!!}</a>
                </li>
                <li>
-                    <a class="with_svg_icon" style="margin-top: 1px;" href="{{url('kijk/studio')}}">Kijk live tv {!!file_get_contents(__DIR__ . '/../../../public/images/icons/television-2.svg')!!}</a>
+                    <a class="with_svg_icon" href="{{url('kijk/studio')}}"><span>Kijk live tv </span>{!!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>
+                    <a href="https://wa.me/31888505651" style="{{!isset($searchURL) ? 'margin-top: 3px' : ''}}" target="_blank"><span>Tip de streekredactie </span><i style="margin-top: 2px" class="fa-solid fa-circle-plus"></i></a>
                </li>
                @if(isset($searchURL))
                    <li>
@@ -107,9 +110,17 @@
                <div class="col-12 col-md-3">
                    <h4 class="box_header"><span>NH Gooi</span></h4>
                    <p class="about">
-                        <b>NH Gooi</b> is de streekomroep voor het Gooi in samenwerking met NH Media.
-                        NH Gooi Radio hoor je in heel Gooi en Eemland op 92.0 FM.
-                        <a href="{{url('frequenties')}}">Alle frequenties / kanalen.</a>
+                        NH Gooi is de streekomroep voor Gooi & Vechtstreek. Wij bieden een gevarieerd programma op
+                        radio, podcasts, tv en online met muziek, achtergronden en actueel regionieuws.
+                    </p>
+                </div>
+                <div class="col-12 col-md-3">
+                    <h4 class="box_header"><span style="height: 30px;display: block;width: 0;"></span></h4>
+                    <p class="about">
+                        Altijd op de hoogte blijven van nieuws en achtergronden uit de regio? <a href="{{url('app')}}">Download onze app</a>.
+                    </p>
+                    <p class="about">
+                        <a href="{{url('frequenties')}}">Klik hier</a> waar je ons kunt zien en horen.
                    </p>
                </div>
                <div class="col-12 col-md-3">
@@ -129,13 +140,6 @@
                        <a href="{{url('kijk/live')}}">Kijk live</a>
                        <a href="{{url('gemist/fragment')}}">Gemist</a>
                        <a href="{{url('nieuws')}}">Nieuws</a>
-                    </p>
-                </div>
-                <div class="col-12 col-md-3">
-                    <h4 class="box_header"><span>Radio</span></h4>
-                    <p class="buttons">
-                        <a href="{{url('gids')}}">Programmagids</a>
-                        <a href="{{url('gemist/programma')}}">Programma’s</a>
                        <a href="{{url('podcast')}}">Podcasts</a>
                    </p>
                </div>
@@ -215,6 +219,8 @@
    $(".search_form").animate({width: 'toggle'}, 350);
    $(this).find('.fa-magnifying-glass').toggle();
    $(this).find('.fa-xmark').toggle();
+    $('.right_menu a span').animate({width: 'toggle'}, 350);
+    $('.right_menu li').toggleClass('collapsed');
  });
  $(".search_form").animate({width: 'toggle'}, 1);
 </script>
--- a/resources/views/news.blade.php
+++ b/resources/views/news.blade.php
@@ -13,13 +13,15 @@
        {{-- body --}}
        <div class="grey_background">
            <div class="body_container row">
+                @if(!isset($disableBanners) || !$disableBanners)
                <div class="col-12">
                    <div style="width: 100%; font-family: Nunito,serif;font-size: 12px;font-weight: 500;line-height: 3.17;text-align: center;color: #666;">
                        - Advertentie -
                    </div>
                    <div id="nhgooi_article_top" style="width: 728px; height: 90px;margin: 11px auto 50px auto;background-color: #efefef;"></div>
-                    <script type="text/javascript">ootag.queue.push(function () {ootag.defineSlot({adSlot: "nhgooi_article_top",targetId: "nhgooi_article_top",filledCallback: (adslot) => { $('#' + adslot.targetId).css({backgroundColor: 'transparent'}); }});});</script>
+                    <script type="text/javascript">ootag.queue.push(function () {ootag.defineSlot({adSlot: "nhgooi_article_top",targetId: "nhgooi_article_top",filledCallback: (adslot) => { calculateSize(adslot.targetId); }});});</script>
                </div>
+                @endif
                <div class="col-12 col-md content_container">
                    <div class="row">
                        <div class="col-md-12 col-12">
--- a/resources/views/newsitem.blade.php
+++ b/resources/views/newsitem.blade.php
@@ -155,9 +155,9 @@
 				</ul>
 				<div class="share_buttons row">
 					<div class="col-12 col-md-auto">
-						<a data-share="facebook" href="javascript:void(0)" class="btn btn_facebook_share">
-							<i class="fa-brands fa-facebook-f"></i>
-							Deel op Facebook
+						<a data-share="native" href="javascript:void(0)" class="btn">
+							<i class="fa-solid fa-share"></i>
+							Delen
 						</a>
 					</div>
 				</div>
--- a/resources/views/newslist.blade.php
+++ b/resources/views/newslist.blade.php
@@ -9,7 +9,10 @@
@section('page_class')
    news_post post_container
@endsection
-@section('container_class')
+@section('page_container_class')
+    grey_background
+@endsection
+@section('site_container_class')
    grey_background
@endsection

--- a/resources/views/partial/imageslist_small.blade.php
+++ b/resources/views/partial/imageslist_small.blade.php
@@ -1,6 +1,6 @@
 <div class="row blog post_container">
    @foreach($images as $item)
-        <div class="post col-12 col-md-4">
+        <div class="post auto_height col-12 col-md-4">
            <div class="box">
                <a href="{{$imgBase . $item->images[0]->url}}" class="post_image prettyPhoto" rel="prettyPhoto"
                   title="{{$item->images[0]->title}}">
--- a/resources/views/privacy_verklaring.blade.php
+++ b/resources/views/privacy_verklaring.blade.php
@@ -15,5 +15,38 @@
@section('content')
    <div class="page_body">

+<!DOCTYPE html>
+    <p>Bij NHGooi respecteren we uw privacy en zorgen we ervoor dat uw persoonlijke gegevens vertrouwelijk worden behandeld. Deze privacyverklaring legt uit welke gegevens we verzamelen, hoe we deze gebruiken en beschermen, en wat uw rechten zijn.</p>
+
+    <h2>1. Welke gegevens verzamelen we?</h2>
+    <p>Wij kunnen de volgende persoonsgegevens verzamelen:</p>
+    <ul>
+        <li>Naam</li>
+        <li>E-mailadres</li>
+        <li>Telefoonnummer</li>
+        <li>Adresgegevens</li>
+        <li>Gebruiksgegevens van de website (zoals IP-adres en browserinformatie)</li>
+    </ul>
+
+    <h2>2. Hoe gebruiken we uw gegevens?</h2>
+    <p>Wij gebruiken uw gegevens voor de volgende doeleinden:</p>
+    <ul>
+        <li>Verlenen en verbeteren van onze diensten</li>
+        <li>Contact opnemen voor servicegerichte of marketingdoeleinden</li>
+        <li>Analyseren van websitegebruik voor verbetering van onze diensten en website</li>
+    </ul>
+
+    <h2>3. Bescherming van uw gegevens</h2>
+    <p>Wij nemen passende technische en organisatorische maatregelen om uw persoonsgegevens te beschermen tegen verlies, misbruik en onbevoegde toegang.</p>
+
+    <h2>4. Delen van gegevens</h2>
+    <p>Wij delen uw persoonsgegevens niet met derden, tenzij dit noodzakelijk is voor de uitvoering van onze diensten of als wij wettelijk verplicht zijn dit te doen.</p>
+
+    <h2>5. Uw rechten</h2>
+    <p>U heeft het recht om uw persoonsgegevens in te zien, te corrigeren of te verwijderen. Daarnaast kunt u bezwaar maken tegen de verwerking van uw persoonsgegevens of vragen om beperking van de verwerking.</p>
+
+    <h2>6. Contact</h2>
+    <p>Voor vragen over deze privacyverklaring of uw persoonsgegevens kunt u contact met ons opnemen via <a href="mailto:info@nhgooi.nl">info@nhgooi.nl</a>.</p>
+
    </div>
@endsection
--- a/resources/views/radioprogram.blade.php
+++ b/resources/views/radioprogram.blade.php
@@ -7,6 +7,9 @@
@section('page_class')
    grey_background page_container
@endsection
+@section('site_container_class')
+    grey_background
+@endsection

@section('breadcrumb')
    <ul class="bread_crumb">
--- a/resources/views/tvgids.blade.php
+++ b/resources/views/tvgids.blade.php
@@ -0,0 +1,18 @@
+
+@extends('layouts/full')
+
+@section('title')
+    Televisieprogrammering
+@endsection
+
+@section('content')
+
+    <div class="page_body">
+<p>NH Gooi TV zendt iedere dag de NH Gooi Nieuwscarrousel uit.
+De nieuwscarrousel start steeds op het hele uur en bestaat uit reportages uit Gooi en Vechtstreek, gericht op de kijkers van NH Gooi.
+</p>
+<p>
+De programmering van NH Gooi TV wordt af en toe  aangevuld met speciale programma’s, zoals bijvoorbeeld een talkshow of een registratie van een plaatselijk muziekfestijn. Deze programma’s worden aangekondigd op onze website.
+</p>
+    </div>
+@endsection
--- a/resources/views/tvprogrammering.blade.php
+++ b/resources/views/tvprogrammering.blade.php
@@ -0,0 +1,18 @@
+
+@extends('layouts/full')
+
+@section('title')
+    Televisieprogrammering
+@endsection
+
+@section('content')
+
+    <div class="page_body">
+<p>NH Gooi TV zendt iedere dag de NH Gooi Nieuwscarrousel uit.
+De nieuwscarrousel start steeds op het hele uur en bestaat uit reportages uit Gooi en Vechtstreek, gericht op de kijkers van NH Gooi.
+</p>
+<p>
+De programmering van NH Gooi TV wordt af en toe  aangevuld met speciale programma’s, zoals bijvoorbeeld een talkshow of een registratie van een plaatselijk muziekfestijn. Deze programma’s worden aangekondigd op onze website.
+</p>
+    </div>
+@endsection
--- a/resources/views/widgets/add_sidebar.blade.php
+++ b/resources/views/widgets/add_sidebar.blade.php
@@ -1,4 +1,4 @@
-@if ($ad_sidebar)
+@if ($ad_sidebar && (!isset($disableBanners) || !$disableBanners))
    <div style="width: 100%; font-family: Nunito,serif;font-size: 12px;font-weight: 500;line-height: 3.17;text-align: center;color: #666;">
        - Advertentie -
    </div>
--- a/resources/views/widgets/menu.blade.php
+++ b/resources/views/widgets/menu.blade.php
@@ -11,7 +11,8 @@
 //	    "Zondagsdienst" => "/kerkdienst"),
 		"TV" => array(
 				"" => "/kijk/live",
-				"Kijk live" => "/kijk/live"
+				"Kijk live" => "/kijk/live",
+				"TV-programmering" => "/kijk/gids",
 		),
 //     "NHGOOI TV @ YouTube" => "https://www.youtube.com/channel/UC0qLwqmXiLoL5PrLlgB6B4Q"),
 //     "Evenementen" => array(
@@ -19,22 +20,24 @@
 //         "24 uur Scherp de Zeis (4 december)" => "/programma/1030/scherp-zeis",
 //         "Winterse 50 (25 december)" => "/programma/1080/winterse-50",
 //         "Vroeger of Later Luisterlijst (2 januari)" => "/vol-luisterlijst"),
-		"App" => "/app",
 		"Podcasts" => array(
 				"" => "/podcast",
 				"NH Gooi Spreekuur" => "/podcast/1091/nh-gooi-spreekuur",
+				"Hilversum in de oorlog" => "/podcast/1097/hilversum-in-de-oorlog",
 				"Duurzaam Gooi" => "/podcast/1076/podcast-duurzaam-gooi"
 		),
+		"Gemist" => "/gemist/programma",
 		"Regioagenda" => "/agenda",
 		"Over NH Gooi" => array(
 				"" => "/contact",
 				"Contact" => "/contact",
                "Vacatures" => "/vacatures",
 				"Klachtenregeling" => "/klachten",
-				"Uitgangspunten streekredactie" => "/uploads/Eigen rol en ambities NH Gooi binnen de lokale nieuwsvoorziening.pdf",
+				"Rol en ambities lokale nieuwsvoorziening" => "/uploads/Eigen rol en ambities NH Gooi binnen de lokale nieuwsvoorziening.pdf",
 				"Frequenties" => "/frequenties",
-				"Adverteren?" => "/adverteren"
-		)
+				"App" => "/app"
+		),
+		"Adverteren" => "/adverteren"
 );
 ?>
 <?php
@@ -119,10 +122,10 @@ function buildMenu($menu, $ismobile)
 		<li class="{{isActive('/', false) ? "selected" : ""}}">
 			<a href="/" title="Home">Home</a>
 		</li>
-		@php($newsUrl = '/nieuws')
+		<?php /*@php($newsUrl = '/nieuws')
 		<li class="{{isActive($newsUrl, false) ? "selected" : ""}}">
 			<a href="{{$newsUrl}}" title="Nieuws">Nieuws</a>
-		</li>
+		</li>*/ ?>
 		{!! buildMenu($menu, false) !!}
 		<li></li>
 	</ul>
--- a/resources/views/widgets/nustraks.blade.php
+++ b/resources/views/widgets/nustraks.blade.php
@@ -6,6 +6,43 @@
@if($program->tagline)
 	<p>{{$program->tagline}}</p>
@endif
+<p class="now-playing-header-small">
+	<strong>Nu:</strong>
+	<span class="title"></span> -
+	<span class="artist"></span>
+</p>
+<script type="text/javascript" src="/js/jquery-3.7.1.min.js"></script>
+<script>
+	function updateOnAir() {
+		$.ajax({
+			url: '{{route('onair')}}',
+			success: function (data) {
+				$(document).trigger('onAirUpdated', data);
+			}
+		});
+	}
+
+	$(function () {
+		updateOnAir();
+		var onAirUpdater = setInterval(updateOnAir, 5000);
+		var $nowPlaying = {
+			container: $(".now-playing-header-small").hide(),
+			title: $(".now-playing-header-small .title"),
+			artist: $(".now-playing-header-small .artist"),
+		};
+		$(document).on('onAirUpdated', function (evt, data) {
+			var title = data.current ? data.current.title : '';
+			var artist = data.current ? data.current.artist : '';
+			if (data.inProgram) {
+				title = data.program.name;
+				artist = data.program.tagline;
+			}
+			$nowPlaying.title.text(title).attr('title', title);
+			$nowPlaying.artist.text(artist).attr('title', artist);
+			$nowPlaying.container.slideDown();
+		});
+	});
+</script>

 <h3 class="post_title">Daarna:</h3>
 <div class="podcast_items">
--- a/routes/web.php
+++ b/routes/web.php
@@ -109,6 +109,7 @@ Route::any('/luisterlijst/2021', 'Controller@view_luisterlijst_2021');
 Route::any('/luisterlijst', 'Controller@view_luisterlijst_2021');

 Route::any('/debat', 'Controller@view_debat');
+Route::any('/kijk/gids', 'Controller@view_tvgids');

 //Route::get('/special/stmaarten', function() { return file_get_contents('http://api-dev.6fm.nl/special/stmaarten'); });
 //Route::get('/kabelkrant', function() { return view('kabelkrant'); });