Merge branch 'redesign' of git.c3d2.de:c3d2-web into redesign

This reverts commit 273a294a49.

Makefile

@@ -1,307 +1,108 @@
-# eingebaute Variablen und Regeln werden nicht gebraucht
-MAKEFLAGS += -rR
 
-### Programme ###
-# XSLT-Prozessor:
 PROCESSOR=xsltproc
-PFLAGS=--novalid --catalogs --stringparam baseurl $(BASEURL)
-BASEURL=""
-# XML-Validator
-VALIDATOR=xmllint
-VFLAGS=--noout --nonet
-# VALIDATOR-Flags für Eingabe-XML (meist c3d2web)
-VFLAGS_IN=$(VFLAGS) --schema xsd/c3d2web.xsd
-# VALIDATOR-Flags für Ausgabe-XML (xhtml, rss, atom, ...)
-VFLAGS_OUT=$(VFLAGS)
-SGML_CATALOG_FILES=$(XML_CATALOG)
-export SGML_CATALOG_FILES
-# Downloadmanager (Alternativ: curl, fetch):
-WGET=wget
-# rsync
-RSYNC=rsync
-RSYNC_FLAGS=--verbose --recursive --delete --delete-after --delete-excluded --checksum --chmod=ugo=rX
-# Editor
-EDITOR?=vim
-# Browser
-BROWSER?=links
+PFLAGS=--novalid
+# The root directory of every transformation
+# used in the following makefile
+TRANSFORMATION_ROOT=transformation
 
-# Verzeichnis, in das exportiert werden soll
-DESTDIR?=www-export
+# TODO: Define a transformation procedure for each transformation
+#       within $(TRANSFORMATION_ROOT) and its subdirectories.
 
-### Ressourcen ###
-# XSLT-Stylesheets:
-STYLE=xsl/xhtml5.xsl
-DS_STYLE=xsl/datenspuren/xhtml5.xsl
-DS_YEAR=2013
-# Document-Type-Definition:
-DTD:=dtd/c3d2web.dtd
-# XML-Katalog (Pfad zu den DTDs) - wird benötigt vom Validator
-XML_CATALOG:=dtd/catalog.xml
-# Navigationsleiste:
-NAVIGATION=content/navigation.xml
-# Chaosupdates:
-WWW_CCC_DE_UPDATES=chaosupdates.xml
-# Calendar summary::
-CALENDAR_SUMMARY=calendar-summary.xml
-# Datenspuren Fahrplan
-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))
+HTML_OUTPUT=output/html
+PAGE_OUTPUT=output/page
+NEWS_OUTPUT=output/news
 
-### Ziele ###
-# Mindestens 1x täglich neubauen wegen Chaosupdates & Kalender
-DATESTAMP=build/.stamp-$(shell date +%Y-%m-%d)
+#
+# Predefined functions
+#
 
-# Dateinamen der zu erzeugenden html-Dateien:
-CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(DS_FEEDS) $(NEWSFILES) build/calendar.html
+# calendar2page (target, pathinclude) where
+# "target" - the path of the xml file to be transformed
+# "pathinclude" - additional paths (separated by whitespace) for inclusion of news items
+calendar2page = $(PROCESSOR) $(PFLAGS) --path "$(PAGE_OUTPUT) $(2)" $(TRANSFORMATION_ROOT)/calendar2page/calendar2page.xsl $(1)
 
-# 'normale' Seiten:
-PAGES:=$(patsubst content/pages/%.xml, build/%.html, $(wildcard content/pages/*.xml))
-# Seiten zu einzelnen News-Items:
-NEWS_PAGES:=$(patsubst content/news/%.xml, build/news/%.html, $(wildcard content/news/*.xml))
-# News-Index und Feeds:
-NEWSFILES:=build/news.html build/news-rss.xml build/news-atom.xml \
-	build/podcast.xml build/pentaradio.xml build/pentacast.xml build/pentamusic.xml build/pentamedia.xml \
-	build/news-archiv-rss.xml build/news-archiv-atom.xml \
-	build/podcast-archiv.xml build/pentaradio-archiv.xml build/pentacast-archiv.xml \
-	build/pentamusic-archiv.xml build/pentamedia-archiv.xml \
-	build/ical.ics build/xcal.xml build/reminders \
-	build/datenspuren/$(DS_YEAR)/news-rss.xml build/datenspuren/$(DS_YEAR)/news-atom.xml \
-	build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml \
-	build/portal.html
-PLAYLISTS:=$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.xspf, $(wildcard content/news/pentaradio*.xml)) \
-	$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.pls, $(wildcard content/news/pentaradio*.xml)) \
-	$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.m3u, $(wildcard content/news/pentaradio*.xml))
-# Datenspuren-Seiten:
-DS_PAGES:=$(patsubst content/datenspuren/%.xml, build/datenspuren/$(DS_YEAR)/%.html, $(wildcard content/datenspuren/*.xml))
-DS_FEEDS:= \
-	build/datenspuren/2009/mitschnitte-rss.xml \
-	build/datenspuren/2010/mitschnitte-rss.xml \
-	build/datenspuren/2011/mitschnitte-rss.xml \
-	build/datenspuren/2012/mitschnitte-rss.xml \
-	build/datenspuren/2013/mitschnitte-rss.xml
+# news2page (target, pathinclude) where
+# "target" - the path of the xml file to be transformed
+# "pathinclude" - additional paths (separated by whitespace) for inclusion of news items
+news2page = $(PROCESSOR) $(PFLAGS) --path "$(NEWS_OUTPUT) $(2)" $(TRANSFORMATION_ROOT)/news2page/news2page.xsl $(1)
 
-# Quellen
-NEWSITEMS:=$(wildcard content/news/*.xml)
-CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DS_PAGES) $(DS_FEEDS)
+# page2html (target, pathinclude) where
+# "target" - the path of the xml file to be transformed
+# "pathinclude" - additional paths (separated by whitespace) for inclusion of news items
+page2html = $(PROCESSOR) $(PFLAGS) --path "$(PAGE_OUTPUT) $(TRANSFORMATION_ROOT)/page2html $(2)" html.xsl $(1)
 
-NOINPUTVALID:=false
-NOVALID:=false
+#
+# Locations of the files to be generated
+#
+PAGES_DIR=content/c3d2/pages
+STATIC_PAGES:=$(patsubst $(PAGES_DIR)/%.xml, $(HTML_OUTPUT)/%.html, $(wildcard $(PAGES_DIR)/*.xml))
+ITEMS_DIR=content/c3d2/items
+NEWS_ITEMS:=$(patsubst $(ITEMS_DIR)/%.xml, $(HTML_OUTPUT)/news/%.html, $(wildcard $(ITEMS_DIR)/*.xml))
 
-define xml_process
-	$(NOINPUTVALID) || $(VALIDATOR) $(VFLAGS_IN) $<
-	$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
-	$(NOVALID) || $(VALIDATOR) $(VFLAGS_OUT) $@ || \
-		{ touch -m -t 197001010000 Makefile $@ ; exit 1 ; }
-endef
+#
+# The main recipe
+#
 
-### Defaults ###
+all: prepare_output $(HTML_OUTPUT)/kalender.html $(HTML_OUTPUT)/news.html $(NEWS_ITEMS) $(STATIC_PAGES) 
 
-.PHONY: www
-www: $(XML_CATALOG) $(CONTENT)
-	$(RSYNC) $(RSYNC_FLAGS) --exclude=".stamp-*" content/static/ content/old-site/ build/ $@
-	@echo
-	@echo
-	@echo 'Great!'
-	@echo
-	@echo 'You may now run `make -j3 xhtml5-validate` to make sure everything fits.'
-	@echo
+prepare_output:
+	mkdir -p $(HTML_OUTPUT) $(PAGE_OUTPUT) $(NEWS_OUTPUT)
+	cp -rf content/c3d2/static/* $(HTML_OUTPUT)
 
-.PHONY: export
-export: www
-	$(RSYNC) $(RSYNC_FLAGS) --exclude=".git/" www/ $(DESTDIR)/
+#
+# Generic rule for the static pages
+# listed in STATIC_PAGES
+#
 
-$(DATESTAMP):
-	mkdir -p build
-	$(RM) $(wildcard build/.stamp-*)
-	touch $@
-
-### Regeln für den XSLT-Prozess ###
-
-build/%.html : NOVALID:=true
-build/news.html: $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP)
-
-## Feedgrößen begrenzen
-build/%.xml : MAX_ITEMS=23
-build/%-archiv.xml build/news-archiv-%.xml : MAX_ITEMS=9999999
-## Erscheinen regelmäßig, aber guck durch mehr als 23 Items zurück
-build/pentaradio.xml build/pentamusic.xml : MAX_ITEMS=100
-## Erscheint leider nicht so oft
-build/pentacast.xml build/pentacast-ogg.xml : MAX_ITEMS=200
-build/pentamedia.xml : MAX_ITEMS=50
-build/%.xml : PFLAGS+=--param maxitems $(MAX_ITEMS)
-
-build/news-rss.xml build/news-archiv-rss.xml : STYLE=xsl/rss.xsl
-build/news-rss.xml build/news-archiv-rss.xml : PFLAGS+=--stringparam prefix ""
-build/news-rss.xml build/news-archiv-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/news-rss.xml : PFLAGS+=--stringparam archivefeed news-archiv-rss.xml
-build/news-atom.xml build/news-archiv-atom.xml : STYLE=xsl/atom.xsl
-build/news-atom.xml build/news-archiv-atom.xml : PFLAGS+=--stringparam prefix ""
-build/news-atom.xml build/news-archiv-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
-build/news-atom.xml : PFLAGS+=--stringparam archivefeed news-archiv-atom.xml
-build/podcast.xml build/podcast-archiv.xml : STYLE=xsl/podcast.xsl
-build/podcast.xml build/podcast-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/podcast.xml build/podcast-archiv.xml : PFLAGS+=--stringparam format audio/mpeg,video/mp4
-build/podcast.xml build/podcast-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/podcast.xml : PFLAGS+=--stringparam archivefeed podcast-archiv.xml
-build/pentaradio.xml build/pentaradio-archiv.xml : STYLE=xsl/podcast.xsl
-build/pentaradio.xml build/pentaradio-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentaradio.xml build/pentaradio-archiv.xml : PFLAGS+=--stringparam selection pentaradio --stringparam format audio/mpeg,video/mp4
-build/pentaradio.xml build/pentaradio-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentaradio.xml : PFLAGS+=--stringparam archivefeed pentaradio-archiv.xml
-build/pentacast.xml build/pentacast-archiv.xml : STYLE=xsl/podcast.xsl
-build/pentacast.xml build/pentacast-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentacast.xml build/pentacast-archiv.xml : PFLAGS+=--stringparam selection pentacast --stringparam format audio/mpeg,video/mp4
-build/pentacast.xml build/pentacast-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentacast.xml : PFLAGS+=--stringparam archivefeed pentacast-archiv.xml
-
-build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : STYLE=xsl/podcast.xsl
-build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : PFLAGS+=--stringparam selection pentacast --stringparam format audio/ogg,video/ogg,application/ogg,video/webm
-build/pentacast-ogg.xml build/pentacast-ogg-archiv.xml : xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentacast-ogg.xml : PFLAGS+=--stringparam archivefeed pentacast-ogg-archiv.xml
-
-build/pentamusic.xml build/pentamusic-archiv.xml : STYLE=xsl/podcast.xsl
-build/pentamusic.xml build/pentamusic-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentamusic.xml build/pentamusic-archiv.xml : PFLAGS+=--stringparam selection pentamusic --stringparam format audio/mpeg,video/mp4
-build/pentamusic.xml build/pentamusic-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentamusic.xml : PFLAGS+=--stringparam archivefeed pentamusic-archiv.xml
-
-build/pentamedia.xml build/pentamedia-archiv.xml : STYLE=xsl/podcast.xsl
-build/pentamedia.xml build/pentamedia-archiv.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/pentamedia.xml build/pentamedia-archiv.xml : PFLAGS+=--stringparam selection pentamedia --stringparam format audio/mpeg,video/mp4
-build/pentamedia.xml build/pentamedia-archiv.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
-build/pentamedia.xml : PFLAGS+=--stringparam archivefeed pentamedia-archiv.xml
-
-#.INTERMEDIATE: news.xml
-news.xml: $(NEWSITEMS)
-	sh scripts/gen_news.xml.sh $^ > $@
-
-$(NEWSFILES): news.xml $(NAVIGATION) $(STYLE)
-	$(call xml_process)
-
-# Calendar
-$(CALENDAR_SUMMARY) : STYLE=xsl/calendar-summary.xsl
-$(CALENDAR_SUMMARY) : NOVALID:=true
-$(CALENDAR_SUMMARY) : VFLAGS_IN=$(VFLAGS)
-$(CALENDAR_SUMMARY): content/events.xml news.xml
-	$(call xml_process)
-
-build/calendar.html : VFLAGS_IN=$(VFLAGS)
-build/calendar.html: $(CALENDAR_SUMMARY) $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) $(DATESTAMP)
-	$(call xml_process)
-
-# XCal
-build/xcal.xml : STYLE=xsl/xcal.xsl
-build/xcal.xml : VFLAGS_IN=$(VFLAGS)
-build/xcal.xml: $(CALENDAR_SUMMARY) $(STYLE)
-	$(call xml_process)
-
-# iCal
-build/ical.ics : STYLE=xsl/ical.xsl
-build/ical.ics : NOVALID:=true
-build/ical.ics : VFLAGS_IN=$(VFLAGS)
-build/ical.ics : VFLAGS_OUT=$(VFLAGS)
-build/ical.ics: $(CALENDAR_SUMMARY) $(STYLE)
-	$(call xml_process)
-
-# Remind
-build/reminders : STYLE=xsl/remind.xsl
-build/reminders : NOVALID:=true
-build/reminders : VFLAGS_IN=$(VFLAGS)
-build/reminders : VFLAGS_OUT=$(VFLAGS)
-build/reminders: $(CALENDAR_SUMMARY) $(STYLE)
-	$(call xml_process)
-
-# Playlists
-build/%.xspf : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/xspf-1_0.5.rng
-build/%.m3u : NOVALID:=true
-build/%.pls : NOVALID:=true
-
-# Portal
-portal:
-	mkdir $@
-
-portal/fetch.sh : STYLE=xsl/portal2fetch.xsl
-portal/fetch.sh : NOINPUTVALID:=true
-portal/fetch.sh : NOVALID:=true
-portal/fetch.sh: content/portal-config.xml $(STYLE)
-	$(call xml_process)
-	chmod a+x $@
-
-portal/items.xml : STYLE=xsl/portal2items.xsl
-portal/items.xml : NOINPUTVALID:=true
-portal/items.xml : NOVALID:=true
-portal/items.xml: content/portal-config.xml $(STYLE) portal/fetch.sh news.xml
-	( cd portal && ./fetch.sh )
-	$(call xml_process)
-
-portal/items-sorted.xml : STYLE=xsl/portal-sort.xsl
-portal/items-sorted.xml: portal/items.xml $(STYLE)
-	$(call xml_process)
-
-build/portal.html : NOINPUTVALID:=true
-build/portal.html: portal/items-sorted.xml $(STYLE) $(CALENDAR_SUMMARY)
-	$(call xml_process)
-
-# Pages:
-build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(DATESTAMP) news.xml
-	$(call xml_process)
-
-# News:
-build/news/%.html : BASEURL="../"
-build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(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)/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-
-build/datenspuren/$(DS_YEAR)/news-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/datenspuren/$(DS_YEAR)/news-atom.xml : STYLE=xsl/atom.xsl
-build/datenspuren/$(DS_YEAR)/news-atom.xml : NOVALID:=true
-build/datenspuren/$(DS_YEAR)/news-atom.xml : PFLAGS+=--stringparam prefix ds13-
-build/datenspuren/$(DS_YEAR)/news-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
-
-build/datenspuren/%/mitschnitte-rss.xml : STYLE=xsl/newsfile-to-podcast.xsl
-build/datenspuren/%/mitschnitte-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/datenspuren/2009/mitschnitte-rss.xml: content/news/ds09-videomitschnitte.xml $(STYLE)
-	$(call xml_process)
-build/datenspuren/2010/mitschnitte-rss.xml: content/news/ds10-videomitschnitte-komplett.xml $(STYLE)
-	$(call xml_process)
-build/datenspuren/2011/mitschnitte-rss.xml: content/news/ds11-mitschnitte-online.xml $(STYLE)
-	$(call xml_process)
-build/datenspuren/2012/mitschnitte-rss.xml: content/news/ds12-videomitschnitte-komplett.xml $(STYLE)
-	$(call xml_process)
-build/datenspuren/2013/mitschnitte-rss.xml: content/news/ds13-videomitschnitte-komplett.xml $(STYLE)
-	$(call xml_process)
+$(HTML_OUTPUT)/%.html: $(PAGES_DIR)/%.xml
+	$(call page2html, $<, content/c3d2 content/c3d2/templates content/c3d2/pages) > $@ 
 
 
-xhtml5-validate: $(patsubst build/%.html, build/%.html.xhtml5-validate, $(CONTENT))
-build/%.html.xhtml5-validate: build/%.html
-	./scripts/validate_xhtml5.sh $<
+#
+# CALENDAR
+#
 
+$(HTML_OUTPUT)/kalender.html: $(PAGE_OUTPUT)/kalender.xml
+	$(call page2html, $(PAGE_OUTPUT)/kalender.xml, content/c3d2 content/c3d2/templates content/c3d2/pages) > $@
 
+$(PAGE_OUTPUT)/kalender.xml: $(PAGE_OUTPUT)/news.xml
+    # First tranformation to unite calendar-only events and news items
+	# TODO: May be handled by different stylesheets.
+	$(call calendar2page, content/c3d2/calendar.xml, $(NEWS_OUTPUT) $(ITEMS_DIR)) > $(PAGE_OUTPUT)/calendar-summary.xml
+	# The actual calendar2page-transformation
+	$(call calendar2page, $(PAGE_OUTPUT)/calendar-summary.xml, $(NEWS_OUTPUT) $(ITEMS_DIR)) > $@
+#
+# NEWS
+#
 
-### Die neuesten Chaosupdates holen ###
-$(WWW_CCC_DE_UPDATES).orig: $(DATESTAMP)
-	$(RM) $@
-	$(WGET) -O $@ -4 http://www.ccc.de/de/rss/updates.rdf
+# Points to a script or executable, which takes
+# the directory containing the newsitems in xml-format
+# as parameter and passes a corresponding list in xml-format
+# to STDOUT
+LIST_GENERATOR=scripts/generate-news-list.sh
 
-$(WWW_CCC_DE_UPDATES): $(WWW_CCC_DE_UPDATES).orig
-	$(VALIDATOR) --recover $< > $@
+#    Transform all items into pages 
+$(PAGE_OUTPUT)/items/%.xml: $(ITEMS_DIR)/%.xml
+	mkdir -p $(PAGE_OUTPUT)/items/
+	$(call news2page, $<) > $@ 
+
+#    Transform the pages representing news items into HTML
+$(HTML_OUTPUT)/news/%.html: $(PAGE_OUTPUT)/items/%.xml
+	mkdir -p $(HTML_OUTPUT)/news/
+	$(call page2html, $<, content/c3d2 content/c3d2/templates content/c3d2/pages) > $@ 
+
+#    Generate a list of all news items
+#    stored within $(ITEMS_DIR).
+$(NEWS_OUTPUT)/news-list.xml:
+	$(LIST_GENERATOR) $(ITEMS_DIR) > $(NEWS_OUTPUT)/news-list.xml
+
+#    Transform the news.xml-file into a page
+$(PAGE_OUTPUT)/news.xml: $(NEWS_OUTPUT)/news-list.xml
+	$(call news2page, content/c3d2/news/overview.xml, content/c3d2/items) > $(PAGE_OUTPUT)/news.xml
+
+#    Transform the news page into HTML
+$(HTML_OUTPUT)/news.html: $(PAGE_OUTPUT)/news.xml
+	$(call page2html, output/page/news.xml , $(PAGE_OUTPUT) content/c3d2 content/c3d2/templates content/c3d2/pages) > $(HTML_OUTPUT)/news.html
 
-### Mr. Propper ###
-.PHONY: clean
 clean:
-	$(RM) $(CLEAN) news.xml
-	$(RM) -r portal
+	rm -rf $(NEWS_OUTPUT)/* $(PAGE_OUTPUT)/* $(HTML_OUTPUT)/*

content/.htaccess

@@ -1,2 +0,0 @@
-DirectoryIndex news.html
-AddDefaultCharset UTF-8

content/c3d2/common.xsl

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:rss="http://purl.org/rss/1.0/"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:date="http://exslt.org/dates-and-times"
+  exclude-result-prefixes="xsl rss rdf date">
+
+<!--
+  ### COMMON HTML STRUCTURE TEMPLATES ###
+-->
+
+  <xsl:template name="common_html_head">
+      <meta charset="utf-8" />
+      <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+      <meta name="description" content="&lt;&lt;&lt;/&gt;&gt; c3d2, der Erfahrungsaustauschkreis aus dem sächsischen Dresden" />
+      <meta name="keywords" content="c3d2 ccc dresden sachsen hacker" />
+      <meta name="robots" content="index,follow" />
+      <meta name="generator" content="C3D2-Web" />
+      <meta name="language" content="de" />
+      <meta name="author" content="Fnordic walker" />
+      <meta name="date" content="May 23 1981" />
+
+      <meta name="DC.Creator" content="Fnordic walker" />
+      <meta name="DC.Description" content="&lt;&lt;&lt;/&gt;&gt; c3d2, der Erfahrungsaustauschkreis aus dem sächsischen Dresden" />
+      <meta name="DC.Publisher" content="Chaos Computer Club Dresden" />
+      <meta name="DC.Date" content="May 23 1981" />
+      <meta name="DC.Type" content="Text" />
+      <meta name="DC.Format" content="text/html" />
+      <meta name="DC.Language" content="de" />
+      <meta name="DC.Coverage" content="Dresden" />
+      <meta name="DC.Title" content="c3d2: Chaos Computer Club Dresden" />
+
+      <link rel="icon" type="image/png" href="favicon.ico" />
+      <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="news-rss.xml" />
+      <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="news-atom.xml" />
+      <link rel="stylesheet" title="Default" type="text/css" href="style/default.css" />
+      <link rel="space-api" title="Hackerspace API Endpoint" type="application/json" href="http://www.hq.c3d2.de/spaceapi.json"/>
+      <link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:600|Open+Sans" rel="stylesheet" type="text/css" />
+
+      <xsl:comment>[if lt IE 9]&gt;
+          &lt;script src="script/ie-html5.js" type="text/javascript"&gt;&lt;/script&gt;
+          &lt;![endif]</xsl:comment>
+  </xsl:template>
+
+<!--  <xsl:template name="make-script-tag">
+    <xsl:param name="name"/>
+
+    <script src="{$baseurl}script/{$name}.js"
+	    type="text/javascript" defer="defer">
+      <xsl:text>
+</xsl:text>
+    </script> 
+  </xsl:template> -->
+</xsl:stylesheet>

content/c3d2/items/20131211-gchq-bezogen.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
+<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
+<item title="Unser Hackerspace ist umgezogen"
+    date="2013-12-11T02:00:00"
+    author="Astro">
+
+  <image title="Raumplan HQ">../raumplan-klein.jpg</image>
+
+  <p>
+    Seit wenigen Tagen hat <link href="space.html">unser neuer
+    Hackerspace</link> Internet und Strom. Damit sind wir nun wieder
+    hackbar.
+  </p>
+  <p>
+    Für die Zukunft brauchen wir unbedingt <link
+    href="unterstuetzen.html">mehr Unterstützung.</link> Um Veranstaltungen
+    zu ermöglichen, werden gesucht:
+  </p>
+  <ul>
+    <li>Beamer</li>
+    <li>Stühle</li>
+    <li>Tische</li>
+    <li>Sofas</li>
+  </ul>
+  <p>
+    Ende nächste Woche folgt dann die Eröffnungsparty.
+  </p>
+
+</item>

content/c3d2/items/event-20131112-bauplenum.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
+<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
+<item title="Hackerspace-Renovierung: Bauplenum" date="2013-11-12T14:37:00" author="DW">
+  <image title="Raumplan HQ">../raumplan-klein.jpg</image>
+  <event>
+    <start>2013-11-12T18:00:00</start>
+    <location>Lingnerallee 3</location>
+  </event>
+
+  <p>
+    Wie ihr nun alle wisst, haben wir seit dem 18.10.2013 Zugang zu unseren
+    <link href="space.html">neuen Räumen.</link>
+    Die von uns bisher erfolgten Sanierungs- und Umbauarbeiten waren bisher..
+  </p>
+  <addendum>
+    <ul>
+      <li>Entfernen der Altelektroanlage</li>
+      <li>Entfernen der Trockenbauvorwand</li>
+      <li>Entfernen von Verkofferungen</li>
+      <li>Entsorgung</li>
+      <li>Bau der Arbeitsplatte in der Grobwerkstatt</li>
+      <li>Bau des Werkzeugschranks in der Grobwerkstatt</li>
+    </ul>
+    <p>
+      Die derzeit stattfindenden und noch folgenden Arbeiten sind:
+    </p>
+    <ul>
+      <li>fertigstellen der Kabelkanäle für die neue Elektroinstallation</li>
+      <li>fertigstellen der Kabelkanäle für die neue Netzwerkinstallation</li>
+      <li>verlegen der Stromkabel in den dafür vorgesehenen Kanälen</li>
+      <li>verlegen der Netzwerkkabel in den dafür vorgesehenen Kanälen</li>
+      <li>Streichen der Räumlichkeiten</li>
+      <li>Bau des Regals in der Feinwerkstatt</li>
+      <li>Bau des Schranks links vom Serverschrank am Sicherungskasten</li>
+      <li>uvm.</li>
+    </ul>
+    <p>Wenn zeitlich machbar:</p>
+    <ul>
+      <li>verlegen des neuen Bodenbelags im großen Raum</li>
+    </ul>
+    <p>
+      Mir ist bewusst das noch viele weitere Arbeiten auf uns zukommen werden,
+      dennoch danke allen die bereits fleißig und mit viel Einsatz hierbei
+      geholfen haben, möchte aber zeitgleich jeden bitten/anmahnen der es bisher
+      verpasst hat zu unserem Allgemeinwohl im neuen HQ seinen Beitrag zu
+      leisten. (Wer sich hier an welcher stelle einordnet ist seine individuelle
+      Entscheidung.)
+    </p>
+    <p>
+      Beim bisherigen Ansturm an Helfenden und dem derzeitigen Fortschritt wird
+      es kaum machbar sein die noch anstehenden Arbeiten bis Ende November
+      durchzuführen, den Umzug vorzubereiten und durchzuführen, sowie das alte HQ
+      entsprechend für eine Übergabe an den Vermieter vorzubereiten.
+    </p>
+    <p>
+      Aus diesem Anlass möchte ich hiermit beantragen das alle interessierten
+      sich am Dienstag den 13.11.2013 zwischen 18 und 20Uhr zu einem
+      außerordentlichen Bauplenum einfinden.
+      Es klingt vielleicht böser als gedacht, aber hiermit sind alle gemeint,
+      nicht nur diejenigen die sich in der Lage fühlen einen Hammer zu halten
+      oder eine Kabel zu verlegen.
+      Für viele der benötigten Arbeiten reicht es aus wenn einem gezeigt wird wie
+      es geht, unabhängig davon ob man es bisher kann oder nicht. Ebenso gibt s
+      viele Arbeiten die zwar nur einen kurzen Zeitraum einnehemn aber dennoch
+      viel Entlastung für andere bedeuten.
+    </p>
+    <p>
+      Jede helfende Hand bringt uns weiter.
+    </p>
+  </addendum>
+</item>