diff --git a/TODO.org b/TODO.org
index e4b09e1..3a8be2b 100644
--- a/TODO.org
+++ b/TODO.org
@@ -23,7 +23,7 @@
In order to implement this, a reasonable size refactor needs to take place. Below is a list
of things to be completed in order to successfully achieve the aforementioned goals.
-*** TODO [1/3] Fix issue with tag and pagination page generation <>
+*** TODO [2/3] Fix issue with tag and pagination page generation <>
Currently URLs to paginated pages (which includes the blog and tag pages) are broken. They
generate "/tags/*.html" instead of "/tags/*1.html".
@@ -33,7 +33,8 @@
artifact of pagination. It contains all blog posts (contained in "/blog1.html" through
"/blogN.html").
-**** TODO Blog pagination
+**** DONE Blog pagination
+ CLOSED: [2015-08-15 Sat 05:21]
**** DONE Tag pages pagination
CLOSED: [2015-08-13 Thu 22:26]
**** TODO Tag cloud and tagField are broken
diff --git a/src/site.hs b/src/site.hs
index c347707..b2a3123 100644
--- a/src/site.hs
+++ b/src/site.hs
@@ -187,11 +187,14 @@ main = do
-- Generate tag pages
paginateTagsRules "tags" tags
- let navgenRoute = gsubRoute "pages/" (const "") `composeRoutes`
- setExtension "html"
+ let pageRoute = gsubRoute "pages/" (const "") `composeRoutes` setExtension "html"
- match "pages/*" $ version "nav-gen" $ do
- route navgenRoute
+ match ("pages/*" .&&. complement "pages/blog.markdown") $ version "nav-gen" $ do
+ route $ pageRoute
+ compile $ pandocCompiler
+
+ match "pages/blog.markdown" $ version "nav-gen" $ do
+ route $ constRoute "blog1.html"
compile $ pandocCompiler
paginateRules paginatedPosts $ \pageNum pattern -> do
@@ -209,8 +212,8 @@ main = do
>>= loadAndApplyTemplate "templates/pages/blog.html" ctx
>>= loadAndApplyTemplate "templates/default.html" indexCtx
- match "pages/*" $ do
- route navgenRoute
+ match ("pages/*" .&&. complement "pages/blog.markdown") $ do
+ route $ pageRoute
compile $ do
posts <- recentFirst =<< loadAllSnapshots "posts/**" "content"