diff options
Diffstat (limited to '')
| -rw-r--r-- | configs/conferences/rc3/config.php | 4 | ||||
| -rw-r--r-- | model/Conference.php | 3 | ||||
| -rw-r--r-- | template/about.phtml | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/configs/conferences/rc3/config.php b/configs/conferences/rc3/config.php index 3b7a830..9d20143 100644 --- a/configs/conferences/rc3/config.php +++ b/configs/conferences/rc3/config.php @@ -101,13 +101,15 @@ $CONFIG['CONFERENCE'] = array( * Wird beides aktiviert, hat der externe Link Vorrang! * Wird beides auskommentiert, wird der Link nicht angezeigt */ - 'RELIVE_JSON' => 'https://cdn.c3voc.de/relive/rc3/index.json' + 'RELIVE_JSON' => 'https://cdn.c3voc.de/relive/rc3/index.json', /** * APCU-Cache-Zeit in Sekunden * Wird diese Zeile auskommentiert, werden die apc_*-Methoden nicht verwendet und * das Relive-Json bei jedem Request von der Quelle geladen und geparst */ //'RELIVE_JSON_CACHE' => 30*60, + + 'ADDITIONAL_LICENCE_HTML' => 'Some sound effects and music obtained from <a href="https://www.zapsplat.com">zapsplat.com</a>', ); /** diff --git a/model/Conference.php b/model/Conference.php index 26bcc8b..fcc43c0 100644 --- a/model/Conference.php +++ b/model/Conference.php @@ -249,4 +249,7 @@ class Conference extends ModelBase public function getAdditionalHtml() { return $this->get('CONFERENCE.ADDITIONAL_HTML'); } + public function getAdditionalLicenceHtml() { + return $this->get('CONFERENCE.ADDITIONAL_LICENCE_HTML'); + } } diff --git a/template/about.phtml b/template/about.phtml index ec2791e..3d69f4a 100644 --- a/template/about.phtml +++ b/template/about.phtml @@ -1,12 +1,15 @@ <div class="container about"> <h1>About the Live-Streams and Recordings</h1> <p> - Lecture recording and streaming at <strong><?=h($conference->getTitle())?></strong> is organized and performed by the <a href="http://c3voc.de">Chaos Computer Club Video Operation Center</a>. All times in the schedule are UTC+2, we are happy to accept Pull requests to fix that, c.f. <a href="https://github.com/openstreetmap/stateofthemap-2020/issues/61">https://github.com/openstreetmap/stateofthemap-2020/issues/61</a>. + Lecture recording and streaming at <strong><?=h($conference->getTitle())?></strong> is organized and performed by the <a href="https://c3voc.de">Chaos Computer Club Video Operation Center</a>. </p> <h2>Licences</h2> <p> - The video stream is licensed under <a href="https://creativecommons.org/licenses/by/4.0/">CC Attribution 4.0 (CC BY 4.0)</a>. This may not hold true for the slides or the actual performance. If in doubt please contact the speaker directly. + The video stream is licensed under <a href="https://creativecommons.org/licenses/by/4.0/">CC Attribution 4.0 International (CC BY 4.0)</a>. This may not hold true for the slides or the actual performance. If in doubt please contact the speaker directly. + </p> + <p> + <?=$conference->getAdditionalLicenceHtml()?> </p> <p> Although the licence permits it, we would like to ask you not to distribute stream dumps. We try to release finished cuts of recordings as quickly as possible |