diff options
| author | VOC | 2015-11-13 19:48:45 +0100 |
|---|---|---|
| committer | VOC | 2015-11-13 19:48:45 +0100 |
| commit | 92f4fa13749566f6c4378f2c9e80774e8320b825 (patch) | |
| tree | f17c6da85da6edba9c7be10138687518ee534d50 /configs/conferences/31c3 | |
| parent | 32fd126b3fa937389efd1457e9d05daff9f3b347 (diff) | |
| parent | 29af764323dc474c14e05985eeabd3a06ef19c86 (diff) | |
Merge branch 'mandators'
Diffstat (limited to '')
| -rw-r--r-- | configs/conferences/31c3/config.php (renamed from config.php) | 6 | ||||
| -rwxr-xr-x | configs/conferences/31c3/download.sh | 7 | ||||
| -rw-r--r-- | configs/conferences/31c3/main.less | 21 |
3 files changed, 31 insertions, 3 deletions
diff --git a/config.php b/configs/conferences/31c3/config.php index 978d2d0..7a2df4b 100644 --- a/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', ); /** @@ -487,12 +487,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/conferences/31c3/main.less b/configs/conferences/31c3/main.less new file mode 100644 index 0000000..a60d3b4 --- /dev/null +++ b/configs/conferences/31c3/main.less @@ -0,0 +1,21 @@ +@import "../../../assets/css/_structure.less"; + +// conference specific styles here + +// often configured values (and their defaults): +// +// @brand-primary: #337ab7; +// @text-color: @gray-dark; +// +// @link-color: @brand-primary; +// @link-hover-color: darken(@link-color, 15%); +// +// @navbar-default-color: #777777; +// @navbar-default-bg: #f8f8f8; +// +// @navbar-default-link-color: #777; +// @navbar-default-link-hover-color: #333; + +body { + background-color: red; +} |