diff options
| author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2011-02-10 12:29:40 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2011-02-10 12:29:40 +0100 |
| commit | f08b2222ca756e8311c70862c8c753da007b6917 (patch) | |
| tree | 07f8f3856f6fd948cbcc4536940db1885b4eee35 | |
| parent | 8cec091e04e9bf1fa8cad01056d1c9cbed4fa44f (diff) | |
| download | hakyll-f08b2222ca756e8311c70862c8c753da007b6917.tar.gz | |
Update brochure example to hakyll3
| -rw-r--r-- | examples/brochure/hakyll.hs | 31 | ||||
| -rw-r--r-- | examples/brochure/templates/default.html | 16 |
2 files changed, 26 insertions, 21 deletions
diff --git a/examples/brochure/hakyll.hs b/examples/brochure/hakyll.hs index a74bee1..e84f14c 100644 --- a/examples/brochure/hakyll.hs +++ b/examples/brochure/hakyll.hs @@ -1,13 +1,18 @@ -import Text.Hakyll (hakyll) -import Text.Hakyll.File (directory) -import Text.Hakyll.Render (css, static, renderChain) -import Text.Hakyll.CreateContext (createPage) - -main = hakyll "http://example.com" $ do - directory css "css" - render "about.rst" - render "index.markdown" - render "code.lhs" - where - render = renderChain ["templates/default.html"] - . createPage +{-# LANGUAGE OverloadedStrings #-} +import Control.Arrow ((>>>)) +import Control.Monad (forM_) + +import Hakyll + +main :: IO () +main = hakyll $ do + route "css/*" idRoute + compile "css/*" defaultCompressCss + + compile "templates/*" defaultTemplateRead + + forM_ ["about.rst", "index.markdown", "code.lhs"] $ \page -> do + route page $ setExtension "html" + compile page $ defaultPageRead + >>> require "templates/default.html" (flip applyTemplate) + >>> defaultRelativizeUrls diff --git a/examples/brochure/templates/default.html b/examples/brochure/templates/default.html index 794d449..8fb75cb 100644 --- a/examples/brochure/templates/default.html +++ b/examples/brochure/templates/default.html @@ -4,18 +4,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>MyAweSomeCompany - $title</title> - <link rel="stylesheet" type="text/css" href="$root/css/default.css" /> - <link rel="stylesheet" type="text/css" href="$root/css/syntax.css" /> + <title>MyAweSomeCompany - $title$</title> + <link rel="stylesheet" type="text/css" href="/css/default.css" /> + <link rel="stylesheet" type="text/css" href="/css/syntax.css" /> </head> <body> - <h1>MyAweSomeCompany - $title</h1> + <h1>MyAweSomeCompany - $title$</h1> <div id="navigation"> - <a href="$root/index.html">Home</a> - <a href="$root/about.html">About</a> - <a href="$root/code.html">Code</a> + <a href="/index.html">Home</a> + <a href="/about.html">About</a> + <a href="/code.html">Code</a> </div> - $body + $body$ </body> </html> |