From 6c577a65339ac597ac622fb839393f931562cf8e Mon Sep 17 00:00:00 2001
From: Horus3
Date: Sat, 22 Oct 2016 12:20:46 +0200
Subject: Fix the projects page, improves the piwik script, concats the assets
 with gulp and styles the 404 template.

---
 layouts/404.html             | 38 ++++++++++++++++++++++++++++++++++----
 layouts/_default/list.html   |  2 +-
 layouts/index.html           |  6 +++---
 layouts/partials/css.tmpl    |  7 ++++++-
 layouts/partials/footer.tmpl |  8 +++-----
 layouts/projects.html        | 39 ---------------------------------------
 layouts/projects/single.html | 32 ++++++++++++++++----------------
 7 files changed, 63 insertions(+), 69 deletions(-)
 delete mode 100644 layouts/projects.html

(limited to 'layouts')

diff --git a/layouts/404.html b/layouts/404.html
index b40f7ea..3171635 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,7 +1,37 @@
 {{partial "header.tmpl" .}}
-    <header><p>404 - not found</p><br></header>
-	<p class="twelve columns" style="margin-top: 20px">
-		<a class="button" href="/" title="back to index">click to go back</a>
-	</p>
+<div class="row">
+    <header><p>404 - not found</p></header>
+</div>
+
+<div class="container journal">
+	<div class="row">
+		<div class="twelve columns article">
+			<ul>
+				<li class="journal-li">
+					<div class="margin-top">Here is nothing.</div>
+					<br>
+					<pre>
+_                ___       _.--. 
+\`.|\..----...-'`   `-._.-'_.-'` 
+/  ' `         ,       __.--'    
+)/' _/     \   `-_,   /          
+`-'" `"\_  ,_.-;_.-\_ ',         
+    _.-'_./   {_.'   ; /         
+   {_.-``-'         {_/          
+   ~~~~~~          ~~~~~         
+					</pre>
+				</li>
+			</ul>
+		</div>
+	</div>
+</div>
+
+<div class="container">
+	<div class="row center">
+		<p class="twelve columns" style="margin-top: 20px">
+			<a class="button" href="/" title="back to index">click to go back</a>
+		</p>
+	</div>
+</div>
 {{partial "footer.tmpl"}}
 
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 690e09f..4f9b3aa 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,6 +1,6 @@
 {{partial "header.tmpl" .}}
 <div class="row">
-    <header><p>journal</p></header>
+	<header><p>journal</p></header>
 </div>
 				{{ range .Data.Pages }}
 <div class="container journal">
diff --git a/layouts/index.html b/layouts/index.html
index 522daf5..94aa532 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -7,13 +7,13 @@
 		<div class="twelve columns">
            	 	<a href="https://www.complicissimus.de" title="blog">my blog</a>
 		</div>
-		<div class="twelve columns margin-top">
+		<div class="twelve columns margin-top-small">
             		<a href="projects/" title="side projects">projects</a>
 		</div>
-		<div class="twelve columns margin-top">
+		<div class="twelve columns margin-top-small">
             		<a href="journal/" title="journal">journal</a>
 		</div>
-		<div class="twelve columns margin-top">
+		<div class="twelve columns margin-top-small">
             		<a href="https://www.complicissimus.de/about/#kontakt" title="contact">contact</a>
 		</div>
 	</div>
diff --git a/layouts/partials/css.tmpl b/layouts/partials/css.tmpl
index a10e818..45efad7 100644
--- a/layouts/partials/css.tmpl
+++ b/layouts/partials/css.tmpl
@@ -6,6 +6,11 @@
 <link href="/custom.css" rel="stylesheet" type="text/css">
 {{else}}
 	<style>
-	{{readFile "static/gulp.css/concat.css" | safeCSS}}
+	{{$tmp := getenv "HUGO_GULP"}}
+	{{if eq $tmp "1"}}
+		{{readFile "static/gulp.css/concat.css" | safeCSS}}
+	{{else}}
+		{{readFile "static/concat.css" | safeCSS}}
+	{{end}}
 	</style>
 {{end}}
diff --git a/layouts/partials/footer.tmpl b/layouts/partials/footer.tmpl
index 8cc61ad..408626b 100644
--- a/layouts/partials/footer.tmpl
+++ b/layouts/partials/footer.tmpl
@@ -1,7 +1,6 @@
 {{$tmp := getenv "HUGO_TEST"}}
 {{if eq $tmp "1"}}
 {{else}}
-	<script>
 <!-- Piwik -->
 <script type="text/javascript">
   var _paq = _paq || [];
@@ -10,15 +9,14 @@
   _paq.push(['enableLinkTracking']);
   (function() {
     var u="//a.iamfabulous.de/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setTrackerUrl', u+'js/index.php']);
     _paq.push(['setSiteId', '6']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'js/index.php'; s.parentNode.insertBefore(g,s);
   })();
 </script>
-<noscript><p><img src="//a.iamfabulous.de/piwik.php?idsite=6&rec=1" style="border:0;" alt="" /></p></noscript>
+<noscript><p><img src="//a.iamfabulous.de/js/index.php?idsite=6&rec=1" style="border:0;" alt="" /></p></noscript>
 <!-- End Piwik Code -->
-	</script>
 {{end}}
 </body>
 </html>
diff --git a/layouts/projects.html b/layouts/projects.html
deleted file mode 100644
index 103c7e0..0000000
--- a/layouts/projects.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- THIS FILE IS NOT USED ANYMORE -->
-{{partial "header.tmpl" "projects"}}
-    <header><p>projects</p><br></header>
-    <nav>
-        <ul class="offset-by-three three columns">
-            <li><a href="https://www.maxmail.xyz" title="mail server">maxmail.xyz</a></li>
-            <li><a href="https://webmail.maxmail.xyz" title="webmail">webmail</a></li>
-            <li><a href="https://lists.iamfabulous.de" title="mailing lists">mailing lists</a></li>
-            <li><a href="https://irc.iamfabulous.de" title="chat">irc server</a></li>
-            <li><a href="https://www.gospeladlershof.de" title="gospelchor adlershof">gospelchor</a></li>
-	</ul>
-        <ul class="three columns">
-            <li><a href="https://images.iamfabulous.de" title="images">images</a></li>
-            <li><a href="https://scribble.iamfabulous.de" title="scribble">scribble</a></li>
-            <li><a href="https://uhttpd.iamfabulous.de" title="uhttpd">uhttpd</a></li>
-            <li><a href="https://ifconfig.iamfabulous.de" title="your ip">your ip</a></li>
-            <li><a href="https://bitch.iamfabulous.de" title="bitch">bitch</a></li>
-	    <li><a href="https://jungegemeinde.iamfabulous.de" title="junge gemeinde">jg</a></li>
-            <!--li><a href="/teaching/" title="teaching (german)">teaching</a></li>
-	    <li>&nbsp;</li>
-	<div class="container">
-		<li class="font-size">websites:</li>
-		<li class="font-size"><ul>tools:</ul></li>
-	    <li>––––––</li>
-            <li><a href="https://tracker.iamfabulous.de" title="do not abuse">file sharing</a></li>
-            <li><a href="https://files.iamfabulous.de" title="files">files</a></li>
-            <li><a href="index.html" title="back to index">../go back</a></li>
-            <li><a href="https://irc.iamfabulous.de" title="chat">chat (irc)</a></li>
-            <li><a href="https://jungegemeinde.iamfabulous.de" title="junge gemeinde">junge gemeinde</a></li>
-            <li><a href="https://files.iamfabulous.de" title="files">files</a></li>
-            <li><a href="https://www.maxmail.xyz" title="www.maxmail.xyz">mail server</a></li>
-            <li><a href="https://www.maxmail.xyz" title="maxmail">maxmail.xyz</a></li>
-            <li><a href="https://status.iamfabulous.de" title="status page">status page</a></li-->
-	</ul>
-	<p class="twelve columns" style="margin-top: 20px">
-            <a href="index.html" title="back to index">../go back</a>
-	</p>
-    </nav>
-{{partial "footer.tmpl"}}
diff --git a/layouts/projects/single.html b/layouts/projects/single.html
index 6304f7d..71030c8 100644
--- a/layouts/projects/single.html
+++ b/layouts/projects/single.html
@@ -2,23 +2,23 @@
 <div class="row">
     <header><p>{{.Title}}</p></header>
 </div>
-<div class="container main">
+<div class="main container">
 	<div class="row">
-        <ul class="offset-by-three three columns">
-            <li><a href="https://www.maxmail.xyz" title="mail server">maxmail.xyz</a></li>
-            <li><a href="https://webmail.maxmail.xyz" title="webmail">webmail</a></li>
-            <li><a href="https://lists.iamfabulous.de" title="mailing lists">mailing lists</a></li>
-            <li><a href="https://irc.iamfabulous.de" title="chat">irc server</a></li>
-            <li><a href="https://www.gospeladlershof.de" title="gospelchor adlershof">gospelchor</a></li>
-	</ul>
-        <ul class="three columns">
-            <li><a href="https://images.iamfabulous.de" title="images">images</a></li>
-            <li><a href="https://scribble.iamfabulous.de" title="scribble">scribble</a></li>
-            <li><a href="https://uhttpd.iamfabulous.de" title="uhttpd">uhttpd</a></li>
-            <li><a href="https://ifconfig.iamfabulous.de" title="your ip">your ip</a></li>
-            <li><a href="https://bitch.iamfabulous.de" title="bitch">bitch</a></li>
-	    <li><a href="https://jungegemeinde.iamfabulous.de" title="junge gemeinde">jg</a></li>
-	</ul>
+        	<div class="text-right offset-by-two four columns">
+		    <a href="https://www.maxmail.xyz" title="mail server">maxmail.xyz</a><br>
+		    <a href="https://webmail.maxmail.xyz" title="webmail">webmail</a><br>
+		    <a href="https://lists.iamfabulous.de" title="mailing lists">mailing lists</a><br>
+		    <a href="https://irc.iamfabulous.de" title="chat">irc server</a><br>
+		    <a href="https://www.gospeladlershof.de" title="gospelchor adlershof">gospelchor</a>
+		</div>
+        	<div class="text-left four columns">
+		    <a href="https://images.iamfabulous.de" title="images">images</a><br>
+		    <a href="https://scribble.iamfabulous.de" title="scribble">scribble</a><br>
+		    <a href="https://uhttpd.iamfabulous.de" title="uhttpd">uhttpd</a><br>
+		    <a href="https://ifconfig.iamfabulous.de" title="your ip">your ip</a><br>
+		    <a href="https://bitch.iamfabulous.de" title="bitch">bitch</a><br>
+		    <a href="https://jungegemeinde.iamfabulous.de" title="junge gemeinde">jg</a>
+		</div>
 	</div>
 	<div class="row">
 		<p class="twelve columns margin-top">
-- 
cgit v1.2.3