From 92beb2254a441d43bb66ab89a179853ccbe6bceb Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Wed, 26 Sep 2018 20:51:36 +0200
Subject: Load navigation, meta-tags from content `meta.xml`

---
 .gitmodules        |  3 ++-
 source/00_content  |  2 +-
 utility/master.xsl | 36 +++++++++++++++---------------------
 3 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 3e70e82..4bad97c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "source/00_content"]
 	path = source/00_content
-	url = git@github.com:KnairdA/blog_content.git
+	url = https://github.com/KnairdA/blog_content.git
+	branch = master
diff --git a/source/00_content b/source/00_content
index 7d93783..8dd9734 160000
--- a/source/00_content
+++ b/source/00_content
@@ -1 +1 @@
-Subproject commit 7d937830c21636eddc67bd2b2479cb7a436a7657
+Subproject commit 8dd97342fb4bde2fc94204f4cb6d45287bd1d2a5
diff --git a/utility/master.xsl b/utility/master.xsl
index f60c2a0..717f5ae 100644
--- a/utility/master.xsl
+++ b/utility/master.xsl
@@ -20,8 +20,8 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta name="author"             content="Adrian Kummerländer" />
-	<meta name="description"        content="Adrian Kummerländer's blog on software development, linux and open source" />
+	<meta name="author"             content="{$root/meta/author}" />
+	<meta name="description"        content="{$root/meta/description}" />
 	<meta name="robots"             content="all"/>
 	<meta name="viewport"           content="width=device-width,initial-scale=1.0"/>
 
@@ -44,18 +44,7 @@
 		</h1>
 
 		<ul class="buttonlist">
-			<li>
-				<a href="/">Start</a>
-			</li>
-			<li>
-				<a href="/archive">Archive</a>
-			</li>
-			<li>
-				<a href="https://tree.kummerlaender.eu/contact">Contact</a>
-			</li>
-			<li>
-				<a href="/atom.xml">Feed</a>
-			</li>
+			<xsl:apply-templates select="$root/meta/header/navigation/link" mode="master"/>
 		</ul>
 	</div>
 
@@ -70,15 +59,12 @@
 	</div>
 
 	<div id="footer" class="center">
-		<a href="https://tree.kummerlaender.eu/projects/xslt/">Made with XSLT</a>
+		<a href="{$root/meta/footer/info/@href}">
+			<xsl:value-of select="$root/meta/footer/info/text()"/>
+		</a>
 
 		<ul class="buttonlist">
-			<li>
-				<a href="https://tree.kummerlaender.eu/contact">Contact</a>
-			</li>
-			<li>
-				<a href="/atom.xml">Feed</a>
-			</li>
+			<xsl:apply-templates select="$root/meta/footer/navigation/link" mode="master"/>
 		</ul>
 	</div>
 </body>
@@ -93,6 +79,14 @@
 	</li>
 </xsl:template>
 
+<xsl:template match="link" mode="master">
+	<li>
+		<a href="{@href}">
+			<xsl:value-of select="text()"/>
+		</a>
+	</li>
+</xsl:template>
+
 <xsl:template match="text()|@*"/>
 
 </xsl:stylesheet>
-- 
cgit v1.2.3

