Merge branch 'master' of git.c3d2.de:c3d2-web
This commit is contained in:
commit
bee80a0cff
12
Makefile
12
Makefile
|
@ -273,7 +273,8 @@ build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(DATESTAMP)
|
|||
|
||||
DS_FEEDS=\
|
||||
datenspuren-2015-mp4.xml datenspuren-2015-webm.xml datenspuren-2015-opus.xml datenspuren-2015-mp3.xml \
|
||||
datenspuren-2016-mp4.xml datenspuren-2016-webm.xml datenspuren-2016-opus.xml datenspuren-2016-mp3.xml
|
||||
datenspuren-2016-mp4.xml datenspuren-2016-webm.xml datenspuren-2016-opus.xml datenspuren-2016-mp3.xml \
|
||||
datenspuren-2017-mp4.xml datenspuren-2017-webm.xml datenspuren-2017-opus.xml datenspuren-2017-mp3.xml
|
||||
|
||||
datenspuren-2015-mp4.xml:
|
||||
$(WGET) -O $@ https://media.ccc.de/podcast/conferences%2Fdatenspuren%2F2015/mp4
|
||||
|
@ -293,6 +294,15 @@ datenspuren-2016-opus.xml:
|
|||
datenspuren-2016-mp3.xml:
|
||||
$(WGET) -O $@ https://media.ccc.de/c/ds2016/podcast/mp3.xml
|
||||
|
||||
datenspuren-2017-mp4.xml:
|
||||
$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/mp4.xml
|
||||
datenspuren-2017-webm.xml:
|
||||
$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/webm.xml
|
||||
datenspuren-2017-opus.xml:
|
||||
$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/opus.xml
|
||||
datenspuren-2017-mp3.xml:
|
||||
$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/mp3.xml
|
||||
|
||||
build/datenspuren/$(DS_YEAR)/schedule-%.raw.xml: content/static/datenspuren/$(DS_YEAR)/fahrplan/schedule/%.html scripts/hyphenate.sed $(DATESTAMP)
|
||||
sed -f scripts/hyphenate.sed < $< > $@
|
||||
build/datenspuren/$(DS_YEAR)/schedule-%.xml : VFLAGS_IN=$(VFLAGS) --html
|
||||
|
|
|
@ -33,14 +33,8 @@
|
|||
</div>
|
||||
|
||||
<dl>
|
||||
<dt>Live-Streams</dt>
|
||||
<dd><link href="https://streaming.media.ccc.de/datenspuren17/">streaming.media.ccc.de/datenspuren17</link></dd>
|
||||
<!--
|
||||
<dt>Programm</dt>
|
||||
<dd><link href="fahrplan.html">Konferenz-Fahrplan</link>: Samstag ab 10:00 Uhr, Sonntag 10:00-17:00</dd>
|
||||
<dd>Social Event: Freitag ab 20 Uhr im <link href="http://diwan-dresden.de/">Diwan</link> (Dresden-Neustadt)</dd>
|
||||
<dd>Hackerparty: Samstag ab 18 Uhr im Turmcafe</dd>
|
||||
-->
|
||||
<dt>Video-Mitschnitte</dt>
|
||||
<dd><link href="https://media.ccc.de/c/DS2017">media.ccc.de/c/DS2017</link></dd>
|
||||
<dt>Infos</dt>
|
||||
<dd>Wiki: <link>https://wiki.c3d2.de/Datenspuren_2017</link></dd>
|
||||
<dd>Einreichungen: <link>https://frab.cccv.de/de/DS2017/cfp/</link></dd>
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
<p title="Datenspuren 2017" id="ds2017">
|
||||
Übernommen durch das <link href="http://c3voc.de/">CCC Video Operation Center</link>,
|
||||
erscheinen <link href="https://media.ccc.de/c/ds2017">auf media.ccc.de</link>.
|
||||
erscheinen <link href="https://media.ccc.de/c/DS2017">auf media.ccc.de</link>.
|
||||
</p>
|
||||
<include-feeds year="2017">
|
||||
<feed>../../datenspuren-2017-mp4.xml</feed>
|
||||
|
|
|
@ -262,7 +262,7 @@
|
|||
select="substring-before(substring-after(description, 'event on media: //media.ccc.de/'), '.html')"/>
|
||||
<xsl:variable name="title" select="substring-before(title, concat(' (ds', $year, ')'))"/>
|
||||
<xsl:variable name="preview"
|
||||
select="concat('https://static.media.ccc.de/media/events/datenspuren/', $year, '/', substring-before(substring-after(link, concat('/DS', $year, '-')), '-'), '-sd_preview.jpg')"/>
|
||||
select="concat('https://static.media.ccc.de/media/events/datenspuren/', $year, '/', substring-before(substring-after(link, concat('/DS', $year, '-')), '-'), '-hd.jpg')"/>
|
||||
|
||||
<section class="resource">
|
||||
<h4>
|
||||
|
|
Loading…
Reference in New Issue