From dcc15dfb13a1e1a2594859efe1e010b353f0c470 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 24 Sep 2017 19:23:48 +0200
Subject: [PATCH] create a proper content/pages/calendar

---
 Makefile                   | 10 ++++------
 content/pages/calendar.xml | 21 +++++++++++++++++++++
 xsl/calendar.xsl           | 18 ++++--------------
 3 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 content/pages/calendar.xml

diff --git a/Makefile b/Makefile
index 2aa4be814..df0613a45 100644
--- a/Makefile
+++ b/Makefile
@@ -196,11 +196,6 @@ $(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) $(ALL_XSLS)
-build/calendar.html: $(CALENDAR_SUMMARY) $(STYLE) $(NAVIGATION) $(DATESTAMP) $(ALL_XSLS)
-	$(call xml_process)
-
 # XCal
 build/xcal.xml : STYLE=xsl/xcal.xsl
 build/xcal.xml : VFLAGS_IN=$(VFLAGS)
@@ -259,13 +254,16 @@ 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)
+build/portal.html: portal/items-sorted.xml $(CALENDAR_SUMMARY) $(STYLE) $(CALENDAR_SUMMARY)
 	$(call xml_process)
 
 # Pages:
 build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(DATESTAMP) news.xml
 	$(call xml_process)
 
+build/calendar.html: content/pages/calendar.xml $(STYLE) $(NAVIGATION) $(DATESTAMP) $(CALENDAR_SUMMARY)
+	$(call xml_process)
+
 # News:
 build/news/%.html : BASEURL="../"
 build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(DATESTAMP)
diff --git a/content/pages/calendar.xml b/content/pages/calendar.xml
new file mode 100644
index 000000000..f752ac5f1
--- /dev/null
+++ b/content/pages/calendar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
+
+
+<page title="Kalender">
+  <calendar src="../../calendar-summary.xml"/>
+
+  <p>
+    Der Kalender ist auch im <link href="{$baseurl}ical.ics">iCal-</link>,
+    <link href="xcal.xml">XCal-</link> und <link
+    href="reminders">remind-Format</link> verfügbar.
+    Andere Kalender aus dem Umfeld:
+  </p>
+  <ul>
+    <li><link href="https://www.hicknhack-software.com/it-events">Interessante IT-Events bei Hicknhack Software</link></li>
+    <li><link href="https://events.ccc.de/">CCC Events Blog</link></li>
+    <li><link href="https://cal.guckes.net/">FLOSS Events Calendar</link></li>
+    <li><link href="http://grical.org/">GriCal - open events platform</link></li>
+    <li><link href="http://itedd.de/">IT Events in Dresden</link></li>
+  </ul>
+</page>
diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index 27c16db68..0f5cfc766 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -9,6 +9,10 @@
 <xsl:import href="date.week-in-year.function.xsl" />
 <xsl:include href="ddate.xsl" />
 
+<xsl:template match="/page/calendar">
+  <xsl:apply-templates select="document(@src)/page/calendar-summary"/>
+</xsl:template>
+
 <xsl:template match="/page/calendar-summary">
   <table class="calendar">
     <tr>
@@ -31,20 +35,6 @@
     </xsl:call-template>
 
   </table>
-
-  <p>
-    Der Kalender ist auch im <a href="{$baseurl}ical.ics">iCal-</a>,
-    <a href="{$baseurl}xcal.xml">XCal-</a> und <a
-    href="{$baseurl}reminders">remind-Format</a> verfügbar.
-    Andere Kalender aus dem Umfeld:
-  </p>
-  <ul>
-    <li><a href="https://www.hicknhack-software.com/it-events">Interessante IT-Events bei Hicknhack Software</a></li>
-    <li><a href="https://events.ccc.de/">CCC Events Blog</a></li>
-    <li><a href="https://cal.guckes.net/">FLOSS Events Calendar</a></li>
-    <li><a href="http://grical.org/">GriCal - open events platform</a></li>
-    <li><a href="http://itedd.de/">IT Events in Dresden</a></li>
-  </ul>
 </xsl:template>
 
 <xsl:template name="output-week">