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

Small fixes after golive

Browse Source
This commit is contained in:
Mischa Spelt
2020-02-28 11:40:07 +01:00
parent 1b1f4d4ebc
commit e7132c3240
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/app/Http/Controllers/StreamController.php
View File

@@ -7,10 +7,12 @@ use \Model\Podcast;
class StreamController extends Controller class StreamController extends Controller
{ {
private static $STREAM_URL = 'https://stream.nhgooi.nl:8001/';
public function liveradio() public function liveradio()
{ {
return view('listen', [ return view('listen', [
'source' => 'http://stream.nhgooi.nl:8000/mp3live', 'source' => self::$STREAM_URL . 'mp3live',
'title' => 'Luister live', 'title' => 'Luister live',
'content' => 'de live-uitzending van NH Gooi.', 'content' => 'de live-uitzending van NH Gooi.',
'isStream' => true ]); 'isStream' => true ]);
@@ -59,7 +61,7 @@ class StreamController extends Controller
public function gemeenteraad(Request $request) { public function gemeenteraad(Request $request) {
return view('listen', [ return view('listen', [
'source' => 'https://stream.nhgooi.nl:8000/gemhuizen', 'source' => self::$STREAM_URL . 'gemhuizen',
'title' => 'Gemeenteraad Huizen', 'title' => 'Gemeenteraad Huizen',
'content' => 'de openbare vergadering van de gemeenteraad Huizen', 'content' => 'de openbare vergadering van de gemeenteraad Huizen',
'isStream' => true, 'isStream' => true,

3
website/resources/views/widgets/menu.blade.php
View File

@@ -40,11 +40,12 @@ function buildMenu($menu, $ismobile) {
$isactive = isActive($link, !$ismobile); $isactive = isActive($link, !$ismobile);
$isplayer = !$submenu && substr($link, 0, 8) == '/luister'; $isplayer = !$submenu && substr($link, 0, 8) == '/luister';
$submenulink = $submenu && isset($link[""]) ? $link[""] : "#"; $submenulink = $submenu && isset($link[""]) ? $link[""] : "#";
$target = substr($submenu ? $submenulink : $link, 0, 4) == "http" ? "target='_blank'" : "";
if($isplayer) { $icon = "<span class='fas fa-headphones'></span>&nbsp;"; } if($isplayer) { $icon = "<span class='fas fa-headphones'></span>&nbsp;"; }
else { $icon = ""; } else { $icon = ""; }
$result .= $result .=
"<li class=\"" . ($submenu ? "submenu" : "") . ($isactive ? " selected" : "") . "\"> "<li class=\"" . ($submenu ? "submenu" : "") . ($isactive ? " selected" : "") . "\">
<a href=\"" . ($submenu ? $submenulink : $link) . "\" class=\"" . ($isplayer ? "player" : "") . "\" title=\"{$title}\">{$icon}{$title}</a>"; <a href=\"" . ($submenu ? $submenulink : $link) . "\" class=\"" . ($isplayer ? "player" : "") . "\" title=\"{$title}\" {$target}>{$icon}{$title}</a>";
if($submenu) { if($submenu) {
$result .= "\t\t\t<ul>\n" $result .= "\t\t\t<ul>\n"
. buildMenu($link, $ismobile) . buildMenu($link, $ismobile)