diff --git a/Makefile b/Makefile
index f432ddfbf..a25bd97e1 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ WWW_CCC_DE_UPDATES=chaosupdates.xml
# Calendar summary::
CALENDAR_SUMMARY=calendar-summary.xml
# Datenspuren Fahrplan
-DS_SCHEDULE=$(wildcard content/static/datenspuren/$(DS_YEAR)/fahrplan/day_*.html)
+DS_SCHEDULE=$(patsubst content/static/datenspuren/$(DS_YEAR)/fahrplan/schedule/%.html, build/datenspuren/$(DS_YEAR)/schedule-%.xml, $(wildcard content/static/datenspuren/$(DS_YEAR)/fahrplan/schedule/?.html))
### Ziele ###
# Mindestens 1x täglich neubauen wegen Chaosupdates & Kalender
@@ -222,12 +222,18 @@ build/news/%.html : BASEURL="../"
build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP)
$(call xml_process)
+# Datenspuren
+
+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)
+ $(call xml_process)
+
build/datenspuren/$(DS_YEAR)/%html : STYLE=$(DS_STYLE)
build/datenspuren/$(DS_YEAR)/%.html: content/datenspuren/%.xml $(DS_STYLE) news.xml $(DS_SCHEDULE)
$(call xml_process)
-build/datenspuren/$(DS_YEAR)/schedule.html : content/static/datenspuren/$(DS_YEAR)/fahrplan/index.de.html
-
build/datenspuren/$(DS_YEAR)/news-rss.xml : STYLE=xsl/rss.xsl
build/datenspuren/$(DS_YEAR)/news-rss.xml : NOVALID:=true
build/datenspuren/$(DS_YEAR)/news-rss.xml : PFLAGS+=--stringparam prefix ds13-
diff --git a/content/datenspuren/fahrplan.xml b/content/datenspuren/fahrplan.xml
index f9d600785..fe82a4061 100644
--- a/content/datenspuren/fahrplan.xml
+++ b/content/datenspuren/fahrplan.xml
@@ -2,7 +2,8 @@
- Wird hier erscheinen.
-
+
+
diff --git a/content/static/datenspuren/2013/style/style.css b/content/static/datenspuren/2013/style/style.css
index 7173cbd30..7aa0681f3 100644
--- a/content/static/datenspuren/2013/style/style.css
+++ b/content/static/datenspuren/2013/style/style.css
@@ -459,3 +459,129 @@ footer a:hover, aside a:hover {
top: 64px;
}
}
+
+
+/* Fahrplan */
+
+
+.schedule {
+ border-collapse: collapse;
+}
+.schedule th, .schedule td {
+ border-width: 1px;
+ border-style: solid;
+ border-color: rgba(0.5, 0.5, 0.5, 0.2);
+ vertical-align: top;
+ margin: 0;
+ padding: 0px 0.4em;
+}
+.schedule h2 {
+ font-size: 100%;
+}
+.schedule .cell-time p {
+ color: #f3f3f3;
+ font-weight: normal;
+}
+.schedule .event-wrapper {
+ background: none;
+}
+
+
+.schedule .cell-height1 {
+ height: 40px;
+ }
+.schedule .cell-height2 {
+ height: 77px;
+ }
+.schedule .cell-height3 {
+ height: 117px;
+ }
+.schedule .cell-height4 {
+ height: 157px;
+ }
+.schedule .cell-height5 {
+ height: 197px;
+ }
+.schedule .cell-height6 {
+ height: 237px;
+ }
+.schedule .cell-height7 {
+ height: 277px;
+ }
+.schedule .cell-height8 {
+ height: 317px;
+ }
+.schedule .cell-height9 {
+ height: 357px;
+ }
+.schedule .cell-height10 {
+ height: 397px;
+ }
+.schedule .cell-height11 {
+ height: 437px;
+ }
+.schedule .cell-height12 {
+ height: 477px;
+ }
+.schedule .cell-height13 {
+ height: 517px;
+ }
+.schedule .cell-height14 {
+ height: 557px;
+ }
+.schedule .cell-height15 {
+ height: 597px;
+ }
+.schedule .cell-height16 {
+ height: 637px;
+ }
+.schedule .cell-height17 {
+ height: 677px;
+ }
+.schedule .cell-height18 {
+ height: 717px;
+ }
+.schedule .cell-height19 {
+ height: 757px;
+ }
+.schedule .cell-height20 {
+ height: 797px;
+ }
+
+.schedule .event.track-default {
+ border-color: #156dd0;
+}
+.schedule .event.track-default div.event-header {
+}
+.schedule .event.track-default div.event-header a {
+ color: #fff;
+}
+
+
+.schedule .event.track-gesellschaft {
+ border-color: #156dd0;
+ }
+.schedule .event.track-gesellschaft div.event-header {
+ }
+.schedule .event.track-gesellschaft div.event-header a {
+ color: #fff;
+ }
+
+.schedule .event.track-junghacker {
+ border-color: #156dd0;
+ }
+.schedule .event.track-junghacker div.event-header {
+ }
+.schedule .event.track-junghacker div.event-header a {
+ color: #fff;
+ }
+
+.schedule .event.track-technik {
+ border-color: #156dd0;
+ }
+.schedule .event.track-technik div.event-header {
+ }
+.schedule .event.track-technik div.event-header a {
+ color: #fff;
+ }
+
diff --git a/xsd/c3d2web.xsd b/xsd/c3d2web.xsd
index 544974b1c..9477b8786 100644
--- a/xsd/c3d2web.xsd
+++ b/xsd/c3d2web.xsd
@@ -91,7 +91,7 @@
-
+
@@ -207,10 +207,10 @@
-
+
-
+
diff --git a/xsl/datenspuren/frab2xml.xsl b/xsl/datenspuren/frab2xml.xsl
new file mode 100644
index 000000000..3c30e3d46
--- /dev/null
+++ b/xsl/datenspuren/frab2xml.xsl
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl
index 02348cfcf..6c1c8ef8b 100644
--- a/xsl/datenspuren/xhtml5.xsl
+++ b/xsl/datenspuren/xhtml5.xsl
@@ -112,96 +112,25 @@