Merge branch 'master' of git.c3d2.de:c3d2-web
This commit is contained in:
vv01f
commit
42ecd9f54a
7
Makefile
7
Makefile
|
|
@ -119,6 +119,7 @@ export: www
|
|||
|
||||
$(DATESTAMP):
|
||||
mkdir -p build
|
||||
mkdir -p build/datenspuren/$(DS_YEAR)/
|
||||
$(RM) $(wildcard build/.stamp-*)
|
||||
touch $@
|
||||
|
||||
|
|
@ -271,10 +272,12 @@ build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(DATESTAMP)
|
|||
|
||||
# Datenspuren
|
||||
|
||||
build/datenspuren/$(DS_YEAR)/schedule-%.raw.xml: content/static/datenspuren/$(DS_YEAR)/fahrplan/schedule/%.html scripts/hyphenate.sed $(DATESTAMP)
|
||||
scripts/hyphenate.sed < $< > $@
|
||||
build/datenspuren/$(DS_YEAR)/schedule-%.xml : VFLAGS_IN=$(VFLAGS) --html
|
||||
build/datenspuren/$(DS_YEAR)/schedule-%.xml : PFLAGS+=--html
|
||||
build/datenspuren/$(DS_YEAR)/schedule-%.xml : STYLE=xsl/datenspuren/frab2xml.xsl
|
||||
build/datenspuren/$(DS_YEAR)/schedule-%.xml: content/static/datenspuren/$(DS_YEAR)/fahrplan/schedule/%.html $(STYLE)
|
||||
build/datenspuren/$(DS_YEAR)/schedule-%.xml: build/datenspuren/$(DS_YEAR)/schedule-%.raw.xml $(STYLE)
|
||||
$(call xml_process)
|
||||
|
||||
build/datenspuren/$(DS_YEAR)/%html : STYLE=$(DS_STYLE)
|
||||
|
|
@ -306,7 +309,7 @@ build/datenspuren/2014/mitschnitte-rss.xml: content/news/ds14-mitschnitte-online
|
|||
$(call xml_process)
|
||||
|
||||
build/datenspuren/$(DS_YEAR)/pois.json:
|
||||
wget -O $@ --post-data="data=[out:json];($(foreach a, 'amenity'='restaurant' 'amenity'='fast_food' 'amenity'='cafe' 'amenity'='ice_cream' 'amenity'='bakery' 'shop'='convenience' 'shop'='supermarket' 'shop'='tobacco' 'amenity'='pub' 'amenity'='biergarten' 'amenity'='drinking_water', $(foreach t, node way relation, $t(51.01,13.76,51.07,13.82)[${a}];)));out center qt;" http://overpass-api.de/api/interpreter
|
||||
wget -O $@ --post-data="data=[out:json];($(foreach a, 'amenity'='restaurant' 'amenity'='fast_food' 'amenity'='cafe' 'amenity'='ice_cream' 'amenity'='bakery' 'shop'='convenience' 'shop'='supermarket' 'shop'='tobacco' 'amenity'='pub' 'amenity'='biergarten' 'amenity'='drinking_water', $(foreach t, node way relation, $t(51.01,13.76,51.07,13.82)[${a}];)));out center qt;" http://overpass.osm.rambler.ru/cgi/interpreter
|
||||
|
||||
|
||||
xhtml5-validate: $(patsubst build/%.html, build/%.html.xhtml5-validate, $(CONTENT))
|
||||
|
|
|
|||
|
|
@ -3,33 +3,18 @@
|
|||
|
||||
<page pagetitle="Datenspuren 2015" title="Datenspuren" xmlns:x="http://www.w3.org/1999/xhtml">
|
||||
<p title="Freitag, 23. Oktober">
|
||||
Ab 20:00 Uhr:
|
||||
Ab 20:00 Uhr: Social Event für alle Helfer im <link
|
||||
href="http://www.countdown-dresden.de/directions/index">Count
|
||||
Down</link>
|
||||
</p>
|
||||
<ul>
|
||||
<li>Social Event</li>
|
||||
</ul>
|
||||
|
||||
<p title="Sonnabend, 24. Oktober">
|
||||
Ab 10:00 Uhr:
|
||||
<include-frab-schedule src="../../build/datenspuren/2015/schedule-0.xml"
|
||||
title="Sonnabend, 24. Oktober"/>
|
||||
<p>
|
||||
Am Samstag im TSD-Café im Turm: Lounge ab 17:00 Uhr, Party ab
|
||||
19:00 Uhr
|
||||
</p>
|
||||
<ul>
|
||||
<li>Lightning Talks</li>
|
||||
<li>Vorträge</li>
|
||||
<li>Game Show</li>
|
||||
<li>Party im TSD-Café</li>
|
||||
<li>Junghacker-Track</li>
|
||||
</ul>
|
||||
<!--include-frab-schedule src="../../build/datenspuren/2015/schedule-0.xml"
|
||||
title="Sonnabend, 24. Oktober"/-->
|
||||
|
||||
<p title="Sonntag, 25. Oktober">
|
||||
Ab 10:00 Uhr:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Vorträge</li>
|
||||
<li>Podiumsdiskussion</li>
|
||||
<li>Junghacker-Track</li>
|
||||
</ul>
|
||||
<!--include-frab-schedule src="../../build/datenspuren/2015/schedule-1.xml"
|
||||
title="Sonntag, 25. Oktober"/-->
|
||||
<include-frab-schedule src="../../build/datenspuren/2015/schedule-1.xml"
|
||||
title="Sonntag, 25. Oktober"/>
|
||||
</page>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page pagetitle="Helfen" title="Helfen">
|
||||
<p title="Helfen vor Ort">
|
||||
Zur Veranstaltung müssen für verschiedene Aufgaben Schichten
|
||||
übernommen werden, welche wir im Wiki koordinieren. So gehts:
|
||||
</p>
|
||||
<ol>
|
||||
<li>
|
||||
<link href="https://wiki.c3d2.de/w/index.php?title=Spezial:Anmelden&type=signup">
|
||||
Erstelle einen Wiki-Account.
|
||||
</link>
|
||||
</li>
|
||||
<li>
|
||||
Klick den Link in der Bestätigungsmail.
|
||||
</li>
|
||||
<li>
|
||||
Bearbeite deine Benutzerseite. Hinterlasse Kontaktmöglichkeiten,
|
||||
am besten Jabber oder Mobilfunk.
|
||||
(Datenschutzhinweis: diese Wiki-Artikel sind öffentlich einsehbar.)
|
||||
</li>
|
||||
<li>
|
||||
Schreib dich im Schichtplan unter <link
|
||||
href="https://wiki.c3d2.de/Datenspuren_2015/Mitmachen">[[Datenspuren
|
||||
2015/Mitmachen]]</link> ein.
|
||||
</li>
|
||||
<li>
|
||||
Danke für dein Erscheinen!
|
||||
</li>
|
||||
</ol>
|
||||
|
||||
<p title="Finanzielle Unterstützung">
|
||||
Die Datenspuren werden vom Chaos Computer Club Dresden
|
||||
veranstaltet. Momentan haben wir <link
|
||||
href="http://www.c3d2.de/unterstuetzen.html">finanzielle
|
||||
Unterstützung</link> dringend <link
|
||||
href="http://www.c3d2.de/news/20150825-spendenaufruf.html">nötig!</link>
|
||||
</p>
|
||||
</page>
|
||||
|
|
@ -181,11 +181,37 @@ footer a {
|
|||
.schedule td.cell-height7,
|
||||
.schedule td.cell-height8 {
|
||||
border: 1px solid #ccc;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.schedule td.cell-time {
|
||||
border-bottom: 1px solid #ccc;
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
.schedule td {
|
||||
padding: 1px 2px;
|
||||
vertical-align: top;
|
||||
}
|
||||
.schedule {
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
width: 620px;
|
||||
}
|
||||
.schedule thead th {
|
||||
border-bottom: 1px solid #ccc;
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
.schedule th, .schedule td {
|
||||
width: 190px;
|
||||
}
|
||||
.schedule th.cell-time, .schedule td.cell-time {
|
||||
width: 50px;
|
||||
height: 2em;
|
||||
}
|
||||
.schedule h2 {
|
||||
font-size: 110%;
|
||||
margin: 0;
|
||||
}
|
||||
.schedule .event-details {
|
||||
color: #666;
|
||||
}
|
||||
|
||||
a[href$="mitschnitte-rss.xml"]:before {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
#!/bin/sed -f
|
||||
|
||||
s/Märchenstunde/Mär\­chen\­stun\­de/g
|
||||
s/Internet/Inter\­net/g
|
||||
s/Bildungskontext/Bil\­dungs\­kon\­text/g
|
||||
s/Lebensretter/Lebens\­ret\­ter/g
|
||||
s/Datenwanze/Da\­ten\­wan\­ze/g
|
||||
s/Smartcard/Smart\­card/g
|
||||
s/verängstigt/ver\­ängs\­ti\­gt/g
|
||||
s/Mikrocontrollerbasiert/Mikro\­control\­ler\­ba\­siert/g
|
||||
s/mobil/mo\­bil/g
|
||||
s/sicher/si\­cher/g
|
||||
s/Verschlüsselung/Ver\­schlüs\­se\­lung/g
|
||||
s/Textnachrichten/Text\­nach\­rich\­ten/g
|
||||
s/Fenster/Fen\­ster/g
|
||||
s/einschlagen/ein\­schla\­gen/g
|
||||
s/Jahre/Jah\­re/g
|
||||
s/Untersuchungsausschuss/Un\­ter\­su\­chungs\­aus\­schuss/g
|
||||
s/Ausblick/Aus\­blick/g
|
||||
s/HoneySens/Honey\­Sens/g
|
||||
s/Zukunftsstadt/Zu\­kunfts\­stadt/g
|
||||
s/Machine/Ma\­chi\­ne/g
|
||||
s/beginnen/be\­gin\­nen/g
|
||||
s/lernen/ler\­nen/g
|
||||
s/Grenzen/Gren\­zen/g
|
||||
s/Geheim/Ge\­heim/g
|
||||
s/Hagebuttenmarmelade/Ha\­ge\­but\­ten\­mar\­me\­la\­de/g
|
||||
s/Webscraping/Web\­scraping/g
|
||||
s/Workshop/Work\­shop/g
|
||||
s/Lightningtalk/Light\­ning\­talk/g
|
||||
s/Freiheitssimulation/Frei\­heits\­si\­mu\­la\­ti\­on/g
|
||||
s/Dezentral/De\­zen\­t\­ral/g
|
||||
s/Netzwerk/Netz\­werk/g
|
||||
s/Buchstaben/Buch\­sta\­ben/g
|
||||
s/Gramme/Gram\­me/g
|
||||
s/Autorenattribution/Au\­to\­re\­n\­at\­tri\­bution/g
|
||||
s/Sicherer/Si\­che\­rer/g
|
||||
s/Kontaktdatenaustausch/Kon\­takt\­da\­ten\­aus\­tausch/g
|
||||
|
|
@ -44,10 +44,10 @@
|
|||
<a href="about.html">Über</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="cfp.html">Call for Participation</a>
|
||||
<a href="location.html">Ort</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="location.html">Ort</a>
|
||||
<a href="help.html">Helfen</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="fahrplan.html">Fahrplan</a>
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
<xsl:template match="include-frab-schedule">
|
||||
<xsl:variable name="title" select="@title"/>
|
||||
<xsl:for-each select="document(@src)/day">
|
||||
<h2 class="scheduletitle">
|
||||
<h3 class="scheduletitle">
|
||||
<xsl:choose>
|
||||
<xsl:when test="$title">
|
||||
<xsl:value-of select="$title"/>
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
<xsl:value-of select="@title"/>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</h2>
|
||||
</h3>
|
||||
|
||||
<table class="schedule">
|
||||
<xsl:copy-of select="table/thead"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue