aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authordedeibel2018-12-22 14:31:09 +0100
committerdedeibel2018-12-22 14:31:09 +0100
commit8538b940eb44370859103dfd5ea7c6de87eb3609 (patch)
tree84eabaea1f22c687591248912ba54db0ca2789c1 /configs
parentb165d27cb95e764f119a0a212ec16a36f7b3281c (diff)
35c3: wikipakawg and chaoswest added as assembly rooms
Diffstat (limited to '')
-rw-r--r--configs/conferences/35c3/config.php66
-rw-r--r--configs/conferences/35c3/main.less20
2 files changed, 81 insertions, 5 deletions
diff --git a/configs/conferences/35c3/config.php b/configs/conferences/35c3/config.php
index d47ef24..58fb75d 100644
--- a/configs/conferences/35c3/config.php
+++ b/configs/conferences/35c3/config.php
@@ -129,8 +129,11 @@ $CONFIG['OVERVIEW'] = array(
'hallc',
'halld',
'halle',
- # TODO chaoswest
- # TODO freifunk
+ ),
+ 'Assemblies Live' => array(
+ 'chaoswest',
+ 'wikipakawg'
+ # freifunk / Open Infrastructure Orbit mit eigener infrastruktur, falls mögl verlinken
),
),
);
@@ -155,6 +158,8 @@ $CONFIG['ROOMS'] = array(
*/
'DISPLAY' => 'Adams',
+ 'WIDE' => true,
+
/**
* ID des Video/Audio-Streams. Die Stream-ID ist davon abhängig, welches
* Event-Case in welchem Raum aufgebaut wird und wird üblicherweise von
@@ -489,6 +494,7 @@ $CONFIG['ROOMS'] = array(
'halle' => array(
'DISPLAY' => 'Eliza',
+# 'WIDE' => true,
'STREAM' => 's4',
'PREVIEW' => true,
'TRANSLATION' => [
@@ -520,8 +526,60 @@ $CONFIG['ROOMS'] = array(
),
),
-);
+ 'chaoswest' => array(
+ 'DISPLAY' => 'Chaos West Bühne',
+ 'STREAM' => 'schaoswest', # TODO check with streaming config
+ 'PREVIEW' => true,
+ 'TRANSLATION' => [
+ ],
+ 'SD_VIDEO' => true,
+ 'HD_VIDEO' => true,
+ 'DASH' => true,
+ 'AUDIO' => true,
+ 'SLIDES' => false,
+ 'MUSIC' => false,
+ 'SCHEDULE' => true,
+ 'SCHEDULE_NAME' => 'Chaos West Bühne',
+ 'FEEDBACK' => true,
+ 'SUBTITLES' => false,
+ 'SUBTITLES_ROOM_ID' => 2,
+ 'EMBED' => true,
+ 'IRC' => false,
+ 'TWITTER' => true,
+ 'TWITTER_CONFIG' => array(
+ 'DISPLAY' => '@ChaosWildWest @ twitter',
+ 'TEXT' => '@ChaosWildWest',
+ ),
+ ),
+
+ 'wikipakawg' => array(
+ 'DISPLAY' => 'WikiPakaWG Esszimmer',
+ 'STREAM' => 'swikipakawg', # TODO check with streaming config
+ 'PREVIEW' => false,
+ 'TRANSLATION' => [
+ ],
+ 'SD_VIDEO' => true,
+ 'HD_VIDEO' => true,
+ 'DASH' => true,
+ 'AUDIO' => true,
+ 'SLIDES' => false,
+ 'MUSIC' => false,
+
+ 'SCHEDULE' => true,
+ 'SCHEDULE_NAME' => 'WikiPakaWG Esszimmer',
+ 'FEEDBACK' => true,
+ 'SUBTITLES' => false,
+ 'SUBTITLES_ROOM_ID' => 2,
+ 'EMBED' => true,
+ 'IRC' => false,
+ 'TWITTER' => true,
+ 'TWITTER_CONFIG' => array(
+ 'DISPLAY' => '#wikipakaWG @ twitter',
+ 'TEXT' => '#wikipakaWG',
+ ),
+ ),
+);
/**
* Konfigurationen zum Konferenz-Fahrplan
@@ -545,7 +603,7 @@ $CONFIG['SCHEDULE'] = array(
*
* Wird diese Zeile auskommentiert, werden alle Räume angezeigt
*/
- 'ROOMFILTER' => array('Adams', 'Borg', 'Clarke', 'Dijkstra', 'Eliza'),
+ 'ROOMFILTER' => array('Adams', 'Borg', 'Clarke', 'Dijkstra', 'Eliza', 'WikiPakaWG Esszimmer', 'Chaos West Bühne'),
/**
* Skalierung der Programm-Vorschau in Sekunden pro Pixel
diff --git a/configs/conferences/35c3/main.less b/configs/conferences/35c3/main.less
index 6090c30..1671a13 100644
--- a/configs/conferences/35c3/main.less
+++ b/configs/conferences/35c3/main.less
@@ -187,6 +187,7 @@ h4 {
}
/* let the gratient go over two panels horizontally, child 1 and 2, 3 and 4, and so on */
+/* attention, clearfix for WIDE rooms/panels are a child too */
.room-group .room:nth-child(1) .panel {
background-image: linear-gradient(80deg, @color-blue, @color-green 200%);
}
@@ -204,13 +205,30 @@ h4 {
}
.room-group .room:nth-child(5) .panel {
- background-image: linear-gradient(80deg, @color-blue, @color-green);
+ background-image: linear-gradient(80deg, @color-blue, @color-green 200%);
+}
+
+.room-group .room:nth-child(6) .panel {
+ background-image: linear-gradient(80deg, @color-blue -60%, @color-green);
+}
+
+.room-group .room:nth-child(7) .panel {
+ background-image: linear-gradient(80deg, @color-blue, @color-green 200%);
+}
+
+.room-group .room:nth-child(8) .panel {
+ background-image: linear-gradient(80deg, @color-blue -60%, @color-green);
}
div.row.recordings div:nth-child(2) .panel {
background-image: linear-gradient(80deg, @color-blue, @color-green 200%);
}
+/* gradient for wide panels is "normal" */
+.room-group .room.wide .panel {
+ background-image: linear-gradient(80deg, @color-blue, @color-green);
+}
+
/*
* NO RELIVE THEN:
*div.row.recordings div:nth-child(2) .panel {