diff options
| author | MaZderMind | 2015-12-15 11:03:51 +0100 | 
|---|---|---|
| committer | MaZderMind | 2015-12-15 11:03:51 +0100 | 
| commit | be9b88aa2d4cbc272f9262cb20c64ed6144334d6 (patch) | |
| tree | 6904304afae92baef61e52e92e35d036875d5d52 /configs/conferences | |
| parent | eea8ca45910bd5b89c032c71a76f20a44eed4c61 (diff) | |
[32C3] use everything.schedule.xml and map rooms to schedule
Diffstat (limited to 'configs/conferences')
| -rw-r--r-- | configs/conferences/32c3/config.php | 4 | ||||
| -rwxr-xr-x | configs/conferences/32c3/download.sh | 2 | 
2 files changed, 4 insertions, 2 deletions
| diff --git a/configs/conferences/32c3/config.php b/configs/conferences/32c3/config.php index 2f6817f..afc7208 100644 --- a/configs/conferences/32c3/config.php +++ b/configs/conferences/32c3/config.php @@ -459,6 +459,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(  		'AUDIO' => true,  		'SCHEDULE' => true, +		'SCHEDULE_NAME' => 'Bühne',  		'FEEDBACK' => true,  		'SUBTITLES' => false,  		'EMBED' => true, @@ -471,6 +472,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array(  		'MUSIC' => true,  		'SCHEDULE' => true, +		'SCHEDULE_NAME' => 'Podcaster-Tisch',  		'FEEDBACK' => true,  		'EMBED' => true,  		'IRC' => false, @@ -506,7 +508,7 @@ $GLOBALS['CONFIG']['SCHEDULE'] = array(  	 *  	 * Wird diese Zeile auskommentiert, werden alle Räume angezeigt  	 */ -	//'ROOMFILTER' => array('Hall 1', 'Hall 2', 'Hall G', 'Hall 6'), +	'ROOMFILTER' => array('Hall 1', 'Hall 2', 'Hall G', 'Hall 6', 'Podcaster-Tisch', 'Bühne'),  	/**  	 * Skalierung der Programm-Vorschau in Sekunden pro Pixel diff --git a/configs/conferences/32c3/download.sh b/configs/conferences/32c3/download.sh index ca8c5e0..fecb6e7 100755 --- a/configs/conferences/32c3/download.sh +++ b/configs/conferences/32c3/download.sh @@ -1,7 +1,7 @@  #!/bin/sh  # fahrplan -wget --no-check-certificate -q "http://events.ccc.de/congress/2015/Fahrplan/schedule.xml" -O /tmp/schedule.xml && mv /tmp/schedule.xml schedule.xml +wget --no-check-certificate -q "http://data.c3voc.de/32C3/everything.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 | 
