diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index 32be272c..b85bc76b 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -236,18 +236,18 @@ -
  • - - - - -
  • - +
  • +
  • + + + + +
  • @@ -435,7 +435,7 @@ title: $(".now-playing-header .title"), artist: $(".now-playing-header .artist"), controls: $(".now-playing-header .controls"), - studiocam: $(".now-playing-header .watch-studio"), + studiocam: $(".now-playing-header .watch-studio, li.watch-studio"), programLink: $(".now-playing-header .program-link a"), programLabel: $(".now-playing-header .program-link a > label"), first: true diff --git a/resources/views/widgets/menu.blade.php b/resources/views/widgets/menu.blade.php index b0f82b89..7277c3e6 100644 --- a/resources/views/widgets/menu.blade.php +++ b/resources/views/widgets/menu.blade.php @@ -2,6 +2,7 @@ "Radio" => array( "" => "/gids", "Luister live" => "/luister/live", + "Kijk in de studio" => "/kijk/studio", "Regionieuws" => "/luister/regionieuws", "Programmagids" => "/gids", "Programma gemist" => "/gemist/programma", @@ -38,13 +39,19 @@ function buildMenu($menu, $ismobile) { if($title == "") { continue; } $submenu = is_array($link); $isactive = isActive($link, !$ismobile); - $isplayer = !$submenu && substr($link, 0, 8) == '/luister'; + $icon = ""; + $isplayer = false; + $liClass = ""; + if(!$submenu && substr($link, 0, 8) == '/luister') { $icon = "headphones"; $isplayer = true; } + if(!$submenu && $link == '/kijk/live') { $icon = "tv"; } + if(!$submenu && $link == '/kijk/studio') { $liClass = "watch-studio"; $icon = "video"; } + $submenulink = $submenu && isset($link[""]) ? $link[""] : "#"; $target = substr($submenu ? $submenulink : $link, 0, 4) == "http" ? "target='_blank'" : ""; - if($isplayer) { $icon = " "; } + if($icon) { $icon = " "; } else { $icon = ""; } $result .= - "
  • + "
  • {$icon}{$title}"; if($submenu) { $result .= "\t\t\t