aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2016-08-21 12:16:00 +0200
committerMaZderMind2016-08-21 12:16:09 +0200
commitdb7eaa38223393a78690800d5b2ce38f2e9f5c7a (patch)
tree13ea014fba95c5fab9469c28a9d0c6da909ee176
parentcd5e49d5fbe649b2b079e295cde0ae32f013f592 (diff)
fullscreen schedule view
Diffstat (limited to '')
-rw-r--r--assets/css/_room.less4
-rw-r--r--assets/css/_schedule.less2
-rw-r--r--assets/css/_structure.less1
-rw-r--r--assets/js/lustiges-script.js4
-rw-r--r--index.php5
-rw-r--r--template/assemblies/schedule.phtml2
-rw-r--r--template/schedule.phtml1
-rw-r--r--view/schedule.php8
8 files changed, 19 insertions, 8 deletions
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 @@
<div class="now"><span>now</span></div>
<? $rooms = $schedule->getSchedule() ?>
<? foreach($rooms as $roomname => $events): ?>
- <div class="room <? if($roomname == $room->getSlug()): ?>highlight<? endif ?>" style="width: <?=round($schedule->getDurationSum() / $schedule->getScale())?>px">
+ <div class="room <? if(isset($room) && $roomname == $room->getSlug()): ?>highlight<? endif ?>" style="width: <?=round($schedule->getDurationSum() / $schedule->getScale())?>px">
<? $fromstart = 0; ?>
<? foreach($events as $event): ?>
<div
diff --git a/template/schedule.phtml b/template/schedule.phtml
new file mode 100644
index 0000000..4363f27
--- /dev/null
+++ b/template/schedule.phtml
@@ -0,0 +1 @@
+<? require("$assemblies/schedule.phtml") ?>
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 @@
+<?php
+
+echo $tpl->render(array(
+ 'page' => 'schedule',
+ 'title' => 'Schedule-Übersicht',
+
+ 'schedule' => new Schedule(),
+));