From efe1f83a7cc419df700dfe36ef11da20607d8eae Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 8 Nov 2015 14:40:30 +0100
Subject: implement mandator handling, supporting different styles per
mandantor
---
template/page.phtml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'template')
diff --git a/template/page.phtml b/template/page.phtml
index bd73065..37f192a 100644
--- a/template/page.phtml
+++ b/template/page.phtml
@@ -29,20 +29,20 @@
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
--
cgit v1.3.1
From a0b2129479ba10561811847c0651df8b55c8a6ba Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 8 Nov 2015 15:15:53 +0100
Subject: Support an All-Conference-Closed Screen and mutliple Schedules &
Relive-URLs
---
assets/css/_closed.less | 1 +
assets/js/lustiges-script.js | 2 +-
configs/conferences/31c3/config.php | 6 ++--
configs/conferences/31c3/download.sh | 7 ++++
configs/download.sh | 14 +++++---
index.php | 22 +++++++++++-
model/Conferences.php | 2 +-
model/GenericConference.php | 67 ++++++++++++++++++++++++++++++++++++
template/allclosed.phtml | 14 ++++++++
template/assemblies/header.phtml | 2 +-
template/assemblies/upcoming.phtml | 21 +++++++++++
template/closed.phtml | 22 +-----------
template/embed.phtml | 2 +-
template/page.phtml | 28 ++++++++-------
view/allclosed.php | 12 +++++++
15 files changed, 175 insertions(+), 47 deletions(-)
create mode 100755 configs/conferences/31c3/download.sh
create mode 100644 model/GenericConference.php
create mode 100644 template/allclosed.phtml
create mode 100644 template/assemblies/upcoming.phtml
create mode 100644 view/allclosed.php
(limited to 'template')
diff --git a/assets/css/_closed.less b/assets/css/_closed.less
index 8aeeb78..ff55b75 100644
--- a/assets/css/_closed.less
+++ b/assets/css/_closed.less
@@ -1,4 +1,5 @@
body.closed,
+body.allclosed,
body.not-started {
p {
margin-top: 50px;
diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js
index 15f0358..38dc3ae 100644
--- a/assets/js/lustiges-script.js
+++ b/assets/js/lustiges-script.js
@@ -558,7 +558,7 @@ $(function() {
// closed-countdown
$(function() {
var
- $el = $('.closed .countdown'),
+ $el = $('.countdown'),
dt = moment($el.data('dt'));
$el.attr('title', 'on '+dt.format('dddd, MMM Do YYYY'))
diff --git a/configs/conferences/31c3/config.php b/configs/conferences/31c3/config.php
index a0f6383..1ad5709 100644
--- a/configs/conferences/31c3/config.php
+++ b/configs/conferences/31c3/config.php
@@ -106,7 +106,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
*
* Wird diese Zeile auskommentiert, wird der Link nicht angezeigt
*/
- 'RELIVE_JSON' => 'configs/vod.json',
+ 'RELIVE_JSON' => 'configs/conferences/31c3/vod.json',
);
/**
@@ -486,12 +486,12 @@ $GLOBALS['CONFIG']['SCHEDULE'] = array(
/**
* URL zum Fahrplan-XML
*
- * Diese URL muss immer verfügbar sein, sonst können kann die Programm-Ansicht
+ * Diese URL muss immer verfügbar sein, sonst könnte die Programm-Ansicht
* aufhören zu funktionieren. Üblicherweise wird diese daher Datei über
* das Script configs/download.sh heruntergeladen, welches von einem
* Cronjob regelmäßig getriggert wird.
*/
- 'URL' => 'configs/schedule.xml',
+ 'URL' => 'configs/conferences/31c3/schedule.xml',
/**
* Nur die angegebenen Räume aus dem Fahrplan beachten
diff --git a/configs/conferences/31c3/download.sh b/configs/conferences/31c3/download.sh
new file mode 100755
index 0000000..81d5ad7
--- /dev/null
+++ b/configs/conferences/31c3/download.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# fahrplan
+wget --no-check-certificate -q "http://events.ccc.de/congress/2014/Fahrplan/schedule.xml" -O /tmp/schedule.xml && mv /tmp/schedule.xml schedule.xml
+
+# vod json
+wget -q "http://cdn.c3voc.de/releases/relive/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json
diff --git a/configs/download.sh b/configs/download.sh
index 8808ff0..c2a2b3e 100755
--- a/configs/download.sh
+++ b/configs/download.sh
@@ -1,10 +1,14 @@
#!/bin/sh
-# fahrplan
-wget --no-check-certificate -q "http://events.ccc.de/congress/2014/Fahrplan/schedule.xml" -O /tmp/schedule.xml && mv /tmp/schedule.xml schedule.xml
-
-# vod json
-wget -q "http://cdn.c3voc.de/releases/relive/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json
+# conferences
+wd=`pwd`
+for d in conferences/*; do
+ if [ -x $d/download.sh ]; then
+ cd $d
+ ./download.sh
+ cd $wd
+ fi
+done
# eventkalender upcoming
wget -q --no-check-certificate "https://c3voc.de/eventkalender/events.json?filter=upcoming&streaming=yes" -O /tmp/upcoming.json && mv /tmp/upcoming.json upcoming.json
diff --git a/index.php b/index.php
index f12d914..cdd58a7 100644
--- a/index.php
+++ b/index.php
@@ -12,6 +12,7 @@ require_once('lib/less.php/Less.php');
require_once('model/ModelBase.php');
require_once('model/Conferences.php');
require_once('model/Conference.php');
+require_once('model/GenericConference.php');
require_once('model/Feedback.php');
require_once('model/Schedule.php');
require_once('model/Overview.php');
@@ -26,17 +27,35 @@ require_once('model/Upcoming.php');
$route = @$_GET['route'];
$route = rtrim($route, '/');
+// GLOBAL CSS (for conferences overview)
+if($route == 'gen/main.css')
+{
+ handle_lesscss_request('assets/css/main.less', '../assets/css/');
+ exit;
+}
+
@list($mandator, $route) = explode('/', $route, 2);
if(!$mandator)
{
// root requested
+ $tpl = new PhpTemplate('template/page.phtml');
+ $tpl->set(array(
+ 'baseurl' => forceslash(baseurl()),
+ 'route' => $route,
+ 'canonicalurl' => forceslash(baseurl()).forceslash($route),
+ 'assemblies' => './template/assemblies/',
+ 'assets' => 'assets/',
+
+ 'conference' => new GenericConference(),
+ ));
+
if(Conferences::getActiveConferencesCount() == 0)
{
// no clients
// error
- var_dump('no clients');
+ require('view/allclosed.php');
exit;
}
else if(Conferences::getActiveConferencesCount() == 1)
@@ -79,6 +98,7 @@ $tpl->set(array(
'route' => $route,
'canonicalurl' => forceslash(baseurl()).forceslash($route),
'assemblies' => './template/assemblies/',
+ 'assets' => '../assets/',
'conference' => $conference,
'feedback' => new Feedback(),
diff --git a/model/Conferences.php b/model/Conferences.php
index 05d3c52..9f87388 100644
--- a/model/Conferences.php
+++ b/model/Conferences.php
@@ -54,6 +54,6 @@ class Conferences extends ModelBase
public static function load($mandator) {
$GLOBALS['MANDATOR'] = $mandator;
- include(forceslash(Conferences::MANDATOR_DIR).forceslash($mandator).'config.php');
+ require(forceslash(Conferences::MANDATOR_DIR).forceslash($mandator).'config.php');
}
}
diff --git a/model/GenericConference.php b/model/GenericConference.php
new file mode 100644
index 0000000..949766f
--- /dev/null
+++ b/model/GenericConference.php
@@ -0,0 +1,67 @@
+
+
+ See you soon at
+
+
+
+
+ You can watch most of our Recordings at getReleasesUrl())?>.
+
+
+
+
+
+
diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml
index f57054c..a213dd3 100644
--- a/template/assemblies/header.phtml
+++ b/template/assemblies/header.phtml
@@ -15,7 +15,7 @@
- hasEnded() && $feedback->isEnabled()): ?>
+ hasEnded() && isset($feedback) && $feedback->isEnabled()): ?>
diff --git a/template/assemblies/upcoming.phtml b/template/assemblies/upcoming.phtml
new file mode 100644
index 0000000..7d9ffac
--- /dev/null
+++ b/template/assemblies/upcoming.phtml
@@ -0,0 +1,21 @@
+
+
+
diff --git a/template/closed.phtml b/template/closed.phtml
index 6ca7416..0b56e74 100644
--- a/template/closed.phtml
+++ b/template/closed.phtml
@@ -29,25 +29,5 @@
-
-
-
+
diff --git a/template/embed.phtml b/template/embed.phtml
index dd8629a..f99ece1 100644
--- a/template/embed.phtml
+++ b/template/embed.phtml
@@ -1 +1 @@
-getPlayerType().'.phtml') ?>
+getPlayerType().'.phtml') ?>
diff --git a/template/page.phtml b/template/page.phtml
index 37f192a..ac639a2 100644
--- a/template/page.phtml
+++ b/template/page.phtml
@@ -29,20 +29,20 @@
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -55,8 +55,10 @@
-
+
+
+