From db7eaa38223393a78690800d5b2ce38f2e9f5c7a Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sun, 21 Aug 2016 12:16:00 +0200 Subject: fullscreen schedule view --- assets/css/_room.less | 4 ---- assets/css/_schedule.less | 2 +- assets/css/_structure.less | 1 + assets/js/lustiges-script.js | 4 ++-- index.php | 5 +++++ template/assemblies/schedule.phtml | 2 +- template/schedule.phtml | 1 + view/schedule.php | 8 ++++++++ 8 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 template/schedule.phtml create mode 100644 view/schedule.php diff --git a/assets/css/_room.less b/assets/css/_room.less index cd6d4c9..161000d 100644 --- a/assets/css/_room.less +++ b/assets/css/_room.less @@ -79,9 +79,5 @@ body.room { display: none; } } - - #schedule { - @import "_schedule.less"; - } } } diff --git a/assets/css/_schedule.less b/assets/css/_schedule.less index 1cd70ce..555428f 100644 --- a/assets/css/_schedule.less +++ b/assets/css/_schedule.less @@ -1,4 +1,4 @@ -.schedule { +body .schedule { &.scroll-container { overflow: hidden; overflow-x: scroll; diff --git a/assets/css/_structure.less b/assets/css/_structure.less index b85f2b1..fc3cced 100644 --- a/assets/css/_structure.less +++ b/assets/css/_structure.less @@ -110,6 +110,7 @@ body { @import "_error.less"; @import "_overview.less"; @import "_room.less"; +@import "_schedule.less"; @import "_relive.less"; @import "_multiview.less"; @import "_closed.less"; diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index adb785a..62c94be 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -51,7 +51,7 @@ $(function() { // schedule-timeline $(function() { var - $schedule = $('.schedule'), + $schedule = $('body .schedule'), $now = $schedule.find('.now'), scrollLock = false, rewindTimeout, @@ -156,7 +156,7 @@ $(function() { clearInterval(updateInterval); } - if(window.location.hash == '#schedule') + if(window.location.hash == '#schedule' || window.location.href.indexOf('/schedule') != -1) on(); // trigger when a tab was changed diff --git a/index.php b/index.php index 2d6a575..c7678d3 100644 --- a/index.php +++ b/index.php @@ -226,6 +226,11 @@ try { require('view/multiview.php'); } + else if($route == 'schedule') + { + require('view/schedule.php'); + } + else if($route == 'multiview/audio') { $_GET['selection'] = 'audio'; diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml index f913b64..b804196 100644 --- a/template/assemblies/schedule.phtml +++ b/template/assemblies/schedule.phtml @@ -3,7 +3,7 @@
now
getSchedule() ?> $events): ?> -
+
diff --git a/view/schedule.php b/view/schedule.php new file mode 100644 index 0000000..776536b --- /dev/null +++ b/view/schedule.php @@ -0,0 +1,8 @@ +render(array( + 'page' => 'schedule', + 'title' => 'Schedule-Übersicht', + + 'schedule' => new Schedule(), +)); -- cgit v1.2.3