diff --git a/.gitignore b/.gitignore
index 447b87d..4781dbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-##
-## gitignore(5) -- specify ignored files
-##
-
# Ignore swap files and cabal output.
*.hi
*.o
@@ -15,10 +11,11 @@ tags
# Ignore test builds.
tests/Main
+_cache
+_store
# Rest of the file: ignore examples
-examples/*/_cache
-examples/*/_site
-examples/*/hakyll
-examples/hakyll/reference
-
+web/_cache
+web/_site
+web/hakyll
+web/reference
diff --git a/Makefile b/Makefile
index 4d9ddd5..1029599 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
# Generate the docs and copy them to the website dir
haddock:
cabal haddock --hyperlink-source
- rm -rf examples/hakyll/reference/
- cp -r dist/doc/html/hakyll/ examples/hakyll/reference/
+ rm -rf web/reference/
+ cp -r dist/doc/html/hakyll/ web/reference/
# Run the tests
test:
diff --git a/examples/README.markdown b/examples/README.markdown
deleted file mode 100644
index e253e9d..0000000
--- a/examples/README.markdown
+++ /dev/null
@@ -1,14 +0,0 @@
-Hakyll examples
-===============
-
-In order of increasing complexity:
-
- brochure/ A very simple brochure site
- morepages/ Slightly more complicated brochure site with partials
- simpleblog/ A simple blog
- feedblog/ Adds an RSS feed to the simple blog
- tagblog/ Adds tags to the simple blog
-
-In no real category:
-
- hakyll/ The hakyll website (some custom pandoc options)
diff --git a/examples/brochure/about.rst b/examples/brochure/about.rst
deleted file mode 100644
index 99af9e2..0000000
--- a/examples/brochure/about.rst
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: About
----
-Nullam imperdiet sodales orci vitae molestie. Nunc quam orci, pharetra a
-rhoncus vitae, eleifend id felis. Suspendisse potenti. Etiam vitae urna orci.
-Quisque pellentesque dignissim felis, egestas tempus urna luctus vitae. In hac
-habitasse platea dictumst. Morbi fringilla mattis odio, et mattis tellus
-accumsan vitae.
-
-1. Amamus Unicode 碁
-2. Interdum nex magna.
-
-Vivamus eget mauris sit amet nulla laoreet lobortis. Nulla in diam elementum
-risus convallis commodo. Cras vehicula varius dui vitae facilisis. Proin
-elementum libero eget leo aliquet quis euismod orci vestibulum. Duis rhoncus
-lorem consequat tellus vestibulum aliquam. Quisque orci orci, malesuada porta
-blandit et, interdum nec magna.
diff --git a/examples/brochure/code.lhs b/examples/brochure/code.lhs
deleted file mode 100644
index e98ec85..0000000
--- a/examples/brochure/code.lhs
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Code
----
-Etiam condimentum auctor semper. Donec lobortis, magna id sodales sollicitudin,
-lectus mi egestas nulla, pulvinar lobortis nunc eros id nisl. Curabitur
-imperdiet, erat at accumsan vulputate.
-
-> reverse' [] = []
-> reverse' (x:xs) = (reverse' xs) ++ [x]
-
-Purus nunc blandit nulla, dictum.
-
-vestibulum sem lorem eget ipsum. Nunc tincidunt, turpis ut fermentum dapibus,
-justo tortor bibendum sem, at facilisis justo odio luctus lectus. Quisque nec
-ligula ipsum. Nunc augue lacus, ullamcorper vel dapibus in, mattis eget elit.
-
-> main = print $ reverse' [1 .. 10]
-
-Integer ut dui eu felis mollis vestibulum. Etiam at nibh id diam aliquet
-vestibulum sit amet a nibh. Aliquam erat volutpat. Etiam vitae nulla at dolor
-fringilla tempor ut a nunc. Pellentesque elementum elit lorem.
diff --git a/examples/brochure/css/default.css b/examples/brochure/css/default.css
deleted file mode 100644
index 3bfeeaf..0000000
--- a/examples/brochure/css/default.css
+++ /dev/null
@@ -1,27 +0,0 @@
-body {
- width: 600px;
- margin: 0px auto 0px auto;
-}
-
-div#navigation {
- text-align: center;
- border-bottom: 4px solid black;
-}
-
-div#navigation a {
- color: white;
- text-decoration: none;
- background-color: black;
- padding: 3px 10px 3px 10px;
- margin: 0px 10px 0px 10px;
-}
-
-div.figure {
- float: right;
- margin: 20px 0px 20px 20px;
-}
-
-div.figure p.caption {
- text-align: center;
- font-style: italic;
-}
diff --git a/examples/brochure/hakyll.hs b/examples/brochure/hakyll.hs
deleted file mode 100644
index f33b37d..0000000
--- a/examples/brochure/hakyll.hs
+++ /dev/null
@@ -1,22 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-import Control.Arrow ((>>>))
-
-import Hakyll
-
-main :: IO ()
-main = hakyll $ do
- match "images/*" $ do
- route idRoute
- compile copyFileCompiler
-
- match "css/*" $ do
- route idRoute
- compile compressCssCompiler
-
- match "templates/*" $ compile templateCompiler
-
- match (list ["about.rst", "index.markdown", "code.lhs"]) $ do
- route $ setExtension "html"
- compile $ pageCompiler
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
diff --git a/examples/brochure/index.markdown b/examples/brochure/index.markdown
deleted file mode 100644
index 96b63bd..0000000
--- a/examples/brochure/index.markdown
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: Home
----
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce tempor, urna et
-auctor tincidunt, eros mauris facilisis purus, eget sollicitudin leo massa sit
-amet ipsum. Vivamus eu massa in urna vehicula rutrum eget sit amet purus.
-
-![Haskell logo](/images/haskell-logo.png)
-
-- Mauris sit amet justo mi.
-- Curabitur vel quam felis.
-- In hac habitasse platea dictumst.
-
-Etiam nec consequat risus. Donec consequat est vitae neque fermentum
-feugiat nec ac nibh. Nulla rhoncus, odio quis scelerisque rutrum, metus sem
-tempor ante, a ornare ipsum felis sed ligula. Morbi urna lectus, scelerisque
-non pharetra in, rutrum quis ligula. Phasellus semper ullamcorper arcu eu
-auctor.
-
-Aliquam sagittis tincidunt libero ut elementum. Ut sit amet vestibulum metus.
-Ut aliquet congue neque eu tincidunt. Integer eu elit sed massa sollicitudin
-vehicula nec ut sem. Cras euismod enim eget purus lacinia non feugiat urna
-imperdiet. Aliquam justo sem, viverra eu vehicula vitae, imperdiet vel magna.
-
-Pellentesque enim dui, interdum elementum vehicula luctus, feugiat vitae arcu.
-Vestibulum ut felis justo. Quisque vestibulum mauris eget ipsum luctus
-consequat.
diff --git a/examples/brochure/templates/default.html b/examples/brochure/templates/default.html
deleted file mode 100644
index 44d1cd0..0000000
--- a/examples/brochure/templates/default.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- $body$
-
-
diff --git a/examples/feedblog/css/default.css b/examples/feedblog/css/default.css
deleted file mode 100644
index 9ed2b01..0000000
--- a/examples/feedblog/css/default.css
+++ /dev/null
@@ -1,17 +0,0 @@
-body {
- width: 600px;
- margin: 0px auto 0px auto;
-}
-
-div#navigation {
- text-align: center;
- border-bottom: 4px solid black;
-}
-
-div#navigation a {
- color: white;
- text-decoration: none;
- background-color: black;
- padding: 3px 10px 3px 10px;
- margin: 0px 10px 0px 10px;
-}
diff --git a/examples/feedblog/hakyll.hs b/examples/feedblog/hakyll.hs
deleted file mode 100644
index 4aa8ed9..0000000
--- a/examples/feedblog/hakyll.hs
+++ /dev/null
@@ -1,68 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-module Main where
-
-import Prelude hiding (id)
-import Control.Category (id)
-import Control.Arrow ((>>>), (***), arr)
-import Data.Monoid (mempty, mconcat)
-
-import Hakyll
-
-main :: IO ()
-main = hakyll $ do
- -- Compress CSS
- match "css/*" $ do
- route idRoute
- compile compressCssCompiler
-
- -- Render posts
- match "posts/*" $ do
- route $ setExtension ".html"
- compile $ pageCompiler
- >>> applyTemplateCompiler "templates/post.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Render posts list
- match "posts.html" $ route idRoute
- create "posts.html" $ constA mempty
- >>> arr (setField "title" "All posts")
- >>> requireAllA "posts/*" addPostList
- >>> applyTemplateCompiler "templates/posts.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Index
- match "index.html" $ route idRoute
- create "index.html" $ constA mempty
- >>> arr (setField "title" "Home")
- >>> requireAllA "posts/*" (id *** arr (take 3 . reverse . sortByBaseName) >>> addPostList)
- >>> applyTemplateCompiler "templates/index.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Render RSS feed
- match "rss.xml" $ route idRoute
- create "rss.xml" $
- requireAll_ "posts/*" >>> renderRss feedConfiguration
-
- -- Read templates
- match "templates/*" $ compile templateCompiler
-
--- | Auxiliary compiler: generate a post list from a list of given posts, and
--- add it to the current page under @$posts@
---
-addPostList :: Compiler (Page String, [Page String]) (Page String)
-addPostList = setFieldA "posts" $
- arr (reverse . sortByBaseName)
- >>> require "templates/postitem.html" (\p t -> map (applyTemplate t) p)
- >>> arr mconcat
- >>> arr pageBody
-
-feedConfiguration :: FeedConfiguration
-feedConfiguration = FeedConfiguration
- { feedTitle = "SimpleBlog RSS feed."
- , feedDescription = "A simple demo of an RSS feed created with Hakyll."
- , feedAuthorName = "Jasper Van der Jeugt"
- , feedRoot = "http://example.com"
- }
diff --git a/examples/feedblog/posts/2009-11-05-a-first-post.markdown b/examples/feedblog/posts/2009-11-05-a-first-post.markdown
deleted file mode 100644
index 7351eb4..0000000
--- a/examples/feedblog/posts/2009-11-05-a-first-post.markdown
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: A first post
-author: Julius Caesar
-date: November 5, 2009
-description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
----
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus pretium leo
-adipiscing lectus iaculis lobortis. Vivamus scelerisque velit dignissim metus
-gravida sit amet dapibus ligula tempor. Quisque sit amet viverra nunc.
-Suspendisse cursus elementum ante, ut venenatis nisi dictum eu. Nulla diam
-ligula, eleifend in varius quis, malesuada a nibh. Vivamus consequat
-pellentesque erat non blandit. Nunc sit amet eros vel massa semper ullamcorper
-quis iaculis magna. Vestibulum ullamcorper urna sit amet est elementum
-pulvinar. Vestibulum consequat lacus ac quam hendrerit tincidunt. Praesent
-bibendum vehicula diam, nec sagittis risus tempus a. Nulla quis odio sit amet
-odio vehicula cursus ut id odio. Curabitur semper magna euismod magna mollis
-venenatis. Nunc eget eleifend velit. Mauris sed posuere sem. Fusce id nunc
-nisi, a aliquam orci. Suspendisse laoreet justo non enim laoreet eget consequat
-velit porttitor. Aenean faucibus sodales metus at tincidunt. Donec vestibulum
-leo pulvinar erat auctor ac ultrices massa euismod. Phasellus blandit cursus
-magna, eget lacinia mi lobortis sed. Suspendisse ultricies enim ligula, vel
-scelerisque mauris.
diff --git a/examples/feedblog/posts/2009-11-10-another-post.markdown b/examples/feedblog/posts/2009-11-10-another-post.markdown
deleted file mode 100644
index c4e07b6..0000000
--- a/examples/feedblog/posts/2009-11-10-another-post.markdown
+++ /dev/null
@@ -1,17 +0,0 @@
----
-title: Another post
-author: Marcus Tullius Cicero
-date: November 10, 2009
-description: Vestibulum in ultrices urna. Etiam tempor enim dui, nec malesuada elit.
----
-
-Vestibulum in ultrices urna. Etiam tempor enim dui, nec malesuada elit. Donec
-tempor ligula et quam volutpat quis fermentum eros congue. Sed ut pulvinar sem.
-Sed aliquam ipsum id purus sollicitudin vulputate. Cras et mauris dui, vel
-hendrerit leo. Ut metus ipsum, fermentum ac malesuada id, tempus pharetra quam.
-Donec diam felis, consequat ac scelerisque cursus, gravida non lectus. Sed
-faucibus elit dapibus diam elementum id varius nisi tristique. Proin consequat
-faucibus neque in aliquam. Vestibulum ligula odio, pulvinar vel hendrerit
-vitae, egestas ut nibh. Praesent ut velit elit, in consequat dolor. Praesent
-sem enim, commodo in gravida sed, adipiscing vel eros. Lorem ipsum dolor sit
-amet, consectetur adipiscing elit. Proin non aliquam nunc.
diff --git a/examples/feedblog/posts/2009-11-28-a-third-post.markdown b/examples/feedblog/posts/2009-11-28-a-third-post.markdown
deleted file mode 100644
index b7df45d..0000000
--- a/examples/feedblog/posts/2009-11-28-a-third-post.markdown
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: A third post
-author: Publius Ovidius Naso
-date: November 28, 2009
-description: Pellentesque tempor blandit elit, vel ultricies arcu congue egestas.
----
-
-Pellentesque tempor blandit elit, vel ultricies arcu congue egestas. Fusce
-vitae rutrum nisl. Fusce id mauris libero, a venenatis tellus. Fusce iaculis,
-lorem et ornare molestie, mauris risus mollis nisi, non fermentum lacus lacus
-sit amet ipsum. Praesent lobortis ullamcorper dolor, eget convallis ligula
-dignissim a. Suspendisse nulla nisi, congue et pharetra vel, convallis non
-libero. Ut a nulla ipsum. Phasellus cursus velit id neque viverra ut
-pellentesque justo posuere. Curabitur laoreet enim et velit tempor consectetur.
-Donec eu pretium urna. Suspendisse vitae nisi at metus vestibulum aliquam in
-sit amet nisl. Donec convallis lacinia odio, vestibulum molestie nunc feugiat
-a. Suspendisse vehicula, sapien id aliquet consectetur, sem sapien ullamcorper
-arcu, scelerisque porttitor elit ipsum posuere ligula. Nulla at velit eu metus
-tincidunt auctor ut sit amet enim. Donec placerat dapibus nisi id facilisis.
-Maecenas pellentesque pulvinar auctor. Curabitur gravida quam sit amet purus
-consectetur blandit.
diff --git a/examples/feedblog/posts/2009-12-04-this-blog-aint-dead.markdown b/examples/feedblog/posts/2009-12-04-this-blog-aint-dead.markdown
deleted file mode 100644
index 17de991..0000000
--- a/examples/feedblog/posts/2009-12-04-this-blog-aint-dead.markdown
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: This blog ain't dead
-author: Marcus Antonius
-date: December 4, 2009
-description: Etiam non felis aliquet tellus dictum vestibulum.
----
-
-Etiam non felis aliquet tellus dictum vestibulum. Aliquam accumsan mauris non
-lacus ultricies nec lacinia enim rhoncus. Curabitur vel tortor massa, elementum
-tincidunt elit. Maecenas venenatis luctus arcu ut ullamcorper. Donec interdum
-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.
diff --git a/examples/feedblog/posts/2009-12-23-almost-christmas.markdown b/examples/feedblog/posts/2009-12-23-almost-christmas.markdown
deleted file mode 100644
index 214f147..0000000
--- a/examples/feedblog/posts/2009-12-23-almost-christmas.markdown
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Almost Christmas!
-author: Publius Vergilius Maro
-date: December 23, 2009
-description: Morbi tincidunt eleifend ante, eu gravida ante rutrum vel.
----
-
-Morbi tincidunt eleifend ante, eu gravida ante rutrum vel. Nunc bibendum nulla
-tellus, eget egestas sapien. Nam rhoncus interdum libero, eget congue orci
-imperdiet eu. Quisque pellentesque fringilla urna, ac venenatis ante ultricies
-et. Pellentesque habitant morbi tristique senectus et netus et malesuada fames
-ac turpis egestas. Mauris eleifend sagittis ultrices. Quisque ultrices accumsan
-nisl, sed pellentesque metus porta vitae. Nulla facilisi. In et nibh tincidunt
-mi volutpat pellentesque vitae nec sapien. Integer massa ipsum, pellentesque in
-elementum at, cursus sit amet diam.
diff --git a/examples/feedblog/templates/default.html b/examples/feedblog/templates/default.html
deleted file mode 100644
index 7aac5d5..0000000
--- a/examples/feedblog/templates/default.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
- SimpleBlog - $title$
-
-
-
-
-
-
- $body$
-
-
-
-
diff --git a/examples/simpleblog/css/default.css b/examples/simpleblog/css/default.css
deleted file mode 100644
index 9ed2b01..0000000
--- a/examples/simpleblog/css/default.css
+++ /dev/null
@@ -1,17 +0,0 @@
-body {
- width: 600px;
- margin: 0px auto 0px auto;
-}
-
-div#navigation {
- text-align: center;
- border-bottom: 4px solid black;
-}
-
-div#navigation a {
- color: white;
- text-decoration: none;
- background-color: black;
- padding: 3px 10px 3px 10px;
- margin: 0px 10px 0px 10px;
-}
diff --git a/examples/simpleblog/hakyll.hs b/examples/simpleblog/hakyll.hs
deleted file mode 100644
index 270c3e3..0000000
--- a/examples/simpleblog/hakyll.hs
+++ /dev/null
@@ -1,55 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-module Main where
-
-import Prelude hiding (id)
-import Control.Category (id)
-import Control.Arrow ((>>>), (***), arr)
-import Data.Monoid (mempty, mconcat)
-
-import Hakyll
-
-main :: IO ()
-main = hakyll $ do
- -- Compress CSS
- match "css/*" $ do
- route idRoute
- compile compressCssCompiler
-
- -- Render posts
- match "posts/*" $ do
- route $ setExtension ".html"
- compile $ pageCompiler
- >>> applyTemplateCompiler "templates/post.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Render posts list
- match "posts.html" $ route idRoute
- create "posts.html" $ constA mempty
- >>> arr (setField "title" "All posts")
- >>> requireAllA "posts/*" addPostList
- >>> applyTemplateCompiler "templates/posts.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Index
- match "index.html" $ route idRoute
- create "index.html" $ constA mempty
- >>> arr (setField "title" "Home")
- >>> requireAllA "posts/*" (id *** arr (take 3 . reverse . sortByBaseName) >>> addPostList)
- >>> applyTemplateCompiler "templates/index.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Read templates
- match "templates/*" $ compile templateCompiler
-
--- | Auxiliary compiler: generate a post list from a list of given posts, and
--- add it to the current page under @$posts@
---
-addPostList :: Compiler (Page String, [Page String]) (Page String)
-addPostList = setFieldA "posts" $
- arr (reverse . sortByBaseName)
- >>> require "templates/postitem.html" (\p t -> map (applyTemplate t) p)
- >>> arr mconcat
- >>> arr pageBody
diff --git a/examples/simpleblog/posts/2009-11-05-a-first-post.markdown b/examples/simpleblog/posts/2009-11-05-a-first-post.markdown
deleted file mode 100644
index 56b0405..0000000
--- a/examples/simpleblog/posts/2009-11-05-a-first-post.markdown
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: A first post
-author: Julius Caesar
-date: November 5, 2009
----
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus pretium leo
-adipiscing lectus iaculis lobortis. Vivamus scelerisque velit dignissim metus
-gravida sit amet dapibus ligula tempor. Quisque sit amet viverra nunc.
-Suspendisse cursus elementum ante, ut venenatis nisi dictum eu. Nulla diam
-ligula, eleifend in varius quis, malesuada a nibh. Vivamus consequat
-pellentesque erat non blandit. Nunc sit amet eros vel massa semper ullamcorper
-quis iaculis magna. Vestibulum ullamcorper urna sit amet est elementum
-pulvinar. Vestibulum consequat lacus ac quam hendrerit tincidunt. Praesent
-bibendum vehicula diam, nec sagittis risus tempus a. Nulla quis odio sit amet
-odio vehicula cursus ut id odio. Curabitur semper magna euismod magna mollis
-venenatis. Nunc eget eleifend velit. Mauris sed posuere sem. Fusce id nunc
-nisi, a aliquam orci. Suspendisse laoreet justo non enim laoreet eget consequat
-velit porttitor. Aenean faucibus sodales metus at tincidunt. Donec vestibulum
-leo pulvinar erat auctor ac ultrices massa euismod. Phasellus blandit cursus
-magna, eget lacinia mi lobortis sed. Suspendisse ultricies enim ligula, vel
-scelerisque mauris.
diff --git a/examples/simpleblog/posts/2009-11-10-another-post.markdown b/examples/simpleblog/posts/2009-11-10-another-post.markdown
deleted file mode 100644
index 69b64c9..0000000
--- a/examples/simpleblog/posts/2009-11-10-another-post.markdown
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Another post
-author: Marcus Tullius Cicero
-date: November 10, 2009
----
-Vestibulum in ultrices urna. Etiam tempor enim dui, nec malesuada elit. Donec
-tempor ligula et quam volutpat quis fermentum eros congue. Sed ut pulvinar sem.
-Sed aliquam ipsum id purus sollicitudin vulputate. Cras et mauris dui, vel
-hendrerit leo. Ut metus ipsum, fermentum ac malesuada id, tempus pharetra quam.
-Donec diam felis, consequat ac scelerisque cursus, gravida non lectus. Sed
-faucibus elit dapibus diam elementum id varius nisi tristique. Proin consequat
-faucibus neque in aliquam. Vestibulum ligula odio, pulvinar vel hendrerit
-vitae, egestas ut nibh. Praesent ut velit elit, in consequat dolor. Praesent
-sem enim, commodo in gravida sed, adipiscing vel eros. Lorem ipsum dolor sit
-amet, consectetur adipiscing elit. Proin non aliquam nunc.
diff --git a/examples/simpleblog/posts/2009-11-28-a-third-post.markdown b/examples/simpleblog/posts/2009-11-28-a-third-post.markdown
deleted file mode 100644
index 76b0606..0000000
--- a/examples/simpleblog/posts/2009-11-28-a-third-post.markdown
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: A third post
-author: Publius Ovidius Naso
-date: November 28, 2009
----
-Pellentesque tempor blandit elit, vel ultricies arcu congue egestas. Fusce
-vitae rutrum nisl. Fusce id mauris libero, a venenatis tellus. Fusce iaculis,
-lorem et ornare molestie, mauris risus mollis nisi, non fermentum lacus lacus
-sit amet ipsum. Praesent lobortis ullamcorper dolor, eget convallis ligula
-dignissim a. Suspendisse nulla nisi, congue et pharetra vel, convallis non
-libero. Ut a nulla ipsum. Phasellus cursus velit id neque viverra ut
-pellentesque justo posuere. Curabitur laoreet enim et velit tempor consectetur.
-Donec eu pretium urna. Suspendisse vitae nisi at metus vestibulum aliquam in
-sit amet nisl. Donec convallis lacinia odio, vestibulum molestie nunc feugiat
-a. Suspendisse vehicula, sapien id aliquet consectetur, sem sapien ullamcorper
-arcu, scelerisque porttitor elit ipsum posuere ligula. Nulla at velit eu metus
-tincidunt auctor ut sit amet enim. Donec placerat dapibus nisi id facilisis.
-Maecenas pellentesque pulvinar auctor. Curabitur gravida quam sit amet purus
-consectetur blandit.
diff --git a/examples/simpleblog/posts/2009-12-04-this-blog-aint-dead.markdown b/examples/simpleblog/posts/2009-12-04-this-blog-aint-dead.markdown
deleted file mode 100644
index 015ce8d..0000000
--- a/examples/simpleblog/posts/2009-12-04-this-blog-aint-dead.markdown
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: This blog ain't dead
-author: Marcus Antonius
-date: December 4, 2009
----
-Etiam non felis aliquet tellus dictum vestibulum. Aliquam accumsan mauris non
-lacus ultricies nec lacinia enim rhoncus. Curabitur vel tortor massa, elementum
-tincidunt elit. Maecenas venenatis luctus arcu ut ullamcorper. Donec interdum
-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.
diff --git a/examples/simpleblog/posts/2009-12-23-almost-christmas.markdown b/examples/simpleblog/posts/2009-12-23-almost-christmas.markdown
deleted file mode 100644
index cf24399..0000000
--- a/examples/simpleblog/posts/2009-12-23-almost-christmas.markdown
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: Almost Christmas!
-author: Publius Vergilius Maro
-date: December 23, 2009
----
-Morbi tincidunt eleifend ante, eu gravida ante rutrum vel. Nunc bibendum nulla
-tellus, eget egestas sapien. Nam rhoncus interdum libero, eget congue orci
-imperdiet eu. Quisque pellentesque fringilla urna, ac venenatis ante ultricies
-et. Pellentesque habitant morbi tristique senectus et netus et malesuada fames
-ac turpis egestas. Mauris eleifend sagittis ultrices. Quisque ultrices accumsan
-nisl, sed pellentesque metus porta vitae. Nulla facilisi. In et nibh tincidunt
-mi volutpat pellentesque vitae nec sapien. Integer massa ipsum, pellentesque in
-elementum at, cursus sit amet diam.
diff --git a/examples/simpleblog/templates/default.html b/examples/simpleblog/templates/default.html
deleted file mode 100644
index 01ed20e..0000000
--- a/examples/simpleblog/templates/default.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
- SimpleBlog - $title$
-
-
-
-
diff --git a/examples/tagblog/css/default.css b/examples/tagblog/css/default.css
deleted file mode 100644
index 9ed2b01..0000000
--- a/examples/tagblog/css/default.css
+++ /dev/null
@@ -1,17 +0,0 @@
-body {
- width: 600px;
- margin: 0px auto 0px auto;
-}
-
-div#navigation {
- text-align: center;
- border-bottom: 4px solid black;
-}
-
-div#navigation a {
- color: white;
- text-decoration: none;
- background-color: black;
- padding: 3px 10px 3px 10px;
- margin: 0px 10px 0px 10px;
-}
diff --git a/examples/tagblog/hakyll.hs b/examples/tagblog/hakyll.hs
deleted file mode 100644
index 0f1e7ab..0000000
--- a/examples/tagblog/hakyll.hs
+++ /dev/null
@@ -1,99 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-module Main where
-
-import Prelude hiding (id)
-import Control.Arrow ((>>>), (***), arr)
-import Control.Category (id)
-import Data.Monoid (mempty, mconcat)
-
-import Hakyll
-
-main :: IO ()
-main = hakyll $ do
- -- Compress CSS
- match "css/*" $ do
- route idRoute
- compile compressCssCompiler
-
- -- Render posts
- match "posts/*" $ do
- route $ setExtension ".html"
- compile $ pageCompiler
- >>> arr (renderDateField "date" "%B %e, %Y" "Date unknown")
- >>> renderTagsField "prettytags" (fromCapture "tags/*")
- >>> applyTemplateCompiler "templates/post.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Render posts list
- match "posts.html" $ route idRoute
- create "posts.html" $ constA mempty
- >>> arr (setField "title" "All posts")
- >>> requireAllA "posts/*" addPostList
- >>> applyTemplateCompiler "templates/posts.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Index
- match "index.html" $ route idRoute
- create "index.html" $ constA mempty
- >>> arr (setField "title" "Home")
- >>> requireA "tags" (setFieldA "tagcloud" (renderTagCloud'))
- >>> requireAllA "posts/*" (id *** arr (take 3 . reverse . sortByBaseName) >>> addPostList)
- >>> applyTemplateCompiler "templates/index.html"
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
- -- Tags
- create "tags" $
- requireAll "posts/*" (\_ ps -> readTags ps :: Tags String)
-
- -- Add a tag list compiler for every tag
- match "tags/*" $ route $ setExtension ".html"
- metaCompile $ require_ "tags"
- >>> arr tagsMap
- >>> arr (map (\(t, p) -> (tagIdentifier t, makeTagList t p)))
-
- -- Render RSS feed
- match "rss.xml" $ route idRoute
- create "rss.xml" $
- requireAll_ "posts/*"
- >>> mapCompiler (arr $ copyBodyToField "description")
- >>> renderRss feedConfiguration
-
- -- Read templates
- match "templates/*" $ compile templateCompiler
- where
- renderTagCloud' :: Compiler (Tags String) String
- renderTagCloud' = renderTagCloud tagIdentifier 100 120
-
- tagIdentifier :: String -> Identifier
- tagIdentifier = fromCapture "tags/*"
-
--- | Auxiliary compiler: generate a post list from a list of given posts, and
--- add it to the current page under @$posts@
---
-addPostList :: Compiler (Page String, [Page String]) (Page String)
-addPostList = setFieldA "posts" $
- arr (reverse . sortByBaseName)
- >>> require "templates/postitem.html" (\p t -> map (applyTemplate t) p)
- >>> arr mconcat
- >>> arr pageBody
-
-makeTagList :: String
- -> [Page String]
- -> Compiler () (Page String)
-makeTagList tag posts =
- constA (mempty, posts)
- >>> addPostList
- >>> arr (setField "title" ("Posts tagged ‘" ++ tag ++ "’"))
- >>> applyTemplateCompiler "templates/posts.html"
- >>> applyTemplateCompiler "templates/default.html"
-
-feedConfiguration :: FeedConfiguration
-feedConfiguration = FeedConfiguration
- { feedTitle = "SimpleBlog RSS feed."
- , feedDescription = "A simple demo of an RSS feed created with Hakyll."
- , feedAuthorName = "Jasper Van der Jeugt"
- , feedRoot = "http://example.com"
- }
diff --git a/examples/tagblog/posts/2009-11-05-a-first-post.markdown b/examples/tagblog/posts/2009-11-05-a-first-post.markdown
deleted file mode 100644
index 3c9d4ab..0000000
--- a/examples/tagblog/posts/2009-11-05-a-first-post.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: A first post
-author: Julius Caesar
-tags: caesar, random crap
----
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus pretium leo
-adipiscing lectus iaculis lobortis. Vivamus scelerisque velit dignissim metus
-gravida sit amet dapibus ligula tempor. Quisque sit amet viverra nunc.
-Suspendisse cursus elementum ante, ut venenatis nisi dictum eu. Nulla diam
-ligula, eleifend in varius quis, malesuada a nibh. Vivamus consequat
-pellentesque erat non blandit. Nunc sit amet eros vel massa semper ullamcorper
-quis iaculis magna. Vestibulum ullamcorper urna sit amet est elementum
-pulvinar. Vestibulum consequat lacus ac quam hendrerit tincidunt. Praesent
-bibendum vehicula diam, nec sagittis risus tempus a. Nulla quis odio sit amet
-odio vehicula cursus ut id odio. Curabitur semper magna euismod magna mollis
-venenatis. Nunc eget eleifend velit. Mauris sed posuere sem. Fusce id nunc
-nisi, a aliquam orci. Suspendisse laoreet justo non enim laoreet eget consequat
-velit porttitor. Aenean faucibus sodales metus at tincidunt. Donec vestibulum
-leo pulvinar erat auctor ac ultrices massa euismod. Phasellus blandit cursus
-magna, eget lacinia mi lobortis sed. Suspendisse ultricies enim ligula, vel
-scelerisque mauris.
diff --git a/examples/tagblog/posts/2009-11-10-another-post.markdown b/examples/tagblog/posts/2009-11-10-another-post.markdown
deleted file mode 100644
index 2fffc7c..0000000
--- a/examples/tagblog/posts/2009-11-10-another-post.markdown
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: Another post
-author: Marcus Tullius Cicero
-tags: cicero, random crap
----
-
-Vestibulum in ultrices urna. Etiam tempor enim dui, nec malesuada elit. Donec
-tempor ligula et quam volutpat quis fermentum eros congue. Sed ut pulvinar sem.
-Sed aliquam ipsum id purus sollicitudin vulputate. Cras et mauris dui, vel
-hendrerit leo. Ut metus ipsum, fermentum ac malesuada id, tempus pharetra quam.
-Donec diam felis, consequat ac scelerisque cursus, gravida non lectus. Sed
-faucibus elit dapibus diam elementum id varius nisi tristique. Proin consequat
-faucibus neque in aliquam. Vestibulum ligula odio, pulvinar vel hendrerit
-vitae, egestas ut nibh. Praesent ut velit elit, in consequat dolor. Praesent
-sem enim, commodo in gravida sed, adipiscing vel eros. Lorem ipsum dolor sit
-amet, consectetur adipiscing elit. Proin non aliquam nunc.
diff --git a/examples/tagblog/posts/2009-11-28-a-third-post.markdown b/examples/tagblog/posts/2009-11-28-a-third-post.markdown
deleted file mode 100644
index afabcc7..0000000
--- a/examples/tagblog/posts/2009-11-28-a-third-post.markdown
+++ /dev/null
@@ -1,20 +0,0 @@
----
-title: A third post
-author: Publius Ovidius Naso
-tags: epic fail, ovidius
----
-
-Pellentesque tempor blandit elit, vel ultricies arcu congue egestas. Fusce
-vitae rutrum nisl. Fusce id mauris libero, a venenatis tellus. Fusce iaculis,
-lorem et ornare molestie, mauris risus mollis nisi, non fermentum lacus lacus
-sit amet ipsum. Praesent lobortis ullamcorper dolor, eget convallis ligula
-dignissim a. Suspendisse nulla nisi, congue et pharetra vel, convallis non
-libero. Ut a nulla ipsum. Phasellus cursus velit id neque viverra ut
-pellentesque justo posuere. Curabitur laoreet enim et velit tempor consectetur.
-Donec eu pretium urna. Suspendisse vitae nisi at metus vestibulum aliquam in
-sit amet nisl. Donec convallis lacinia odio, vestibulum molestie nunc feugiat
-a. Suspendisse vehicula, sapien id aliquet consectetur, sem sapien ullamcorper
-arcu, scelerisque porttitor elit ipsum posuere ligula. Nulla at velit eu metus
-tincidunt auctor ut sit amet enim. Donec placerat dapibus nisi id facilisis.
-Maecenas pellentesque pulvinar auctor. Curabitur gravida quam sit amet purus
-consectetur blandit.
diff --git a/examples/tagblog/posts/2009-12-04-this-blog-aint-dead.markdown b/examples/tagblog/posts/2009-12-04-this-blog-aint-dead.markdown
deleted file mode 100644
index 0c56146..0000000
--- a/examples/tagblog/posts/2009-12-04-this-blog-aint-dead.markdown
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: This blog ain't dead
-author: Marcus Antonius
-tags: epic fail, antonius
----
-
-Etiam non felis aliquet tellus dictum vestibulum. Aliquam accumsan mauris non
-lacus ultricies nec lacinia enim rhoncus. Curabitur vel tortor massa, elementum
-tincidunt elit. Maecenas venenatis luctus arcu ut ullamcorper. Donec interdum
-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.
diff --git a/examples/tagblog/posts/2009-12-23-almost-christmas.markdown b/examples/tagblog/posts/2009-12-23-almost-christmas.markdown
deleted file mode 100644
index 78a1508..0000000
--- a/examples/tagblog/posts/2009-12-23-almost-christmas.markdown
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: Almost Christmas!
-author: Publius Vergilius Maro
-tags: christmas, random crap
----
-
-Morbi tincidunt eleifend ante, eu gravida ante rutrum vel. Nunc bibendum nulla
-tellus, eget egestas sapien. Nam rhoncus interdum libero, eget congue orci
-imperdiet eu. Quisque pellentesque fringilla urna, ac venenatis ante ultricies
-et. Pellentesque habitant morbi tristique senectus et netus et malesuada fames
-ac turpis egestas. Mauris eleifend sagittis ultrices. Quisque ultrices accumsan
-nisl, sed pellentesque metus porta vitae. Nulla facilisi. In et nibh tincidunt
-mi volutpat pellentesque vitae nec sapien. Integer massa ipsum, pellentesque in
-elementum at, cursus sit amet diam.
diff --git a/examples/tagblog/templates/default.html b/examples/tagblog/templates/default.html
deleted file mode 100644
index 0537065..0000000
--- a/examples/tagblog/templates/default.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
- SimpleBlog - $title$
-
-
-
-
-
diff --git a/examples/hakyll/about.markdown b/web/about.markdown
similarity index 100%
rename from examples/hakyll/about.markdown
rename to web/about.markdown
diff --git a/examples/hakyll/changelog.markdown b/web/changelog.markdown
similarity index 100%
rename from examples/hakyll/changelog.markdown
rename to web/changelog.markdown
diff --git a/examples/hakyll/css/default.css b/web/css/default.css
similarity index 100%
rename from examples/hakyll/css/default.css
rename to web/css/default.css
diff --git a/examples/brochure/css/syntax.css b/web/css/syntax.css
similarity index 100%
rename from examples/brochure/css/syntax.css
rename to web/css/syntax.css
diff --git a/examples/hakyll/examples.markdown b/web/examples.markdown
similarity index 100%
rename from examples/hakyll/examples.markdown
rename to web/examples.markdown
diff --git a/examples/hakyll/examples/brochure.zip b/web/examples/brochure.zip
similarity index 100%
rename from examples/hakyll/examples/brochure.zip
rename to web/examples/brochure.zip
diff --git a/examples/hakyll/examples/feedblog.zip b/web/examples/feedblog.zip
similarity index 100%
rename from examples/hakyll/examples/feedblog.zip
rename to web/examples/feedblog.zip
diff --git a/examples/hakyll/examples/morepages.zip b/web/examples/morepages.zip
similarity index 100%
rename from examples/hakyll/examples/morepages.zip
rename to web/examples/morepages.zip
diff --git a/examples/hakyll/examples/simpleblog.zip b/web/examples/simpleblog.zip
similarity index 100%
rename from examples/hakyll/examples/simpleblog.zip
rename to web/examples/simpleblog.zip
diff --git a/examples/hakyll/examples/tagblog.zip b/web/examples/tagblog.zip
similarity index 100%
rename from examples/hakyll/examples/tagblog.zip
rename to web/examples/tagblog.zip
diff --git a/examples/hakyll/hakyll.hs b/web/hakyll.hs
similarity index 100%
rename from examples/hakyll/hakyll.hs
rename to web/hakyll.hs
diff --git a/examples/hakyll/images/brochure-files.png b/web/images/brochure-files.png
similarity index 100%
rename from examples/hakyll/images/brochure-files.png
rename to web/images/brochure-files.png
diff --git a/examples/hakyll/images/hakyll-system-1.png b/web/images/hakyll-system-1.png
similarity index 100%
rename from examples/hakyll/images/hakyll-system-1.png
rename to web/images/hakyll-system-1.png
diff --git a/examples/hakyll/images/hakyll-system-2.png b/web/images/hakyll-system-2.png
similarity index 100%
rename from examples/hakyll/images/hakyll-system-2.png
rename to web/images/hakyll-system-2.png
diff --git a/examples/hakyll/images/hakyll-system-3.png b/web/images/hakyll-system-3.png
similarity index 100%
rename from examples/hakyll/images/hakyll-system-3.png
rename to web/images/hakyll-system-3.png
diff --git a/examples/hakyll/images/lambda.png b/web/images/lambda.png
similarity index 100%
rename from examples/hakyll/images/lambda.png
rename to web/images/lambda.png
diff --git a/examples/hakyll/index.markdown b/web/index.markdown
similarity index 100%
rename from examples/hakyll/index.markdown
rename to web/index.markdown
diff --git a/examples/hakyll/philosophy.markdown b/web/philosophy.markdown
similarity index 100%
rename from examples/hakyll/philosophy.markdown
rename to web/philosophy.markdown
diff --git a/examples/hakyll/reference.markdown b/web/reference.markdown
similarity index 100%
rename from examples/hakyll/reference.markdown
rename to web/reference.markdown
diff --git a/examples/hakyll/sidebar.markdown b/web/sidebar.markdown
similarity index 100%
rename from examples/hakyll/sidebar.markdown
rename to web/sidebar.markdown
diff --git a/examples/hakyll/templates/default.html b/web/templates/default.html
similarity index 100%
rename from examples/hakyll/templates/default.html
rename to web/templates/default.html
diff --git a/examples/hakyll/templates/tutorial.html b/web/templates/tutorial.html
similarity index 100%
rename from examples/hakyll/templates/tutorial.html
rename to web/templates/tutorial.html
diff --git a/examples/hakyll/templates/tutorialitem.html b/web/templates/tutorialitem.html
similarity index 100%
rename from examples/hakyll/templates/tutorialitem.html
rename to web/templates/tutorialitem.html
diff --git a/examples/hakyll/templates/tutorials.html b/web/templates/tutorials.html
similarity index 100%
rename from examples/hakyll/templates/tutorials.html
rename to web/templates/tutorials.html
diff --git a/examples/hakyll/tutorial.markdown b/web/tutorial.markdown
similarity index 100%
rename from examples/hakyll/tutorial.markdown
rename to web/tutorial.markdown