From 82a725bd8f59453cacf3ff5e45b3a7d2903dbb2f Mon Sep 17 00:00:00 2001
From: Jasper Van der Jeugt <m@jaspervdj.be>
Date: Sun, 13 Jan 2013 21:46:25 +0100
Subject: Site updates

---
 web/changelog.markdown     | 150 ---------------------------------------------
 web/css/default.css        |  20 +++---
 web/examples.markdown      |   9 ---
 web/templates/default.html |   9 ++-
 web/tutorials/faq.markdown |  42 +++----------
 5 files changed, 29 insertions(+), 201 deletions(-)
 delete mode 100644 web/changelog.markdown

diff --git a/web/changelog.markdown b/web/changelog.markdown
deleted file mode 100644
index ace64f4..0000000
--- a/web/changelog.markdown
+++ /dev/null
@@ -1,150 +0,0 @@
----
-title: Changelog
----
-
-## Hakyll 3.2.2
-
-- Add `applyTemplateWith`, `applyTemplateCompilerWith` to allows missing keys
-
-## Hakyll 3.2.1
-
-- Add `Pandoc.Biblio` module for reference handling
-
-## Hakyll 3.2
-
-- Switch to type-safe identifiers: e.g. `Identifier` becomes
-  `Identifier (Page String)`
-
-## Hakyll 3.1.1
-
-- Allow `group` in rules DSL
-
-## Hakyll 3.1
-
-- New `match` function in rules DSL
-- More expressive `Pattern`s
-
-## Hakyll 3
-
-- Complete rewrite
-
-## Hakyll 2.4.1
-
-- Add a number of utility functions
-- Fix bug in `enableIndexUrl` mode
-
-## Hakyll 2.4
-
-- Arrow based interface to pandoc
-- Easier custom fields
-
-## Hakyll 2.3
-
-- Ability to choose between preview modes.
-- Simple static configuration available.
-- Support hamlet templates.
-
-## Hakyll 2.2.2
-
-- Cabal dependency fixes.
-
-## Hakyll 2.2.1
-
-- Allow custom time locale for `renderDate`.
-- Render RSS feeds with `CDATA` sections.
-
-## Hakyll 2.2
-
-- Allow markup languages in templates.
-
-## Hakyll 2.1.1
-
-- Fix issues in autocompilation/preview mode.
-
-## Hakyll 2.1
-
-May 21, 2010
-
-- Expose pandoc options to HakyllConfiguration.
-- Allow dashes in pages.
-- Some typo's and bugs fixed.
-
-## Hakyll 2.0
-
-March 31, 2010
-
-- Rewrite of the API to a clean, Arrow based API.
-- Added built-in support for RSS and Atom.
-- Added more documentation.
-- Added pagination.
-- Many bugfixes.
-
-## Hakyll 1.4
-
-February 17, 2010
-
-- Added an autocompilation feature.
-- Support for index URL's (`enableIndexUrl`).
-
-## Hakyll 1.3
-
-January 30, 2010
-
-- Added categories in addition to tags.
-- Added `createListing` and `createListingWith` function for a more high-level
-  way to create listings.
-
-## Hakyll 1.2
-
-January 27, 2010
-
-- `Data.Binary` is now used for serialization.
-- Rewrite of the caching system.
-- Specialized data structure for templates.
-- Caching of pages and templates.
-
-## Hakyll 1.1
-
-January 19, 2010
-
-- Switched to a custom `Hakyll` monad stack instead of the `IO` monad.
-- Page sections.
-- Combining renderables.
-- `renderAndConcat` can now use multiple templates.
-
-## Hakyll 1.0
-
-January 14, 2009
-
-- First stable release.
-- Custom templating system.
-- Added `$root` key for relative URL's.
-
-## Hakyll 0.4
-
-January 8, 2010
-
-- Added examples.
-- Added `ContextManipulation` type.
-
-## Hakyll 0.3
-
-December 28, 2009
-
-- Added a general `directory` function.
-- Added CSS compression.
-- Added tag support.
-- Added a simple HTTP server for testing purposes.
-
-## Hakyll 0.2
-
-December 16, 2010
-
-- Abstracted `Renderable` type.
-- Added simple caching and dependency checking.
-
-## Hakyll 0.1
-
-December 5, 2009
-
-- Initial release.
diff --git a/web/css/default.css b/web/css/default.css
index e1336e4..368eb23 100644
--- a/web/css/default.css
+++ b/web/css/default.css
@@ -13,16 +13,21 @@ body {
 }
 
 div#header {
+    font-size: 28px;
+    font-weight: bold;
     height: 32px;
-    margin: 20px 0px 20px 60px;
+    line-height: 32px;
+    margin: 24px 0px 12px 128px;
     text-transform: uppercase;
-    font-weight: bold;
-    font-size: 28px;
 }
 
 div#header img {
-    display: inline;
-    margin: 0px 0px 0px 0px;
+    float: left;
+    margin: 0px 30px 0px 0px;
+}
+
+div#header a {
+    text-decoration: none;
 }
 
 div#main {
@@ -77,12 +82,12 @@ a {
 
 h1 {
     font-size: 20px;
-    margin: 24px 0px 16px 0px;
+    margin: 12px 0px 12px 0px;
 }
 
 h2 {
     font-size: 18px;
-    margin: 24px 0px 16px 0px;
+    margin: 12px 0px 12px 0px;
 }
 
 h3 {
@@ -91,6 +96,7 @@ h3 {
 
 h1, h2, h3 {
     text-transform: uppercase;
+    font-weight: bold;
 }
 
 h1 a, h2 a, h3 a {
diff --git a/web/examples.markdown b/web/examples.markdown
index d62eb48..c43cd55 100644
--- a/web/examples.markdown
+++ b/web/examples.markdown
@@ -2,15 +2,6 @@
 title: Examples
 ---
 
-# Simple examples
-
-A number of simple examples are available in the GitHub repository. They can be
-found [here](https://github.com/jaspervdj/hakyll-examples). The README located
-in that directory explains which example does what. You can fetch the entire
-directory using
-
-    git clone git://github.com/jaspervdj/hakyll-examples.git
-
 # People using Hakyll
 
 A lot of sites running Hakyll also publish the source code. This is a very
diff --git a/web/templates/default.html b/web/templates/default.html
index 8a5059d..b045ce6 100644
--- a/web/templates/default.html
+++ b/web/templates/default.html
@@ -15,10 +15,14 @@
         <meta name="description" content="Hakyll - A Static Site Generator in Haskell."/>
     </head>
     <body>
+        <!-- Fork me on Github -->
+        <a href="https://github.com/jaspervdj/hakyll"><img style="position: absolute; top: 0; right: 0; border: 0; margin: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
         <div id="main">
             <div id="header">
-                <img src="/images/lambda.png" alt="lambda" />
-                Hakyll - $title$
+                <a href="/">
+                    <img src="/images/lambda.png" alt="lambda" />
+                    Hakyll
+                </a>
             </div>
             <!-- Sidebar. -->
             <div id="sidebar">
@@ -29,7 +33,6 @@
                 <a href="/about.html">about</a>
                 <a href="/tutorials/faq.html">faq</a>
                 <a href="/examples.html">examples</a>
-                <a href="/changelog.html">changelog</a></p>
 
                 <!-- Flattr button -->
                 <h1>Donate</h1>
diff --git a/web/tutorials/faq.markdown b/web/tutorials/faq.markdown
index 41d6848..c0bbd3f 100644
--- a/web/tutorials/faq.markdown
+++ b/web/tutorials/faq.markdown
@@ -10,38 +10,19 @@ author: Jasper Van der Jeugt
         Saw: `Main'
         Expected: `Hakyll'
 
-Is an error encountered on Mac OS when `hakyll.hs` is located on a
-case-insensitive filesystem. A workaround is to rename it to something that
-isn't the name of the module, for example, `site.hs`.
+Is an error encountered on Mac OS when your configuration is named `hakyll.hs`
+and located on a case-insensitive filesystem. A workaround is to rename it to
+something that isn't the name of the module, for example, `site.hs`.
 
-## `pageCompiler`/Hakyll/Pandoc eats my HTML!
+## pandocCompiler/Hakyll/Pandoc eats my HTML!
 
 Sometimes, it can seem that HTML pages are stripped of some arbitrary tags, e.g.
-`<div>`'s. The issue here is that, when using the default `pageCompiler`, your
+`<div>`'s. The issue here is that, when using the default `pandocCompiler`, your
 page passes through Pandoc. Pandoc unfortunately strips away this information,
 giving you the "wrong" HTML.
 
-The solution is not to use `pageCompiler` -- it is very common to write custom
-page processing compiler. The definition of `pageCompiler` is, put simply:
-
-~~~~~{.haskell}
-pageCompiler =
-   readPageCompiler >>>
-   addDefaultFields >>>  -- Sets some things like $path$
-   arr applySelf    >>>  -- Used to fill in $var$s in the page
-   pageRenderPandoc      -- Pass through pandoc
-~~~~~
-
-You can add your own version in your `hakyll.hs` file:
-
-~~~~~{.haskell}
-myPageCompiler =
-   readPageCompiler >>>
-   addDefaultFields >>>  -- Sets some things like $path$
-   arr applySelf          -- Used to fill in $var$s in the page
-~~~~~
-
-And using this instead of `pageCompiler` should solve the issue.
+The solution is not to use `pandocCompiler`, but something simpler like
+`getResourceBody`. This way, your HTML is not touched.
 
 ## Does Hakyll support syntax highlighting?
 
@@ -54,12 +35,9 @@ Pandoc syntax CSS file][syntax-css].
 
 ## When should I rebuild and when should I build?
 
-If you execute a `./hakyll build`, Hakyll will build your site incrementally.
-This means it will be very fast, but it will not pick up _all_ changes.
-
-- In case you edited `hakyll.hs`, you first want to compile it again.
-- It is generally recommended to do a `./hakyll rebuild` before you deploy your
-  site.
+If you execute a `./site build`, Hakyll will build your site incrementally.
+However, we can not detect if you edited `site.hs`. In this case, you first want
+to compile it again `site.hs` again, and then do a `./site rebuild`.
 
 After rebuilding your site, all files will look as "modified" to the filesystem.
 This means that when you upload your site, it will usually transfer all files --
-- 
cgit v1.2.3