From d1210e14416825a2ccf7a76f5b6c94967dde85d1 Mon Sep 17 00:00:00 2001 From: Mischa Spelt Date: Tue, 4 Feb 2020 20:22:40 +0100 Subject: [PATCH] Zoekfunctie, links gefixt --- website/app/Helpers/FormatterHelper.php | 5 +- website/app/Http/Controllers/Controller.php | 7 + .../app/Http/Controllers/NewsController.php | 2 +- website/public/css/nhgooi.css | 4 + .../resources/views/calendarevent.blade.php | 4 +- website/resources/views/contact.blade.php | 23 +- website/resources/views/home.blade.php | 394 +++++++++++------- .../resources/views/layouts/master.blade.php | 9 +- website/resources/views/newslist.blade.php | 262 +++--------- .../resources/views/widgets/menu.blade.php | 10 +- website/routes/web.php | 16 +- 11 files changed, 354 insertions(+), 382 deletions(-) diff --git a/website/app/Helpers/FormatterHelper.php b/website/app/Helpers/FormatterHelper.php index e7963b07..ad68922b 100644 --- a/website/app/Helpers/FormatterHelper.php +++ b/website/app/Helpers/FormatterHelper.php @@ -61,6 +61,7 @@ class FormatterHelper public static function excerpt($text, $maxLength) { + $allowed = ''; if(strlen($text) < $maxLength) { return $text; @@ -69,10 +70,10 @@ class FormatterHelper $matches = []; if(preg_match('/\W/', $text, $matches, PREG_OFFSET_CAPTURE, $maxLength)) { - return substr(strip_tags($text), 0, $matches[0][1]) . "..."; + return substr(strip_tags($text, $allowed), 0, $matches[0][1]) . "..."; } - return substr(strip_tags($text), $maxLength) . "..."; + return substr(strip_tags($text, $allowed), $maxLength) . "..."; } } /* diff --git a/website/app/Http/Controllers/Controller.php b/website/app/Http/Controllers/Controller.php index 49c83ab5..34fe9d0b 100644 --- a/website/app/Http/Controllers/Controller.php +++ b/website/app/Http/Controllers/Controller.php @@ -93,4 +93,11 @@ class Controller extends BaseController return new \DateTime($obj->date, new \DateTimeZone($obj->timezone)); } + public function __call($method, $arguments) { + if(substr($method, 0, 5) == 'view_') { + $view = substr($method, 5); + if(view()->exists($view)) { return view($view); } + } + return abort(404); + } } diff --git a/website/app/Http/Controllers/NewsController.php b/website/app/Http/Controllers/NewsController.php index 70c431e2..0a77d085 100644 --- a/website/app/Http/Controllers/NewsController.php +++ b/website/app/Http/Controllers/NewsController.php @@ -66,7 +66,7 @@ class NewsController extends Controller $news[] = new \Model\NewsItem($newsItem); } - return view($request->ajax() ? 'partial/newslist_small' : 'newslist', ['title' => $title, 'news' => $news, 'searchURL' => 'nieuws/zoeken']); + return view($request->ajax() ? 'partial/newslist_small' : ($title == null ? 'home' : 'newslist'), ['title' => $title, 'news' => $news, 'searchURL' => 'nieuws/zoeken']); } public function popular() diff --git a/website/public/css/nhgooi.css b/website/public/css/nhgooi.css index 6efdbc59..b7336fea 100644 --- a/website/public/css/nhgooi.css +++ b/website/public/css/nhgooi.css @@ -209,6 +209,10 @@ button[disabled]:hover color: inherit; } +.search .search_submit { + font-size: 0; +} + .post h2, .post h5 { text-overflow: ellipsis; diff --git a/website/resources/views/calendarevent.blade.php b/website/resources/views/calendarevent.blade.php index bc498374..54f99e46 100644 --- a/website/resources/views/calendarevent.blade.php +++ b/website/resources/views/calendarevent.blade.php @@ -40,10 +40,10 @@ - @endif + @if($loop->index % 2 == 1) + @endif + @endforeach + +
+ @include('partial/newslist_small', ['news' => array_slice($news, 6, count($news))])
-@endsection -@section('oud') - @if($title)

{{$title}}

@endif + @if(count($news) >= 15) +
+ +
+ @endif -
-
- @include('partial/newslistitems', ['news' => $news]) -
- - -
@endsection @push('scripts') @@ -256,7 +105,8 @@ if(!data) { // When no data was returned, disable the button permanently page = -1; - $button.attr("disabled", "disabled").text("Geen nieuws meer."); + $('#items').append("

Er zijn geen nieuwsberichten (meer).

"); + $button.remove(); return; } diff --git a/website/resources/views/widgets/menu.blade.php b/website/resources/views/widgets/menu.blade.php index 36ecd086..6c59270b 100644 --- a/website/resources/views/widgets/menu.blade.php +++ b/website/resources/views/widgets/menu.blade.php @@ -1,10 +1,10 @@ array( - "" => "/radio", + "" => "/", "Luister live" => "/luister/live", "Regionieuws" => "/luister/regionieuws", - "Programmagids" => "/radio/gids", - "Fragment gemist" => "/radio/gemist", + "Programmagids" => "/gids", + "Fragment gemist" => "/gemist", "Zondagsdienst" => "/kerkdienst"), "TV" => array( "Kijk live" => "/kijk/live"), @@ -107,14 +107,14 @@ function buildMenu($menu, $ismobile) { @endif @if($podcasts)
  • - + Fragment gemist
      @foreach($podcasts as $item)
    • @if($item->image) - + {{$item->title}} @endif diff --git a/website/routes/web.php b/website/routes/web.php index 39b7ec54..1d851f43 100644 --- a/website/routes/web.php +++ b/website/routes/web.php @@ -30,8 +30,8 @@ Route::get('/onair', 'RadioController@onair'); Route::get('/agenda', 'CalendarController@overview'); Route::get('/agenda/{id}/{title}', 'CalendarController@show')->where(['id' => '\d+']); -Route::get('/radio/gids/{shift?}', 'RadioController@schedule')->where(['shift' => '-?\d+']); -Route::get('/radio/programma/{id}/{title}', 'RadioController@program')->where(['id' => '\d+']); +Route::get('/gids/{shift?}', 'RadioController@schedule')->where(['shift' => '-?\d+']); +Route::get('/programma/{id}/{title}', 'RadioController@program')->where(['id' => '\d+']); Route::get('/luister/live', 'StreamController@liveradio'); Route::get('/luister/gemeenteraad', 'StreamController@gemeenteraad'); @@ -39,23 +39,25 @@ Route::get('/luister/fragment/{id}/{title}', 'StreamController@podcast')->where( Route::get('/luister/programma/{year}/{month}/{day}/{hour}/{duration}/{offset?}', 'StreamController@program') ->where(['id' => '\d+', 'year' => '20\d\d', 'month' => '\d\d?', 'day' => '\d\d?', 'hour' => '\d\d?', 'duration' => '\d\d?', 'offset' => '\d\d?']); -Route::get('/radio/gemist', ['as' => 'gemist', 'uses' => 'RadioController@podcasts']); -Route::get('/radio/gemist/zoeken/{query}', 'RadioController@searchpodcast'); -Route::get('/radio/gemist/zoeken', function(Illuminate\Http\Request $request) { +Route::get('/gemist', ['as' => 'gemist', 'uses' => 'RadioController@podcasts']); +Route::get('/gemist/zoeken/{query}', 'RadioController@searchpodcast'); +Route::get('/gemist/zoeken', function(Illuminate\Http\Request $request) { if($query = $request->get('query', null)) { return redirect('/gemist/zoeken/' . urlencode($query)); } return redirect('/gemist'); }); -Route::get('/radio/gemist/fragment/{id}/{title}', 'RadioController@podcast')->where(['id' => '\d+']); -Route::get('/radio/gemist/programma/{programma}/{title}', 'RadioController@podcasts')->where(['programma' => '\d+']); +Route::get('/gemist/fragment/{id}/{title}', 'RadioController@podcast')->where(['id' => '\d+']); +Route::get('/gemist/programma/{programma}/{title}', 'RadioController@podcasts')->where(['programma' => '\d+']); Route::get('/kijk/live', 'StreamController@livetv'); Route::get('/kerkdienst', 'KerkdienstController@main'); Route::get('/kerkdienst/luister', 'StreamController@kerkdienst'); +Route::get('/contact', 'Controller@view_contact'); + //Route::get('/6fm/over-6fm', function() { return view('about'); }); //Route::get('/6fm/contact', function() { return view('contact'); }); //Route::get('/6fm/adverteren', function() { return view('adverteren'); });