Site redesign

7 files changed, 96 insertions, 32 deletions

diff --git a/blog.cabal b/blog.cabal
index e6aba5f..b8e83ce 100644
--- a/blog.cabal
+++ b/blog.cabal
@@ -36,3 +36,4 @@ executable site
                      , deepseq >=1.4 && <2
                      , regex-tdfa >=1.2 && <2
                      , mtl >=2.2 && <3
+                     , blaze-html >=0.8.1 && <1
diff --git a/blog.nix b/blog.nix
index ca9a83f..cce4bc9 100644
--- a/blog.nix
+++ b/blog.nix
@@ -1,19 +1,19 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ mkDerivation, stdenv
-, hakyll, containers, pandoc, data-default, filepath, hex, cryptohash
-, process, temporary, directory, deepseq, regex-tdfa, mtl
+{ mkDerivation, base, blaze-html, bytestring, containers
+, cryptohash, data-default, deepseq, directory, filepath, hakyll
+, hex, mtl, pandoc, pandoc-types, process, regex-tdfa, stdenv
+, temporary
 }:
-
 mkDerivation {
   pname = "dirty-haskell";
   version = "0.0.0";
   src = ./.;
-  isExecutable = true;
   isLibrary = false;
-  buildDepends = [
-    hakyll containers pandoc data-default filepath hex cryptohash
-    process temporary directory deepseq regex-tdfa mtl
+  isExecutable = true;
+  executableHaskellDepends = [
+    base blaze-html bytestring containers cryptohash data-default
+    deepseq directory filepath hakyll hex mtl pandoc pandoc-types
+    process regex-tdfa temporary
   ];
-  license = stdenv.lib.licenses.publicDomain;
+  homepage = "git://git.yggdrasil.li/dirty-haskell.org";
+  license = stdenv.lib.licenses.unfree;
 }
diff --git a/provider/css/default.css b/provider/css/default.css
index af4832a..a100adc 100644
--- a/provider/css/default.css
+++ b/provider/css/default.css
@@ -1,29 +1,82 @@
+header, footer {
+    padding:1em 0 1em 0;
+}
+
+header {
+    border-bottom:2px solid #f0f0f0;
+}
+
+footer {
+    border-top:2px solid #f0f0f0;
+}
+
+footer ul.tags {
+    list-style:none outside none;
+    margin:0;
+    padding:0;
+    display:inline;
+}
+
+footer ul.tags:before { content:" — "; }
+
+footer ul.tags li {
+    margin:0;
+    padding:0;
+    display:inline;
+}
+
+footer ul.tags li:after { content:", "; }
+
+footer ul.tags li:last-child:after { content: ""; }
+
+header h1, header h2 {
+    margin:0;
+}
+
+header h2.subtitle {
+    font-size:1em;
+    font-weight:normal;
+    font-style:italic;
+}
+
 body {
-    margin: auto;
-    padding-right: 1em;
-    padding-left: 1em;
-    font: normal 1.1em monospace;
-    max-width: 90em;
-    text-align: justify;
+    margin:auto;
+    padding-right:1em;
+    padding-left:1em;
+    font:normal 1em monospace;
+    max-width:90em;
+    text-align:justify;
 }
 
 a {
-    color: inherit;
+    color:inherit;
 }
 
 p {
-    margin-bottom: 0
+    margin-top:1em;
+    margin-bottom:0;
+}
+
+p:last-of-type {
+    margin-bottom:1em;
 }
 
 p + p {
-    text-indent: 1.5em;
-    margin-top: 0;
+    text-indent:1.5em;
+    margin-top:0;
+}
+
+footer p, footer p:last-of-type {
+    margin:0;
+    padding:0;
+    text-indent:0;
+    display:inline;
 }
 
 div.sourceCode {
-    padding-left: 1.5em;
+    padding-left:1.5em;
     border-left:2px solid #f0f0f0;
-    margin-left: -2px;
+    margin-left:-2px;
 }
 
 pre code {
diff --git a/provider/index.html b/provider/index.html
index 8eb184f..422b726 100644
--- a/provider/index.html
+++ b/provider/index.html
@@ -1,4 +1,3 @@
-$body$
 <ul>
   $for(tags)$
   <li>
diff --git a/provider/index.md b/provider/index.md
deleted file mode 100644
index 53a06bc..0000000
--- a/provider/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a blog.
-It contains things.
-Send other things to <blog@dirty-haskell.org> if you so choose.
diff --git a/provider/templates/default.html b/provider/templates/default.html
index ba412e6..4dca581 100644
--- a/provider/templates/default.html
+++ b/provider/templates/default.html
@@ -18,8 +18,13 @@
 $if(title)$
 <header>
   <h1 class="title"><a href="/" title="dirty-haskell.org">dirty-haskell.org</a>: $title$</h1>
+  <h2 class="subtitle">It's not crazy — it's having fun with types.</h2>
 </header>
 $endif$
 $body$
+<footer>
+  <p class="info">$if(published)$$published$, $endif$<a href="mailto:blog@dirty-haskell.org">blog@dirty-haskell.org</a></p>
+  $if(tagList)$<ul class="tags">$tagList$</ul>$endif$
+</footer>
 </body>
 </html>
diff --git a/src/Site.hs b/src/Site.hs
index 98a598f..c1e4854 100644
--- a/src/Site.hs
+++ b/src/Site.hs
@@ -9,13 +9,16 @@ import Data.Maybe (mapMaybe, fromMaybe)
 import Data.Map (Map)
 import qualified Data.Map as Map
 import qualified Data.Set as Set
-import Data.List (take, reverse, nub, groupBy, concatMap)
+import Data.List (take, reverse, nub, groupBy, concatMap, intersperse)
 import Data.Function (on)
 import Data.Default
 import Text.Pandoc
 import Text.Pandoc.Walk (query, walkM)
 import Text.Pandoc.Error
 import Control.Applicative (Alternative(..), Applicative(..))
+import           Text.Blaze.Html                 (toHtml, toValue, (!))
+import qualified Text.Blaze.Html5                as H
+import qualified Text.Blaze.Html5.Attributes     as A
 
 import System.FilePath (takeBaseName, (</>), (<.>))
 
@@ -45,16 +48,20 @@ main = hakyllWith config $ do
         saveSnapshot "alignment" $ fmap snd item
         return $ fmap fst item
 
+  tags <- buildTags "posts/*" tagTranslation' >>= addTag "All Posts" "posts/*"
+
   match "posts/*" $ do
     route $ setExtension ".html"
     compile $ do
+      let ctx = mconcat [ defaultContext
+                        , dateField "published" "%F"
+                        , tagsFieldWith getTags (\tag _ -> Just . H.li $ H.a ! A.href (toValue . toUrl $ "tags" </> tagTranslation tag <.> "html") $ toHtml tag) (mconcat . intersperse "\n") "tagList" tags
+                        ]
       getResourceBody >>= saveSnapshot "content"
       pandocCompilerWithTransformM defaultHakyllReaderOptions defaultHakyllWriterOptions mathTransform
-        >>= loadAndApplyTemplate "templates/default.html" defaultContext
+        >>= loadAndApplyTemplate "templates/default.html" ctx
         >>= relativizeUrls
 
-  tags <- buildTags "posts/*" tagTranslation' >>= addTag "All Posts" "posts/*"
-
   tagsRules tags $ \tag pattern -> do
     route idRoute
     compile $ do
@@ -89,7 +96,9 @@ main = hakyllWith config $ do
                         , defaultContext
                         ]
       item <- getResourceBody
-      pandocCompilerWith def (def { writerEmailObfuscation = NoObfuscation })
+      {-pandocCompilerWith def (def { writerEmailObfuscation = NoObfuscation })
+        >>=-}
+      makeItem ""
         >>= loadAndApplyTemplate "templates/index.html" ctx
         >>= loadAndApplyTemplate "templates/default.html" ctx
         >>= relativizeUrls