From 04ef134d8862d90af131ab32748357d458fd2a28 Mon Sep 17 00:00:00 2001 From: astro Date: Sat, 28 Oct 2006 18:33:31 +0000 Subject: [PATCH] =?UTF-8?q?@category=20aus=20qemud-0.1.0=20news=20raus=20p?= =?UTF-8?q?r=C3=A4parationen=20f=C3=BCr=20events.xml=20f=C3=BCr=20Events?= =?UTF-8?q?=20zu=20der=20wir=20keine=20extra=20News=20wollen=20calendar.ht?= =?UTF-8?q?ml-Logik?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@540 31f61c52-7bfb-0310-b897-fc00f8a278f0 --- Makefile | 14 +++- content/events.xml | 11 ++++ content/news/qemud-0.1.0.xml | 2 +- xsl/calendar-summary.xsl | 45 +++++++++++++ xsl/calendar.xsl | 121 +++++++++++++++++++++++++++++++++++ xsl/xhtml.xsl | 4 ++ 6 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 content/events.xml create mode 100644 xsl/calendar-summary.xsl create mode 100644 xsl/calendar.xsl diff --git a/Makefile b/Makefile index 65a7bcc62..5931fd372 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ WWW_CCC_DE_UPDATES=chaosupdates.rdf ### Ziele ### # Dateinamen der zu erzeugenden html-Dateien: -CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES) $(SEARCH_TMPL) +CONTENT=$(PAGES) $(NEWS_PAGES) $(DS_PAGES) $(NEWSFILES) $(SEARCH_TMPL) build/calendar.html # 'normale' Seiten: PAGES:=$(patsubst content/pages/%.xml, build/%.html, $(wildcard content/pages/*.xml)) @@ -61,6 +61,7 @@ NOVALID_IGNORE:=false define xml_process $(VALIDATOR) $(VFLAGS_IN) $< $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< + # TODO: touch erklären! $(VALIDATOR) $(VFLAGS_OUT) $@ || $(NOVALID_IGNORE) || \ { touch -m -t 197001010000 Makefile $@ ; exit 1 ; } endef @@ -95,6 +96,17 @@ news.xml: $(NEWSITEMS) $(NEWSFILES): news.xml $(NAVIGATION) $(STYLE) $(call xml_process) +# Calendar +calendar-summary.xml : STYLE=xsl/calendar-summary.xsl +calendar-summary.xml : NOVALID_IGNORE:=true +calendar-summary.xml : VFLAGS_IN=--noout +calendar-summary.xml: content/events.xml news.xml + $(call xml_process) + +build/calendar.html : VFLAGS_IN=--noout +build/calendar.html: calendar-summary.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) + $(call xml_process) + # Pages: build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) news.xml $(call xml_process) diff --git a/content/events.xml b/content/events.xml new file mode 100644 index 000000000..a8179380f --- /dev/null +++ b/content/events.xml @@ -0,0 +1,11 @@ + + + + 2006-10-17T19:00:00 + Dresden + + + 2006-10-24T19:00:00 + Dresden + + diff --git a/content/news/qemud-0.1.0.xml b/content/news/qemud-0.1.0.xml index a45fd7205..fa5418774 100644 --- a/content/news/qemud-0.1.0.xml +++ b/content/news/qemud-0.1.0.xml @@ -1,7 +1,7 @@ - +

qemud ist ein Daemon zum Verwalten von virtuellen Maschinen. Die Bedienung ist an die von Xens diff --git a/xsl/calendar-summary.xsl b/xsl/calendar-summary.xsl new file mode 100644 index 000000000..b1a1fbcbc --- /dev/null +++ b/xsl/calendar-summary.xsl @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + newsfile: + + + + + + + + + + <xsl:choose> + <xsl:when test="@title"><xsl:value-of select="@title"/></xsl:when> + <xsl:when test="../@title"><xsl:value-of select="../@title"/></xsl:when> + <xsl:otherwise> + <xsl:message terminate="yes">Event with no title!</xsl:message> + </xsl:otherwise> + </xsl:choose> + + + + + + + + diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl new file mode 100644 index 000000000..d361f9c7a --- /dev/null +++ b/xsl/calendar.xsl @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
MontagDienstagMittwochDonnerstagFreitagSamstagSonntag
+
+ + + + + + + + + + + + nextweek: + + + + + + + + + + + + + + cal + + sun + week + + + 1 + 2 + 3 + + + + + + + + + + + + + + + + Kalender: + + + + + + + + + + + & + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl index 8069cfb84..535e3be77 100644 --- a/xsl/xhtml.xsl +++ b/xsl/xhtml.xsl @@ -11,6 +11,7 @@ + + + + missing title