From 98888152eace72ede14bd26089d6fd02c1a32aa4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 2 Aug 2011 09:36:27 +0300
Subject: [PATCH] Scaffolding fixes

---
 yesod/scaffold/config/Settings.hs.cg      | 4 ++--
 yesod/scaffold/mini/Controller.hs.cg      | 2 +-
 yesod/scaffold/mini/config/Settings.hs.cg | 4 ++--
 yesod/scaffold/sitearg.hs.cg              | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/yesod/scaffold/config/Settings.hs.cg b/yesod/scaffold/config/Settings.hs.cg
index 956b0c5f..a55b065a 100644
--- a/yesod/scaffold/config/Settings.hs.cg
+++ b/yesod/scaffold/config/Settings.hs.cg
@@ -28,7 +28,7 @@ import qualified Text.Julius as H
 import qualified Text.Lucius as H
 import Language.Haskell.TH.Syntax
 ~importDB~
-import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLucius)
+import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLucius, whamletFile)
 import Data.Monoid (mempty, mappend)
 import System.Directory (doesFileExist)
 import Prelude hiding (concat)
@@ -193,7 +193,7 @@ juliusFile =
 
 widgetFile :: FilePath -> Q Exp
 widgetFile x = do
-    let h = unlessExists (globFile "hamlet")  hamletFile
+    let h = unlessExists (globFile "hamlet")  (whamletFile . globFile "hamlet")
     let c = unlessExists (globFile "cassius") cassiusFile
     let j = unlessExists (globFile "julius")  juliusFile
     let l = unlessExists (globFile "lucius")  luciusFile
diff --git a/yesod/scaffold/mini/Controller.hs.cg b/yesod/scaffold/mini/Controller.hs.cg
index 312e6a2b..c11477fa 100644
--- a/yesod/scaffold/mini/Controller.hs.cg
+++ b/yesod/scaffold/mini/Controller.hs.cg
@@ -44,7 +44,7 @@ with~sitearg~ conf f = do
 with~sitearg~LoadConfig :: Settings.AppEnvironment -> (Application -> IO a) -> IO a
 with~sitearg~LoadConfig env f = do
   conf <- Settings.loadConfig env
-  withFoobar conf f
+  with~sitearg~ conf f
 
 withDevelApp :: Dynamic
 withDevelApp = do
diff --git a/yesod/scaffold/mini/config/Settings.hs.cg b/yesod/scaffold/mini/config/Settings.hs.cg
index 10d4ef28..3ab13fcb 100644
--- a/yesod/scaffold/mini/config/Settings.hs.cg
+++ b/yesod/scaffold/mini/config/Settings.hs.cg
@@ -24,7 +24,7 @@ import qualified Text.Cassius as H
 import qualified Text.Julius as H
 import qualified Text.Lucius as H
 import Language.Haskell.TH.Syntax
-import Yesod.Widget (addWidget, addCassius, addJulius, addLucius)
+import Yesod.Widget (addWidget, addCassius, addJulius, addLucius, whamletFile)
 import Data.Monoid (mempty, mappend)
 import System.Directory (doesFileExist)
 import Data.Text (Text)
@@ -142,7 +142,7 @@ juliusFile = H.juliusFileDebug . toJuliusFile
 
 widgetFile :: FilePath -> Q Exp
 widgetFile x = do
-    let h = unlessExists toHamletFile hamletFile
+    let h = unlessExists toHamletFile $ whamletFile . toHamletFile
     let c = unlessExists toCassiusFile cassiusFile
     let j = unlessExists toJuliusFile juliusFile
     let l = unlessExists toLuciusFile luciusFile
diff --git a/yesod/scaffold/sitearg.hs.cg b/yesod/scaffold/sitearg.hs.cg
index fa63e018..5ed94bf5 100644
--- a/yesod/scaffold/sitearg.hs.cg
+++ b/yesod/scaffold/sitearg.hs.cg
@@ -36,7 +36,8 @@ import qualified Data.Text.Lazy.Encoding
 import Text.Jasmine (minifym)
 import qualified Data.Text as T
 import Web.ClientSession (getKey)
-import Text.Blaze.Renderer.String (renderHtml)
+import Text.Blaze.Renderer.Utf8 (renderHtml)
+import Text.Hamlet (html)
 
 -- | The site argument for your application. This can be a good place to
 -- keep settings and values requiring initialization before your application
@@ -177,7 +178,7 @@ instance YesodAuthEmail ~sitearg~ where
             { partType = "text/html; charset=utf-8"
             , partEncoding = None
             , partFilename = Nothing
-            , partContent = renderHtml [~qq~hamlet|
+            , partContent = renderHtml [~qq~html|
 <p>Please confirm your email address by clicking on the link below.
 <p>
     <a href=#{verurl}>#{verurl}