haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scaffolding fixes

Browse Source
This commit is contained in:
Michael Snoyman 2011-08-02 09:36:27 +03:00
parent 15142f344f
commit 98888152ea
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod/scaffold/config/Settings.hs.cg
View File

@ -28,7 +28,7 @@ import qualified Text.Julius as H
import qualified Text.Lucius as H import qualified Text.Lucius as H
import Language.Haskell.TH.Syntax import Language.Haskell.TH.Syntax
~importDB~ ~importDB~
import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLucius) import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLucius, whamletFile)
import Data.Monoid (mempty, mappend) import Data.Monoid (mempty, mappend)
import System.Directory (doesFileExist) import System.Directory (doesFileExist)
import Prelude hiding (concat) import Prelude hiding (concat)
@ -193,7 +193,7 @@ juliusFile =
widgetFile :: FilePath -> Q Exp widgetFile :: FilePath -> Q Exp
widgetFile x = do widgetFile x = do
let h = unlessExists (globFile "hamlet") hamletFile let h = unlessExists (globFile "hamlet") (whamletFile . globFile "hamlet")
let c = unlessExists (globFile "cassius") cassiusFile let c = unlessExists (globFile "cassius") cassiusFile
let j = unlessExists (globFile "julius") juliusFile let j = unlessExists (globFile "julius") juliusFile
let l = unlessExists (globFile "lucius") luciusFile let l = unlessExists (globFile "lucius") luciusFile

2
yesod/scaffold/mini/Controller.hs.cg
View File

@ -44,7 +44,7 @@ with~sitearg~ conf f = do
with~sitearg~LoadConfig :: Settings.AppEnvironment -> (Application -> IO a) -> IO a with~sitearg~LoadConfig :: Settings.AppEnvironment -> (Application -> IO a) -> IO a
with~sitearg~LoadConfig env f = do with~sitearg~LoadConfig env f = do
conf <- Settings.loadConfig env conf <- Settings.loadConfig env
withFoobar conf f with~sitearg~ conf f
withDevelApp :: Dynamic withDevelApp :: Dynamic
withDevelApp = do withDevelApp = do

4
yesod/scaffold/mini/config/Settings.hs.cg
View File

@ -24,7 +24,7 @@ import qualified Text.Cassius as H
import qualified Text.Julius as H import qualified Text.Julius as H
import qualified Text.Lucius as H import qualified Text.Lucius as H
import Language.Haskell.TH.Syntax 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 Data.Monoid (mempty, mappend)
import System.Directory (doesFileExist) import System.Directory (doesFileExist)
import Data.Text (Text) import Data.Text (Text)
@ -142,7 +142,7 @@ juliusFile = H.juliusFileDebug . toJuliusFile
widgetFile :: FilePath -> Q Exp widgetFile :: FilePath -> Q Exp
widgetFile x = do widgetFile x = do
let h = unlessExists toHamletFile hamletFile let h = unlessExists toHamletFile $ whamletFile . toHamletFile
let c = unlessExists toCassiusFile cassiusFile let c = unlessExists toCassiusFile cassiusFile
let j = unlessExists toJuliusFile juliusFile let j = unlessExists toJuliusFile juliusFile
let l = unlessExists toLuciusFile luciusFile let l = unlessExists toLuciusFile luciusFile

5
yesod/scaffold/sitearg.hs.cg
View File

@ -36,7 +36,8 @@ import qualified Data.Text.Lazy.Encoding
import Text.Jasmine (minifym) import Text.Jasmine (minifym)
import qualified Data.Text as T import qualified Data.Text as T
import Web.ClientSession (getKey) 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 -- | The site argument for your application. This can be a good place to
-- keep settings and values requiring initialization before your application -- keep settings and values requiring initialization before your application
@ -177,7 +178,7 @@ instance YesodAuthEmail ~sitearg~ where
{ partType = "text/html; charset=utf-8" { partType = "text/html; charset=utf-8"
, partEncoding = None , partEncoding = None
, partFilename = Nothing , partFilename = Nothing
, partContent = renderHtml [~qq~hamlet| , partContent = renderHtml [~qq~html|
<p>Please confirm your email address by clicking on the link below. <p>Please confirm your email address by clicking on the link below.
<p> <p>
<a href=#{verurl}>#{verurl} <a href=#{verurl}>#{verurl}