summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/templates/entry.html2
-rw-r--r--src/templates/layout-journal.html54
-rw-r--r--src/templates/layout.html8
-rw-r--r--src/templates/nav-journal.html8
-rw-r--r--src/templates/nav-journal.htmlvi8
-rw-r--r--src/templates/nav.html6
6 files changed, 78 insertions, 8 deletions
diff --git a/src/templates/entry.html b/src/templates/entry.html
index 50454eb..2355310 100644
--- a/src/templates/entry.html
+++ b/src/templates/entry.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'layout-journal.html' %}
{% block head %}
<link href="isso.css" rel="stylesheet">
diff --git a/src/templates/layout-journal.html b/src/templates/layout-journal.html
new file mode 100644
index 0000000..83765bd
--- /dev/null
+++ b/src/templates/layout-journal.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>{{ title }}</title>
+ <link href="../style.css" rel="stylesheet">
+ <link rel="icon" type="image/png" href="../resources/glider.png" />
+
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="author" content="Johannes Löthberg">
+ <link rel="me" href="https://theos.kyriasis.com/~kyrias/about.html"
+ title="Johannes Löthberg <johannes@kyriasis.com>">
+{% block head %}{% endblock %}
+</head>
+<body itemscope itemtype="http://schema.org/WebPage">
+<header>
+{% include 'nav-journal.html' %}
+ <h1>{{ header }}</h1>
+</header>
+
+{% block content %}{% endblock %}
+<footer>
+ <div id="foot-left">
+ <p id="copy">
+ © <span itemprop="copyrightYear">2014</span>
+ by <span itemprop="copyrightHolder">Johannes Löthberg</span>
+ </p>
+
+ <div id="contact-info-wrapper">
+ <p>You can find me on:</p>
+ <div id="contact-info">
+ <a rel="me" href="mailto:johannes@kyriasis.com">Email</a>
+ <a rel="me" href="https://twitter.com/kyriasis">Twitter</a>
+ <a rel="me" href="https://plus.google.com/+JohannesLothberg">Google+</a>
+ <a rel="me" href="sms:+46739525259">SMS</a>
+ </div>
+ </div>
+ </div>
+ <a id="emblem" href="http://www.catb.org/hacker-emblem/">
+ <img src="../resources/glider.png" alt="hacker emblem" />
+ </a>
+</footer>
+
+<script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ ga('create', 'UA-50812915-2', 'auto');
+ ga('send', 'pageview');
+</script>
+</body>
+</html>
diff --git a/src/templates/layout.html b/src/templates/layout.html
index 35ea3f3..85b3c0b 100644
--- a/src/templates/layout.html
+++ b/src/templates/layout.html
@@ -3,13 +3,13 @@
<head>
<meta charset="UTF-8">
<title>{{ title }}</title>
- <link href="/~kyrias/style.css" rel="stylesheet">
- <link rel="icon" type="image/png" href="https://theos.kyriasis.com/~kyrias/resources/glider.png" />
+ <link href="style.css" rel="stylesheet">
+ <link rel="icon" type="image/png" href="resources/glider.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="Johannes Löthberg">
<link rel="me" href="https://theos.kyriasis.com/~kyrias/about.html"
- title="Johannes Löthberg <johannes@kyriasis.com>">
+ title="Johannes Löthberg <johannes@kyriasis.com>">
{% block head %}{% endblock %}
</head>
<body itemscope itemtype="http://schema.org/WebPage">
@@ -37,7 +37,7 @@
</div>
</div>
<a id="emblem" href="http://www.catb.org/hacker-emblem/">
- <img src="/~kyrias/resources/glider.png" alt="hacker emblem" />
+ <img src="resources/glider.png" alt="hacker emblem" />
</a>
</footer>
diff --git a/src/templates/nav-journal.html b/src/templates/nav-journal.html
new file mode 100644
index 0000000..ef4f627
--- /dev/null
+++ b/src/templates/nav-journal.html
@@ -0,0 +1,8 @@
+<nav>
+ <ul>
+ <li><a href="../index.html">~kyrias</a></li>
+ <li><a href="../journal.html">journal</a></li>
+ <li><a href="../about.html">about</a></li>
+ <li><a href="http://git.kyriasis.com/kyrias/website">source</a></li>
+ </ul>
+</nav>
diff --git a/src/templates/nav-journal.htmlvi b/src/templates/nav-journal.htmlvi
new file mode 100644
index 0000000..a5c5717
--- /dev/null
+++ b/src/templates/nav-journal.htmlvi
@@ -0,0 +1,8 @@
+<nav>
+ <ul>
+ <li><a href="/~kyrias/index.html">~kyrias</a></li>
+ <li><a href="/~kyrias/journal.html">journal</a></li>
+ <li><a href="/~kyrias/about.html">about</a></li>
+ <li><a href="http://git.kyriasis.com/kyrias/website">source</a></li>
+ </ul>
+</nav>
diff --git a/src/templates/nav.html b/src/templates/nav.html
index a5c5717..2830a12 100644
--- a/src/templates/nav.html
+++ b/src/templates/nav.html
@@ -1,8 +1,8 @@
<nav>
<ul>
- <li><a href="/~kyrias/index.html">~kyrias</a></li>
- <li><a href="/~kyrias/journal.html">journal</a></li>
- <li><a href="/~kyrias/about.html">about</a></li>
+ <li><a href="index.html">~kyrias</a></li>
+ <li><a href="journal.html">journal</a></li>
+ <li><a href="about.html">about</a></li>
<li><a href="http://git.kyriasis.com/kyrias/website">source</a></li>
</ul>
</nav>