diff --git a/.hgignore b/.hgignore index 1f45e676..5ef61de6 100644 --- a/.hgignore +++ b/.hgignore @@ -1 +1,2 @@ glob:website/storage +glob:website/public/images/banners diff --git a/website/.hgignore b/website/.hgignore index 19666391..c6e37bba 100644 --- a/website/.hgignore +++ b/website/.hgignore @@ -2,3 +2,4 @@ syntax: glob .env storage +website/public/images/banners diff --git a/website/app/Http/Controllers/RadioController.php b/website/app/Http/Controllers/RadioController.php index af51efde..52a2b13f 100644 --- a/website/app/Http/Controllers/RadioController.php +++ b/website/app/Http/Controllers/RadioController.php @@ -74,6 +74,22 @@ class RadioController extends Controller { return $this->getPodcastList($request, 'zoeken/' . $query)->with('query', urldecode($query)); } + + public function terugluisteren(Request $request) + { + $programs = []; + $apiResult = $this->API('programma/schema/recent'); + foreach($apiResult->schedule as $item) { + if(!$item->program->nonstop && !$item->program->rerun) { + $item->start = self::JsonToDateTime($item->start); + $item->end = self::JsonToDateTime($item->end); + $item->program = new \Model\Program($item->program); + $programs[] = $item; + } + } + + return view('programlist', ['programs' => array_reverse($programs)]); + } private function getPodcastList(Request $request, $action, $viewData = []) { diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css index 5bb8b6ee..7ca99477 100644 --- a/website/public/css/nhgooi.css +++ b/website/public/css/nhgooi.css @@ -8,32 +8,25 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a color: #1F3977; } +@media screen and (max-width:1069px) +{ + .logo { + float: none; + width: 100%; + text-align: center; + } + + .logo img.ri { + max-width: 75%; + } +} + @media screen and (max-width:767px) { -/* - .menu_container.sticky.move, - .boxed .menu_container.sticky.move - { - position: fixed; - top: 0pt; - left: 0px; - box-shadow: none; - -moz-box-shadow: none; - -webkit-box-shadow: none; - } - - .sticky.move .mobile-menu-switch { - margin-left: 0px; - } - - .sticky.move .mobile-menu { - background-color: #F0F0F0; - } -*/ - .row .column { width: 100%; } + .now-playing-header { width: 100% !important; margin-top: 30px !important; @@ -49,6 +42,11 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a } @media screen and (max-width: 479px) { + .header_container { + background-repeat: no-repeat; + background-position: left 95%; + background-size: auto 155px !important; + } .search { float: none; display: flex; @@ -68,6 +66,11 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a } } +.header_container { + background-image: url('../images/nh-banner.png'); + background-size: 100% ; +} + .header .now-playing-header { float: right; } @@ -76,7 +79,8 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a font-size: 16pt; font-family: 'Roboto Condensed'; font-weight: 300; - background: #F6F6F6; + /* background: #F6F6F6; */ + background: rgba(246, 246, 246, 0.4); width: 728px; color: #787878; text-align: center; @@ -91,7 +95,6 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a .now-playing-header .title, .now-playing-header .artist { - padding: 3px; } @@ -106,7 +109,6 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a position: absolute; padding: 3px; width: 100%; - background-color: inherit; } .now-playing-header .controls li { @@ -148,7 +150,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a height: 30px; width: 30px; background: url("/images/icons/navigation/go_top_arrow.png") no-repeat 50% 50%; - background-color: #ABABAB; + background-color: #ABABAB; } .scroll_top_floater:hover { @@ -178,6 +180,32 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a border-color: #2F4A88; } +.menu_container, .sf-menu li { + border-top-color: #03A6E0; +} + +.sf-menu li:hover, .sf-menu li.selected, .sf-menu li.submenu:hover { + border-top-color: #1F3977; +} + + +.mobile-menu-switch:hover { + background: #1F3977; +} + +.mobile-menu-switch { + border-color: #1F3977; +} + +.mobile-menu-switch .line { + background: #03A6E0; +} + +.mobile-menu li.selected a, .mobile-menu li.selected ul li.selected a, .mobile-menu li.selected ul li.selected ul li.selected a { + background: #1F3977; +} + + button[disabled], button[disabled]:hover { @@ -200,6 +228,7 @@ button[disabled]:hover margin-right: 50px; background: none; color: #464D53; + height: 40px; } .search .search_input.hint { @@ -216,6 +245,14 @@ button[disabled]:hover font-size: 0; } +.search .search_submit:hover { + background-color: #03A6E0; +} + +.slider_posts_list .slider_posts_list_bar { + background-color: #1F3977; +} + .post h2, .post h5 { text-overflow: ellipsis; diff --git a/website/public/images/nh-banner.png b/website/public/images/nh-banner.png new file mode 100644 index 00000000..d9f73c53 Binary files /dev/null and b/website/public/images/nh-banner.png differ diff --git a/website/resources/views/calendarevent.blade.php b/website/resources/views/calendarevent.blade.php index 5258628a..fdb68b71 100644 --- a/website/resources/views/calendarevent.blade.php +++ b/website/resources/views/calendarevent.blade.php @@ -43,7 +43,7 @@ @if($event->podcast->program) in {{ $event->podcast->program->name }} @endif
  • - + Meer over dit fragment diff --git a/website/resources/views/home.blade.php b/website/resources/views/home.blade.php index 1b949cc4..e3d598cd 100644 --- a/website/resources/views/home.blade.php +++ b/website/resources/views/home.blade.php @@ -164,8 +164,10 @@
    @include('widgets.banners') + {{--

      Meest gelezen

    @include('widgets.populairnieuws') + --}} @include('widgets.nustraks') diff --git a/website/resources/views/layouts/_head.blade.php b/website/resources/views/layouts/_head.blade.php index 5c37702c..0eed2288 100644 --- a/website/resources/views/layouts/_head.blade.php +++ b/website/resources/views/layouts/_head.blade.php @@ -25,7 +25,7 @@ set('url', url()->current()) ->prepend('image', $imgBase) - ->prepend('audio', route('gemist.details')) + ->prepend('audio', route('gemist.fragment')) ->append('title', ' | NH Gooi') ->metaTags(); } ?> diff --git a/website/resources/views/layouts/master.blade.php b/website/resources/views/layouts/master.blade.php index bca2844b..89d7832a 100644 --- a/website/resources/views/layouts/master.blade.php +++ b/website/resources/views/layouts/master.blade.php @@ -217,7 +217,6 @@
    @@ -261,6 +260,7 @@
    + @yield('page')
    @@ -273,7 +273,7 @@

    NH Gooi

    - NH Gooi is de streekomroep voor Hilversum, Huizen, Blaricum, Eemnes en Laren. + NH Gooi is de streekomroep voor het Gooi in samenwerking met NH Media. NH Gooi hoor je in heel Gooi en Eemland op 92.0 FM, 105.1 FM en 106.2 FM.

    diff --git a/website/resources/views/newsitem.blade.php b/website/resources/views/newsitem.blade.php index 86a094bb..5985aa61 100644 --- a/website/resources/views/newsitem.blade.php +++ b/website/resources/views/newsitem.blade.php @@ -55,7 +55,7 @@ @if($news->podcast->program) in {{ $news->podcast->program->name }} @endif
  • - + Meer over dit fragment diff --git a/website/resources/views/partial/podcastitems.blade.php b/website/resources/views/partial/podcastitems.blade.php index ee524110..4e2f5abc 100644 --- a/website/resources/views/partial/podcastitems.blade.php +++ b/website/resources/views/partial/podcastitems.blade.php @@ -4,7 +4,7 @@ @if($i > 0) @endif @endif + + @endif + + + + +@endsection + +@push('styles') + +@endpush diff --git a/website/resources/views/widgets/laatstepodcasts.blade.php b/website/resources/views/widgets/laatstepodcasts.blade.php index 8070b27f..eae543d4 100644 --- a/website/resources/views/widgets/laatstepodcasts.blade.php +++ b/website/resources/views/widgets/laatstepodcasts.blade.php @@ -6,7 +6,7 @@
    - {{$podcast->titleWithoutProgram()}} + {{$podcast->titleWithoutProgram()}}