Merge branch 'templates' into 'master'

Templates

See merge request larswirzenius/obnam.org!6

13 files changed, 310 insertions, 118 deletions

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 682647a..ad5e7fe 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -25,6 +25,7 @@ disable_plugins:
 - table
 - toggle
 - repolist
+- recentchanges
 html5: yes
 timeformat: '%Y-%m-%d %H:%M'
 exclude: 'favicon\.ico'
@@ -36,3 +37,4 @@ allowatom: yes
 rss: yes
 atom: yes
 pandoc_filters: "sp-filter"
+templatedir: templates
\ No newline at end of file
diff --git a/local.css b/local.css
deleted file mode 100644
index 838348e..0000000
--- a/local.css
+++ /dev/null
@@ -1,7 +0,0 @@
-img.sticker {
-    float: right;
-}
-img.bytemark {
-    float: right;
-    height: 40px;
-}
diff --git a/roadmap.mdwn b/roadmap.mdwn
index a519d70..aeb00f3 100644
--- a/roadmap.mdwn
+++ b/roadmap.mdwn
@@ -1,7 +1,5 @@
 [[!meta title="Road map"]]
 
-# Roadmap
-
 The current goal of Obnam development to get the software to a state
 where its author uses it for real, for at least a subset of their live
 data, and is ready to ask others to try the software.
diff --git a/style.css b/style.css
index 8371363..c6bd649 100644
--- a/style.css
+++ b/style.css
@@ -6,18 +6,27 @@ html {
     margin-top: 2em;
 }
 
-form#searchform {
-    font-family: monospace;
-    text-align: right;
+h1, h2, h3, h4, h5, h6 {
+    font-family: sans-serif;
+    font-weight: bold;
+    margin-top: 2em;
 }
 
-div.actions {
-    font-family: monospace;
-    text-align: right;
+h1 {
+    font-size: 150%;
+}
+
+h2 {
+    font-size: 120%;
+}
+
+h3 {
+    font-size: 100%;
 }
 
-div.actions ul, div.actions li {
-    display: inline;
+ul li, ol li {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
 }
 
 div.pageheader {
@@ -25,8 +34,7 @@ div.pageheader {
     margin-bottom: 2em;
 }
 
-div.pageheader span.title {
-    display: block;
+.pageheader span.title {
     font-size: 200%;
     font-weight: bold;
     font-family: sans-serif;
@@ -41,9 +49,6 @@ div.pagefooter {
     margin-top: 3em;
 }
 
-div#pagebody {
-}
-
 span.date {
     font-family: monospace;
 }
@@ -74,107 +79,12 @@ div.sidebar {
     margin-left: 1em;
 }
 
-.float_right, .floatTR {
+.float_right {
     float: right;
     margin-left: 1em;
     margin-bottom: 1em;
 }
 
-h1, h2, h3, h4, h5, h6 {
-    font-family: sans-serif;
-    font-weight: bold;
-    margin-top: 2em;
-}
-
-h1 {
-    font-size: 150%;
-}
-
-h2 {
-    font-size: 120%;
-}
-
-h3 {
-    font-size: 100%;
-}
-
-ul li, ol li {
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-}
-
-div#comments div.feedlink {
-    margin-top: 2em;
-}
-
-div.comment {
-    margin-top: 2em;
-}
-
-div.comment-subject {
-    margin-bottom: 1em;
-    font-size: 120%;
-    font-family: sans-serif;
-}
-
-div.comment-header {
-    margin-top: 1em;
-}
-
-div.archivepage {
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
-}
-
 span.archivepagedate {
     font-family: monospace;
 }
-
-
-
-/* The following are for openid logins in Ikiwiki. Copied from
-   ikiwiki. */
-
-input#openid_identifier {
-	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 0 50%;
-	color: #000;
-	padding-left: 18px;
-}
-/* openid selector */
-#openid_choice {
-	display: none;
-}
-#openid_input_area {
-	clear: both;
-	padding: 10px;
-}
-#openid_btns, #openid_btns br {
-	clear: both;
-}
-#openid_highlight {
-	background-color: black;
-	float: left;
-}
-.openid_large_btn {
-	padding: 1em 1.5em;
-	border: 1px solid #DDD;
-	margin: 3px;
-	float: left;
-}
-.openid_small_btn {
-	padding: 4px 4px;
-	border: 1px solid #DDD;
-	margin: 3px;
-	float: left;
-}
-a.openid_large_btn:focus {
-	outline: none;
-}
-a.openid_large_btn:focus {
-	outline-style: none;
-}
-.openid_selected {
-	border: 4px solid #DDD;
-}
diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
new file mode 100644
index 0000000..3e0bd9b
--- /dev/null
+++ b/templates/archivepage.tmpl
@@ -0,0 +1,19 @@
+<div class="archivepage">
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
+</TMPL_IF>
+<span class="archivepagedate">
+Posted <TMPL_VAR CTIME>
+<TMPL_IF AUTHOR>
+by <span class="author">
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+</span>
+</div>
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
new file mode 100644
index 0000000..9b056e0
--- /dev/null
+++ b/templates/atomitem.tmpl
@@ -0,0 +1,49 @@
+<entry>
+	<title><TMPL_VAR TITLE></title>
+<TMPL_IF GUID>
+	<id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+	<id><TMPL_VAR URL></id>
+</TMPL_IF>
+	<link href="<TMPL_VAR PERMALINK>"/>
+<TMPL_IF AUTHOR>
+	<author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
+</TMPL_IF>
+<TMPL_IF COPYRIGHT>
+	<rights type="html" xml:lang="en">
+<TMPL_IF LICENSE>
+		<TMPL_VAR LICENSE ESCAPE=HTML>
+		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+<TMPL_ELSE>
+		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+</TMPL_IF>
+	</rights>
+<TMPL_ELSE>
+<TMPL_IF LICENSE>
+	<rights type="html" xml:lang="en">
+	<TMPL_VAR LICENSE ESCAPE=HTML>
+	</rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
+	<category term="<TMPL_VAR CATEGORY>" />
+</TMPL_LOOP>
+</TMPL_IF>
+	<updated><TMPL_VAR MDATE_3339></updated>
+	<published><TMPL_VAR CDATE_3339></published>
+<TMPL_IF ENCLOSURE>
+	<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
+</TMPL_IF>
+<TMPL_UNLESS SIMPLEPODCAST>
+	<content type="html" xml:lang="en">
+	<TMPL_VAR CONTENT ESCAPE=HTML>
+	</content>
+</TMPL_UNLESS>
+<TMPL_IF COMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR COMMENTSURL>" type="text/html" />
+</TMPL_IF>
+<TMPL_IF ATOMCOMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR ATOMCOMMENTSURL>" type="application/atom+xml" />
+</TMPL_IF>
+</entry>
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
new file mode 100644
index 0000000..3cdd71d
--- /dev/null
+++ b/templates/atompage.tmpl
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<feed xmlns="http://www.w3.org/2005/Atom">
+<title><TMPL_VAR TITLE></title>
+<link href="<TMPL_VAR PAGEURL>"/>
+<link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
+<author>
+<TMPL_IF AUTHOR>
+<name><TMPL_VAR AUTHOR></name>
+<TMPL_ELSE>
+<name><TMPL_VAR WIKINAME></name>
+</TMPL_IF>
+</author>
+<TMPL_IF COPYRIGHT>
+<rights type="html" xml:lang="en">
+<TMPL_IF LICENSE>
+	<TMPL_VAR LICENSE>
+	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+<TMPL_ELSE>
+	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+</TMPL_IF>
+</rights>
+<TMPL_ELSE>
+<TMPL_IF LICENSE>
+<rights type="html">
+	<TMPL_VAR LICENSE ESCAPE=HTML>
+</rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF GUID>
+<id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+<id><TMPL_VAR PAGEURL></id>
+</TMPL_IF>
+<subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
+<generator uri="http://ikiwiki.info/">ikiwiki</generator>
+<updated><TMPL_VAR FEEDDATE></updated>
+<TMPL_VAR CONTENT>
+</feed>
diff --git a/templates/feedlink.tmpl b/templates/feedlink.tmpl
new file mode 100644
index 0000000..c67ad9c
--- /dev/null
+++ b/templates/feedlink.tmpl
@@ -0,0 +1,8 @@
+<div <TMPL_IF ID>id="<TMPL_VAR ID ESCAPE=HTML>"</TMPL_IF> class="feedlink">
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" rel="alternate" title="<TMPL_VAR RSSDESC>" href="<TMPL_VAR RSSURL>">RSS</a>
+</TMPL_IF>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" rel="alternate" title="<TMPL_VAR ATOMDESC>" href="<TMPL_VAR ATOMURL>">Atom</a>
+</TMPL_IF>
+</div>
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
new file mode 100644
index 0000000..37d7e48
--- /dev/null
+++ b/templates/inlinepage.tmpl
@@ -0,0 +1,78 @@
+<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
+
+<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
+<TMPL_IF AUTHOR>
+<span class="author">
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
+</TMPL_IF>
+<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
+<TMPL_VAR CONTENT>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF ENCLOSURE>
+<TMPL_IF HTML5><section id="inlineenclosure"><TMPL_ELSE><div id="inlineenclosure"></TMPL_IF>
+<a href="<TMPL_VAR ENCLOSURE>">Download</a>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF HTML5><footer class="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
+
+<span class="pagedate">
+Posted <TMPL_VAR CTIME>
+</span>
+
+<TMPL_IF TAGS>
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
+Tags:
+<TMPL_LOOP TAGS>
+<TMPL_VAR LINK>
+</TMPL_LOOP>
+<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF COPYRIGHT>
+<div class="pagecopyright">
+<TMPL_VAR COPYRIGHT>
+</div>
+</TMPL_IF>
+
+<TMPL_IF LICENSE>
+<div class="pagelicense">
+License: <TMPL_VAR LICENSE>
+</div>
+</TMPL_IF>
+
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
+<ul>
+<TMPL_IF EDITURL>
+<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
+</TMPL_IF>
+<TMPL_IF COMMENTSLINK>
+<li><TMPL_VAR COMMENTSLINK></li>
+<TMPL_ELSE>
+<TMPL_IF DISCUSSIONLINK>
+<li><TMPL_VAR DISCUSSIONLINK></li>
+</TMPL_IF>
+</TMPL_IF>
+</ul>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
diff --git a/templates/page.tmpl b/templates/page.tmpl
new file mode 100644
index 0000000..c6e2c85
--- /dev/null
+++ b/templates/page.tmpl
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<TMPL_IF HTML_LANG_CODE><html lang="<TMPL_VAR HTML_LANG_CODE>" dir="<TMPL_VAR HTML_LANG_DIR>" xmlns="http://www.w3.org/1999/xhtml"><TMPL_ELSE><html xmlns="http://www.w3.org/1999/xhtml"></TMPL_IF>
+<head>
+  <meta charset="utf-8" />
+  <title><TMPL_VAR TITLE></title>
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+</head>
+<body>
+  <article class="page">
+    <section class="pageheader">
+      <header class="header">
+	<span>
+	  <span class="parentlinks">
+	    <TMPL_LOOP PARENTLINKS>
+	      <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a> &rarr;
+	    </TMPL_LOOP>
+	  </span>
+	  <span class="title">
+	    <TMPL_VAR TITLE>
+	  </span>
+	</span>
+      </header>
+    </section>
+
+    <TMPL_IF SIDEBAR>
+      <aside class="sidebar"><TMPL_VAR SIDEBAR></aside>
+    </TMPL_IF>
+
+    <div id="pagebody">
+      <section>
+	<TMPL_VAR CONTENT>
+      </section>
+    </div>
+
+    <footer id="footer" class="pagefooter" role="contentinfo">
+      <nav id="pageinfo">
+	<div class="pagedate">Last edited <TMPL_VAR MTIME></div>
+      </nav>
+    </footer>
+  </article>
+</body>
+</html>
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
new file mode 100644
index 0000000..bb03ca5
--- /dev/null
+++ b/templates/rssitem.tmpl
@@ -0,0 +1,28 @@
+<item>
+	<title><TMPL_VAR TITLE></title>
+<TMPL_IF GUID>
+	<guid isPermaLink="false"><TMPL_VAR GUID></guid>
+<TMPL_ELSE>
+	<guid isPermaLink="false"><TMPL_VAR URL></guid>
+</TMPL_IF>
+	<link><TMPL_VAR PERMALINK></link>
+<TMPL_IF AUTHOR>
+	<dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator>
+</TMPL_IF>
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
+	<category><TMPL_VAR CATEGORY></category>
+</TMPL_LOOP>
+</TMPL_IF>
+	<pubDate><TMPL_VAR CDATE_822></pubDate>
+	<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
+<TMPL_IF ENCLOSURE>
+	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
+</TMPL_IF>
+<TMPL_UNLESS SIMPLEPODCAST>
+	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+</TMPL_UNLESS>
+<TMPL_IF COMMENTSURL>
+	<comments><TMPL_VAR COMMENTSURL></comments>
+</TMPL_IF>
+</item>
diff --git a/templates/rsspage.tmpl b/templates/rsspage.tmpl
new file mode 100644
index 0000000..d07ecef
--- /dev/null
+++ b/templates/rsspage.tmpl
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<rss version="2.0"
+     xmlns:dc="http://purl.org/dc/elements/1.1/"
+     xmlns:dcterms="http://purl.org/dc/terms/"
+     xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+<title><TMPL_VAR TITLE></title>
+<link><TMPL_VAR PAGEURL></link>
+<atom:link href="<TMPL_VAR FEEDURL>" rel="self" type="application/rss+xml"/>
+<TMPL_IF COPYRIGHT>
+<copyright><TMPL_VAR COPYRIGHT ESCAPE=HTML></copyright>
+</TMPL_IF>
+<description><TMPL_VAR FEEDDESC ESCAPE=HTML></description>
+<generator>ikiwiki</generator>
+<pubDate><TMPL_VAR FEEDDATE_822></pubDate>
+<TMPL_VAR CONTENT>
+</channel>
+</rss>
diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl
new file mode 100644
index 0000000..6326bab
--- /dev/null
+++ b/templates/titlepage.tmpl
@@ -0,0 +1,7 @@
+<p>
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
+</TMPL_IF>
+</p>