Mirrors/streaming-website
2
0
Fork 0
mirror of https://github.com/voc/streaming-website synced 2024-11-10 06:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

add option for additonal licence text on about page

Browse source
This commit is contained in:
Andreas Hubel 2020-12-22 19:29:17 +01:00
parent 5f9e58bf29
commit 21e66fcce6
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/conferences/rc3/config.php
View file

@ -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>',
);
/**

3
model/Conference.php
View file

@ -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');
}
}

7
template/about.phtml
View file

@ -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