git.iko.soy/hakyll
on master help sign in
Updated simpleblog, rssblog and tagblog examples to trunk.
commit7128cc9b5f77eb40bfb0b04d74ddfe2e10a171fe authorJasper Van der Jeugt <jaspervdj@gmail.com> dateFri 29 Jan 2010, 12:19 (17 years ago) parentd205f96
8 files changed+29−40
compare with master
unifiedsplit
examples/rssblog/hakyll.hs+7−14 examples/rssblog/index.html+1−1 examples/rssblog/posts.html+1−1 examples/rssblog/templates/rss.xml+1−1 examples/simpleblog/hakyll.hs+4−4 examples/tagblog/hakyll.hs+13−17 examples/tagblog/index.html+1−1 examples/tagblog/posts.html+1−1
examples/rssblog/hakyll.hs+7−14
@@ -4,7 +4,7 @@ import Control.Monad.Reader (liftIO)
44import Text.Hakyll (hakyll)
55import Text.Hakyll.Render (renderAndConcat, renderChain, css)
66import Text.Hakyll.File (getRecursiveContents, directory)
7−import Text.Hakyll.Renderables (createPagePath, createCustomPage)
7+import Text.Hakyll.Renderables (createPagePath, createCustomPage, createListing)
88import Data.List (sort)
99import Control.Monad (mapM_, liftM)
1010import Data.Either (Either(..))
@@ -18,24 +18,17 @@ main = hakyll $ do
1818 let renderablePosts = map createPagePath postPaths
1919
2020 -- Render index, including recent posts.
21− let recentPosts = renderAndConcat ["templates/postitem.html"] $ take 3 renderablePosts
22− renderChain ["index.html", "templates/default.html"] $
23− createCustomPage "index.html" ("templates/postitem.html" : take 3 postPaths)
24− [("title", Left "Home"), ("posts", Right recentPosts)]
21+ let index = createListing "index.html" "templates/postitem.html" (take 3 renderablePosts) [("title", "Home")]
22+ renderChain ["index.html", "templates/default.html"] index
2523
2624 -- Render all posts list.
27− let postItems = renderAndConcat ["templates/postitem.html"] $ renderablePosts
28− renderChain ["posts.html", "templates/default.html"] $
29− createCustomPage "posts.html" ("templates/postitem.html" : postPaths)
30− [("title", Left "All posts"), ("posts", Right postItems)]
25+ let posts = createListing "posts.html" "templates/postitem.html" renderablePosts [("title", "All posts")]
26+ renderChain ["posts.html", "templates/default.html"] posts
3127
3228 -- Render all posts.
3329 liftIO $ putStrLn "Generating posts..."
3430 mapM_ (renderChain ["templates/post.html", "templates/default.html"]) renderablePosts
3531
3632 -- Render rss feed
37− let recentRSSItems = renderAndConcat ["templates/rssitem.xml"] $ take 3 renderablePosts
38− let rssPage = createCustomPage "rss.xml"
39− ("templates/postitem.html" : take 3 postPaths)
40− [("items", Right recentRSSItems)]
41− renderChain ["templates/rss.xml"] rssPage
33+ let rss = createListing "rss.xml" "templates/rssitem.xml" (take 3 renderablePosts) []
34+ renderChain ["templates/rss.xml"] rss
examples/rssblog/index.html+1−1
@@ -1,7 +1,7 @@
11<div id="posts">
22 <h1>Recent posts</h1>
33 <ul>
4− $posts
4+ $body
55 </ul>
66 <a href="$root/posts.html">All posts...</a>
77</div>
examples/rssblog/posts.html+1−1
@@ -1,4 +1,4 @@
11<h1>All posts</h1>
22<ul>
3− $posts
3+ $body
44</ul>
examples/rssblog/templates/rss.xml+1−1
@@ -4,6 +4,6 @@
44 <title>The SimpleBlog</title>
55 <link>http://example.com</link>
66 <description>Simple blog in hakyll</description>
7− $items
7+ $body
88 </channel>
99</rss>
examples/simpleblog/hakyll.hs+4−4
@@ -19,12 +19,12 @@ main = hakyll $ do
1919 let renderablePosts = map createPagePath postPaths
2020
2121 -- Render index, including recent posts.
22− renderChain ["index.html", "templates/default.html"] $
23− createListing "index.html" "templates/postitem.html" (take 3 renderablePosts) [("title", "Home")]
22+ let index = createListing "index.html" "templates/postitem.html" (take 3 renderablePosts) [("title", "Home")]
23+ renderChain ["index.html", "templates/default.html"] index
2424
2525 -- Render all posts list.
26− renderChain ["posts.html", "templates/default.html"] $
27− createListing "posts.html" "templates/postitem.html" renderablePosts [("title", "All posts")]
26+ let posts = createListing "posts.html" "templates/postitem.html" renderablePosts [("title", "All posts")]
27+ renderChain ["posts.html", "templates/default.html"] posts
2828
2929 -- Render all posts.
3030 liftIO $ putStrLn "Generating posts..."
examples/tagblog/hakyll.hs+13−17
@@ -4,7 +4,7 @@ import Text.Hakyll (hakyll)
44import Text.Hakyll.Render
55import Text.Hakyll.Tags (readTagMap, renderTagCloud, renderTagLinks)
66import Text.Hakyll.File (getRecursiveContents, directory, removeSpaces)
7−import Text.Hakyll.Renderables (createPagePath, createCustomPage)
7+import Text.Hakyll.Renderables (createPagePath, createCustomPage, createListingWith)
88import Text.Hakyll.Context (ContextManipulation, renderDate)
99import Data.List (sort)
1010import Data.Map (toList)
@@ -20,23 +20,24 @@ main = hakyll $ do
2020 let renderablePosts = map createPagePath postPaths
2121
2222 -- Read tag map.
23− tagMap <- readTagMap "postTags" postPaths
23+ tagMap <- readTagMap "postTags" renderablePosts
2424
2525 -- Render all posts list.
26− renderPostList "posts.html" "All posts" postPaths
26+ renderPostList "posts.html" "All posts" renderablePosts
2727
2828 -- Render post list per tag
2929 mapM_ (\(tag, posts) -> renderPostList (tagToURL tag) ("Posts tagged " ++ tag) posts)
3030 (toList tagMap)
3131
3232 -- Render index, including recent posts.
33− let recentPosts = renderAndConcatWith postManipulation
34− ["templates/postitem.html"]
35− (take 3 renderablePosts)
36− renderChain ["index.html", "templates/default.html"] $
37− createCustomPage "index.html" ("templates/postitem.html" : take 3 postPaths)
38− [("title", Left "Home"), ("posts", Right recentPosts),
39− ("tagcloud", Left $ renderTagCloud tagMap tagToURL 100 200)]
33+ let tagCloud = renderTagCloud tagMap tagToURL 100 200
34+ let index = createListingWith postManipulation "index.html"
35+ "templates/postitem.html"
36+ (take 3 renderablePosts)
37+ [ ("title", "Home")
38+ , ("tagcloud", tagCloud)
39+ ]
40+ renderChain ["index.html", "templates/default.html"] index
4041
4142 -- Render all posts.
4243 mapM_ (renderChainWith postManipulation
@@ -61,10 +62,5 @@ main = hakyll $ do
6162 tagToURL tag = "$root/tags/" ++ removeSpaces tag ++ ".html"
6263
6364 renderPostList url title posts = do
64− let postItems = renderAndConcatWith postManipulation
65− ["templates/postitem.html"]
66− (map createPagePath posts)
67− customPage = createCustomPage url
68− ("templates/postitem.html" : posts)
69− [("title", Left title), ("posts", Right postItems)]
70− renderChain ["posts.html", "templates/default.html"] customPage
65+ let list = createListingWith postManipulation url "templates/postitem.html" posts [("title", title)]
66+ renderChain ["posts.html", "templates/default.html"] list
examples/tagblog/index.html+1−1
@@ -1,7 +1,7 @@
11<div id="posts">
22 <h1>Recent posts</h1>
33 <ul>
4− $posts
4+ $body
55 </ul>
66 <a href="$root/posts.html">All posts...</a>
77 <div>
examples/tagblog/posts.html+1−1
@@ -1,4 +1,4 @@
11<h1>$title</h1>
22<ul>
3− $posts
3+ $body
44</ul>