diff options
| -rw-r--r-- | assets/js/lustiges-script.js | 8 | ||||
| -rw-r--r-- | index.php | 21 | ||||
| -rw-r--r-- | model/Relive.php | 32 | ||||
| -rw-r--r-- | template/allclosed.phtml | 37 |
4 files changed, 40 insertions, 58 deletions
diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index 7f22766..78b8758 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -182,11 +182,7 @@ $(function() { updateTimer = 5*1000, /* update display every 5 seconds */ refetchTimer = 10*60*1000, /* re-request current / upcoming schedule every 10 minutes */ scheduleData = {}, - $lecture = $('.room.has-schedule'), - - /* offset to the browsers realtime (for simulation) */ - offset = $('.js-settings').data('scheduleoffset');; - + $lecture = $('.room.has-schedule'); if($lecture.length == 0) return; @@ -210,7 +206,7 @@ $(function() { function updateProgtamTeaser() { var // corrected "now" timestamp in unix-counting (seconds, not microseconds) - now = (Date.now() / 1000) + offset; + now = (Date.now() / 1000); $.each(scheduleData, function(room, talks) { var currentTalk, nextTalk; @@ -140,7 +140,16 @@ try { catch(Exception $e) { ob_clean(); - require('view/500.php'); + try { + require('view/500.php'); + exit; + } + catch(Exception $e) { + header("HTTP/1.1 500 Internal Server Error"); + header("Content-Type: text/plain"); + print_r($e); + exit; + } } @@ -205,6 +214,11 @@ try { require('view/multiview.php'); } + else if($route == 'about') + { + require('view/about.php'); + } + // HAS-NOT-BEGUN VIEW else if(!$conference->hasBegun()) { @@ -238,11 +252,6 @@ try { require('view/overview.php'); } - else if($route == 'about') - { - require('view/about.php'); - } - else if($route == 'feedback') { require('view/feedback.php'); diff --git a/model/Relive.php b/model/Relive.php index ca32f19..7f0e747 100644 --- a/model/Relive.php +++ b/model/Relive.php @@ -34,22 +34,22 @@ class Relive $mapping = $this->getScheduleToRoomMapping(); - usort($talks, function($a, $b) { - // first, make sure that live talks are always on top - if($a['status'] == 'live' && $b['status'] != 'live') { - return -1; - } else if($a['status'] != 'live' && $b['status'] == 'live') { - return 1; - } else if($a['status'] == 'live' && $b['status'] == 'live') { - // sort live talks by room - - return strcmp($a['room'], $b['room']); - } - - // all other talks get sorted by their name - - return strcmp($a['title'], $b['title']); - }); + usort($talks, function($a, $b) { + // first, make sure that live talks are always on top + if($a['status'] == 'live' && $b['status'] != 'live') { + return -1; + } + else if($a['status'] != 'live' && $b['status'] == 'live') { + return 1; + } + else if($a['status'] == 'live' && $b['status'] == 'live') { + // sort live talks by room + return strcmp($a['room'], $b['room']); + } + + // all other talks get sorted by their name + return strcmp($a['title'], $b['title']); + }); $talks_by_id = array(); foreach ($talks as $talk) diff --git a/template/allclosed.phtml b/template/allclosed.phtml index 4d4ff38..e01aa3b 100644 --- a/template/allclosed.phtml +++ b/template/allclosed.phtml @@ -1,34 +1,11 @@ -<div class="container about"> - <? include("$assemblies/countdown.phtml") ?> +<? if($last): ?> - <? if($last): ?> + <? $conference = $last; include('closed.phtml'); ?> - <div class="well"> - <? // FIXME when $last would be a Conference object, this code could be shared with clodes.phtml ?> - <h1><?=h($last['title'])?> is over!</h1> +<? else: ?> - <? if($last['releases']): ?> - Recordings will be released at <a href="<?=h($last['releases'])?>"><?=h($last['releases'])?></a>. - <? endif ?> + <p> + You can watch most of our Recordings at <a href="https://media.ccc.de/">media.ccc.de</a>. + </p> - <? if($last['relive']): ?> - <? if($last['releases']): ?> - Until all recordings are released, <a href="<?=h($last['relive'])?>">ReLive</a> remains available. - <? else: ?> - You can still watch stream dumps <a href="<?=h($last['relive'])?>">here</a>. - <? endif ?> - <? endif ?> - </div> - - <? else: ?> - - <p> - You can watch most of our Recordings at <a href="<?=h($conference->getReleasesUrl())?>"><?=h($conference->getReleasesUrl())?></a>. - </p> - - <? endif ?> - - <br><br><br> - - <? include("$assemblies/upcoming.phtml") ?> -</div> +<? endif ?> |