From 1612a82a6b4b8ec4f39160fd4713dc82e9400d13 Mon Sep 17 00:00:00 2001 From: Andreas Hubel Date: Tue, 11 Oct 2016 17:28:32 +0200 Subject: subscribe8: updated rooms, added logo --- configs/conferences/subscribe8/config.php | 28 ++++++++++++++-------------- configs/conferences/subscribe8/logo.png | Bin 0 -> 35356 bytes 2 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 configs/conferences/subscribe8/logo.png (limited to 'configs/conferences/subscribe8') diff --git a/configs/conferences/subscribe8/config.php b/configs/conferences/subscribe8/config.php index d9f2011..ef5381c 100644 --- a/configs/conferences/subscribe8/config.php +++ b/configs/conferences/subscribe8/config.php @@ -123,15 +123,15 @@ $GLOBALS['CONFIG']['OVERVIEW'] = array( * sonst werden sie nicht angezeigt. */ 'GROUPS' => array( - 'Vortragssäle' => array( + 'Konferenz' => array( + ), + 'Workshops' => array( 'grosser_sitzungssaal', 'kleiner_sitzungssaal' - ), - 'Sitzungszimmer (Workshops)' => array( - 'zimmer8', - 'zimmer4', - 'zimmer9', - 'zimmer3' + 'raum8', + 'raum4', + 'raum9', + 'raum3' ), ), ); @@ -257,7 +257,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array( * Name des Raums im Fahrplan * Wenn diese Zeile auskommentiert ist wird der Raum-Slug verwendet */ - 'SCHEDULE_NAME' => 'TBD', + 'SCHEDULE_NAME' => 'Großer Sitzungssaal', /** * Feedback anzeigen (boolean) @@ -339,7 +339,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array( * des globalen $GLOBALS['CONFIG']['TWITTER']-Blocks deaktiviert werden **/ 'TWITTER' => true, - ), + ) /*, 'kleiner_sitzungssaal' => array( 'DISPLAY' => 'Kleiner Sitzungssaal', @@ -353,13 +353,13 @@ $GLOBALS['CONFIG']['ROOMS'] = array( 'AUDIO' => true, 'SCHEDULE' => true, - 'SCHEDULE_NAME' => 'TBD', + 'SCHEDULE_NAME' => 'Kleiner Sitzungssaal', 'FEEDBACK' => true, 'EMBED' => true, 'TWITTER' => true, ), - 'zimmer8' => array( + 'raum8' => array( 'DISPLAY' => 'Sitzungszimmer 8', 'STREAM' => 'q8', @@ -372,13 +372,13 @@ $GLOBALS['CONFIG']['ROOMS'] = array( 'AUDIO' => true, 'SCHEDULE' => true, - 'SCHEDULE_NAME' => 'TBD', + 'SCHEDULE_NAME' => 'Raum8', 'FEEDBACK' => true, 'EMBED' => true, 'TWITTER' => true, ), - 'zimmer4' => array( + 'raum4' => array( 'DISPLAY' => 'Sitzungszimmer 4', 'STREAM' => 'q', @@ -396,7 +396,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array( 'FEEDBACK' => true, 'EMBED' => true, 'TWITTER' => true, - ) + ) */ ); /** diff --git a/configs/conferences/subscribe8/logo.png b/configs/conferences/subscribe8/logo.png new file mode 100644 index 0000000..9c6d2aa Binary files /dev/null and b/configs/conferences/subscribe8/logo.png differ -- cgit v1.2.3 From c76b7a987de0b40b6d6fdfbb56b1a17bd6c28e0d Mon Sep 17 00:00:00 2001 From: Andi Date: Tue, 11 Oct 2016 18:35:58 +0200 Subject: subscribe 8: misc local changes --- configs/conferences/subscribe8/config.php | 6 +++--- configs/conferences/subscribe8/download.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'configs/conferences/subscribe8') diff --git a/configs/conferences/subscribe8/config.php b/configs/conferences/subscribe8/config.php index ef5381c..184e5f0 100644 --- a/configs/conferences/subscribe8/config.php +++ b/configs/conferences/subscribe8/config.php @@ -124,10 +124,10 @@ $GLOBALS['CONFIG']['OVERVIEW'] = array( */ 'GROUPS' => array( 'Konferenz' => array( + 'grosser_sitzungssaal' ), 'Workshops' => array( - 'grosser_sitzungssaal', - 'kleiner_sitzungssaal' + 'kleiner_sitzungssaal', 'raum8', 'raum4', 'raum9', @@ -150,7 +150,7 @@ $GLOBALS['CONFIG']['ROOMS'] = array( /** * Angezeige-Name */ - 'DISPLAY' => 'Großer Sitzungssaal', + 'DISPLAY' => 'Sitzungssaal', /** * ID des Video/Audio-Streams. Die Stream-ID ist davon abhängig, welches diff --git a/configs/conferences/subscribe8/download.sh b/configs/conferences/subscribe8/download.sh index d92ed32..633d1f6 100755 --- a/configs/conferences/subscribe8/download.sh +++ b/configs/conferences/subscribe8/download.sh @@ -1,7 +1,7 @@ #!/bin/sh # fahrplan -wget --no-check-certificate -q "https://frab.sendegate.de/de/subscribe8/public/schedule.xml" -O /tmp/subscribe8-schedule.xml && mv /tmp/subscribe8-schedule.xml schedule.xml +wget --no-check-certificate -q "https://frab.das-sendezentrum.de/de/subscribe8/public/schedule.xml" -O /tmp/subscribe8-schedule.xml && mv /tmp/subscribe8-schedule.xml schedule.xml # relive wget --no-check-certificate -q "http://live.ber.c3voc.de/releases/relive/subscribe8/index.json" -O /tmp/subscribe8-relive.json && mv /tmp/subscribe8-relive.json relive.json -- cgit v1.2.3 From e065b7307ffc5d93883f9b20cf75a5afbec0e137 Mon Sep 17 00:00:00 2001 From: Andreas Hubel Date: Fri, 14 Oct 2016 14:42:46 +0200 Subject: subscribe8: config updated --- configs/conferences/subscribe8/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs/conferences/subscribe8') diff --git a/configs/conferences/subscribe8/config.php b/configs/conferences/subscribe8/config.php index 184e5f0..fb1a115 100644 --- a/configs/conferences/subscribe8/config.php +++ b/configs/conferences/subscribe8/config.php @@ -86,7 +86,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * Link zu den Recordings * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt */ - 'RELEASES' => 'https://www.youtube.com/playlist?list=TBD', + 'RELEASES' => 'https://www.youtube.com/playlist?list=PLIoqMTM7qDWr4jEWJ0WMQAdCFDSuk-ZJo', /** * Link zu einer (externen) ReLive-Übersichts-Seite @@ -101,7 +101,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * Wird beides aktiviert, hat der externe Link Vorrang! * Wird beides auskommentiert, wird der Link nicht angezeigt */ - //'RELIVE_JSON' => 'configs/conferences/sub7/relive.json', + 'RELIVE_JSON' => 'configs/conferences/subscribe8/relive.json', /** * APCU-Cache-Zeit in Sekunden -- cgit v1.2.3