diff --git a/Makefile b/Makefile index 8ff343aa6..9f9bcd387 100644 --- a/Makefile +++ b/Makefile @@ -172,8 +172,6 @@ build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION) $(D build/datenspuren/%html : STYLE=$(DS_STYLE) build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) news.xml $(call xml_process) -build/datenspuren/schedule.html : VFLAGS_IN=$(VFLAGS) --schema xsd/xhtml1-strict.xsd -build/datenspuren/schedule.html : NOVALID_IGNORE:=true #content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.html # cp $< $@ diff --git a/content/datenspuren/fahrplan.xml b/content/datenspuren/fahrplan.xml index 673bba0f4..bbc01b343 100644 --- a/content/datenspuren/fahrplan.xml +++ b/content/datenspuren/fahrplan.xml @@ -2,6 +2,6 @@ -

Fahrplan

-

Um vom Fahrplan auf die Hauptseite zurück zu gelangen, bitte auf das Logo oben links klicken!

+ + diff --git a/content/static/datenspuren/css/fahrplan.css b/content/static/datenspuren/css/fahrplan.css new file mode 100644 index 000000000..f5def3e8f --- /dev/null +++ b/content/static/datenspuren/css/fahrplan.css @@ -0,0 +1,21 @@ +table.schedule { + margin-top: 0.2em; + margin-bottom: 1em; +} +table.schedule tr th { + background-color: #eee; +} +table.schedule tr td.odd { + background-color: #eee; +} +table.schedule tr td.event { + background-color: #eee; + padding: 0 0.2em; +} +table.schedule tr td.event ul { + list-style-type: none; + font-size: 50%; +} +table.schedule tr td.event ul li { + display: inline-block; +} \ No newline at end of file diff --git a/content/static/datenspuren/css/general.css b/content/static/datenspuren/css/general.css index 3f6979dfd..5e9bd8bdd 100644 --- a/content/static/datenspuren/css/general.css +++ b/content/static/datenspuren/css/general.css @@ -1,4 +1,5 @@ @import "reset.css"; @import "reset_ie.css"; @import "structure.css"; -@import "type.css"; \ No newline at end of file +@import "type.css"; +@import "fahrplan.css"; \ No newline at end of file diff --git a/xsd/c3d2web.xsd b/xsd/c3d2web.xsd index 7c6245adb..d3e9f52e2 100644 --- a/xsd/c3d2web.xsd +++ b/xsd/c3d2web.xsd @@ -84,6 +84,7 @@ + @@ -194,4 +195,10 @@ + + + + + + diff --git a/xsl/datenspuren/xhtml.xsl b/xsl/datenspuren/xhtml.xsl index 382825a00..05d366f84 100644 --- a/xsl/datenspuren/xhtml.xsl +++ b/xsl/datenspuren/xhtml.xsl @@ -61,93 +61,86 @@ wird hier überall manuell durchiteriert. Vorgehensweise klar? -~~~~ --> - - Programm - - - - - - - - + + +

+ +

+ + + + + + + + + + + + + + - - - +
+ + schedulehead + + +
+ + + -
- - - - - - - - - - - - - - - - - - - - - - + + + + + + + event + + event + + + + + + + + + + -
- 5. Mai - 6. Mai - -
- - schedulehead - - -
- - - scheduletime - scheduleevent - scheduleempty - - - - - + + + + + timeslot - - - + + even + + + odd - - - - event - - - - - -
-
+
+