From 34fd28abd6a4da827e1d3d80b71308d7e2a36a28 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:23:06 +0100
Subject: remove unised offsetting in js
---
assets/js/lustiges-script.js | 8 ++------
1 file changed, 2 insertions(+), 6 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;
--
cgit v1.2.3
From d0a891dcc4f261300616883aab384bd93f9f487c Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:23:22 +0100
Subject: aways print a stack-trace
---
index.php | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/index.php b/index.php
index 19a174a..b27055e 100644
--- a/index.php
+++ b/index.php
@@ -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;
+ }
}
--
cgit v1.2.3
From 3de0b86d9c3c82428ed7d1f0e04cec9fa2d0d758 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:23:45 +0100
Subject: alwas allow access to the conference about-page
---
index.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/index.php b/index.php
index b27055e..414dede 100644
--- a/index.php
+++ b/index.php
@@ -214,6 +214,11 @@ try {
require('view/multiview.php');
}
+ else if($route == 'about')
+ {
+ require('view/about.php');
+ }
+
// HAS-NOT-BEGUN VIEW
else if(!$conference->hasBegun())
{
@@ -247,11 +252,6 @@ try {
require('view/overview.php');
}
- else if($route == 'about')
- {
- require('view/about.php');
- }
-
else if($route == 'feedback')
{
require('view/feedback.php');
--
cgit v1.2.3
From b137ccc18be2f8addf10b0db5257da8c3767dba9 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:24:03 +0100
Subject: repair indentation
---
model/Relive.php | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
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)
--
cgit v1.2.3
From 751c58ebf7e8e6ea20b5f5116866f065e52ea1a2 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:24:14 +0100
Subject: use close-view in allclosed view
---
template/allclosed.phtml | 37 +++++++------------------------------
1 file changed, 7 insertions(+), 30 deletions(-)
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 ?>
--
cgit v1.2.3