From d9aa4be1f38c44390997b49bcd02dec966655cdf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 1 Jun 2012 22:44:27 +0200
Subject: Various fixes

---
 hakyll.hs                                     |  6 +++---
 posts/2009-12-04-this-blog-aint-dead.markdown |  3 +++
 templates/archiveitem.html                    |  3 ---
 templates/default.html                        | 18 ++++++++++--------
 templates/index.html                          |  4 ++++
 templates/post.html                           |  2 +-
 templates/post_short.html                     | 13 -------------
 templates/postitem.html                       |  4 ----
 8 files changed, 21 insertions(+), 32 deletions(-)
 delete mode 100644 templates/archiveitem.html
 delete mode 100644 templates/post_short.html
 delete mode 100644 templates/postitem.html

diff --git a/hakyll.hs b/hakyll.hs
index f5e1045..9ec9225 100644
--- a/hakyll.hs
+++ b/hakyll.hs
@@ -51,7 +51,7 @@ main = hakyll $ do
     >>> ((constA () &&& constA "index*") &&& id)
     >>> paginatePosts (const "Home")
 
-  match "posts/*" $ compile $ readPageCompiler
+  match "posts/*" $ compile $ pageCompiler
     >>> (id &&& getIdentifier)
     >>> setFieldA "path" (arr $ fromMaybe "" . runRoutes (setExtension ".html"))
     >>> (id &&& arr (getField "path"))
@@ -104,10 +104,10 @@ main = hakyll $ do
     nav prev next = navPrev prev ++ navNext next
 
     navPrev Nothing = "<span class=\"newer\">&nbsp;</span>"
-    navPrev (Just url) = "<span class=\"newer\"><a href=\"" ++ url ++ "\" >&laquo; Newer Entries</a></span>"
+    navPrev (Just url) = "<span class=\"newer\"><a href=\"" ++ url ++ "\" rel=\"prev\">&laquo; Newer Entries</a></span>"
 
     navNext Nothing = "<span class=\"older\">&nbsp;</span>"
-    navNext (Just url) = "<span class=\"older\"><a href=\"" ++ url ++ "\" >Older Entries &raquo;</a></span>"
+    navNext (Just url) = "<span class=\"older\"><a href=\"" ++ url ++ "\" rel=\"next\">Older Entries &raquo;</a></span>"
 
     pageTitle 0 = ""
     pageTitle i = " - Page " ++ show (i+1)
diff --git a/posts/2009-12-04-this-blog-aint-dead.markdown b/posts/2009-12-04-this-blog-aint-dead.markdown
index 0c56146..4f48c65 100644
--- a/posts/2009-12-04-this-blog-aint-dead.markdown
+++ b/posts/2009-12-04-this-blog-aint-dead.markdown
@@ -11,3 +11,6 @@ dolor eu enim tristique vel vehicula risus mollis. Nunc nec tortor quam. Nulla
 a mauris arcu. Phasellus venenatis tortor vel odio tincidunt consequat. Integer
 venenatis nibh vitae lectus laoreet eu feugiat nunc pretium. Integer nec turpis
 metus, in fermentum lorem.
+
+ * list
+ * foo
\ No newline at end of file
diff --git a/templates/archiveitem.html b/templates/archiveitem.html
deleted file mode 100644
index 60da335..0000000
--- a/templates/archiveitem.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<li>
-    <a href="$url$">$title$</a>
-</li>
diff --git a/templates/default.html b/templates/default.html
index 74eac8b..38331ab 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -33,16 +33,17 @@
       <div id="content">
 	<div id="content-body">
 	  $body$
-
-	  <div class="newer_older">
-	    <!--<span class="newer">&nbsp;</span>
-	    <span class="older">&nbsp;<a href="/2/" >Older Entries &raquo;</a></span>-->
-	    $nav$
-	  </div>
 	</div>
 	<div class="content-sidebar">
+	  <h3>See also</h3>
+	  <ul>
+	    <li><a href="http://soup.universe-factory.net/">Soup (<acronym title="not safe for work">NSFW</acronym>)</a></li>
+	    <li><a href="http://www.last.fm/user/neoraider">last.fm</a></li>
+	    <li><a href="https://identi.ca/neoraider/">identica</a></li>
+	  </ul>
+
 	  <h3>Blogroll</h3>
-	  <ul class="xoxo blogroll">
+	  <ul>
 	    <li><a href="http://lenabits.wordpress.com/" rel="friend met">LenaBits</a></li>
 	    <li><a href="http://mieke.planetcyb.org/" rel="friend met">Mieke</a></li>
 	    <li><a href="https://mw.vc/" rel="friend met">Milliways</a></li>
@@ -51,7 +52,8 @@
 	    <li><a href="http://worldschanging.universe-factory.net/" rel="friend met">Worlds Changing</a></li>
 	  </ul>
 
-	  <h3>Tags</h3><div class="tagcloud">
+	  <h3>Tags</h3>
+	  <div>
 	    $tagcloud$
 	  </div>
 	  <h3>Archive</h3>
diff --git a/templates/index.html b/templates/index.html
index 55579d1..b221afe 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1 +1,5 @@
 $posts$
+
+<div class="newer_older">
+  $nav$
+</div>
diff --git a/templates/post.html b/templates/post.html
index f6ac5b5..f257365 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -3,7 +3,7 @@
     $date$
   </div>
   <h2><a href="$url$" rel="bookmark">$title$</a></h2>
-  <p>$body$</p>
+  <div>$body$</div>
 
   <div class="cat_tags clear">
     <span class="category">Tagged as: $prettytags$</span>
diff --git a/templates/post_short.html b/templates/post_short.html
deleted file mode 100644
index 3cdfe59..0000000
--- a/templates/post_short.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="post type-post status-publish format-standard hentry">
-  <div class="only_date">
-    $date$
-  </div>
-  <h2><a href="$url$" rel="bookmark">$title$</a></h2>
-  <p>$body$</p>
-
-  <div class="cat_tags clear cat_tags_continue">
-    <span class="category">Tagged as: $prettytags$</span>
-    <span class="continue"><a title="$title$" href="$url$">Continue reading</a></span><div class="clear"></div>
-  </div>
-  <div class="cat_tags_close cat_tags_continue_close"></div>
-</div>
diff --git a/templates/postitem.html b/templates/postitem.html
deleted file mode 100644
index ccbb58e..0000000
--- a/templates/postitem.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<li>
-    <a href="$url$">$title$</a>
-    - <em>$date$</em> - by <em>$author$</em>
-</li>
-- 
cgit v1.2.3