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

#ifGHC7 [hamlet| -> [HAMLET|

Browse Source
This commit is contained in:
Greg Weber 2011-08-20 06:42:33 -07:00
parent 59c455d602
commit 659e120024
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
yesod-core/Yesod/Internal/Core.hs
View File

@ -424,31 +424,19 @@ defaultErrorHandler NotFound = do
r <- waiRequest r <- waiRequest
let path' = TE.decodeUtf8With TEE.lenientDecode $ W.rawPathInfo r let path' = TE.decodeUtf8With TEE.lenientDecode $ W.rawPathInfo r
applyLayout' "Not Found" applyLayout' "Not Found"
#if GHC7 [HAMLET|
[hamlet|
#else
[$hamlet|
#endif
<h1>Not Found <h1>Not Found
<p>#{path'} <p>#{path'}
|] |]
defaultErrorHandler (PermissionDenied msg) = defaultErrorHandler (PermissionDenied msg) =
applyLayout' "Permission Denied" applyLayout' "Permission Denied"
#if GHC7 [HAMLET|
[hamlet|
#else
[$hamlet|
#endif
<h1>Permission denied <h1>Permission denied
<p>#{msg} <p>#{msg}
|] |]
defaultErrorHandler (InvalidArgs ia) = defaultErrorHandler (InvalidArgs ia) =
applyLayout' "Invalid Arguments" applyLayout' "Invalid Arguments"
#if GHC7 [HAMLET|
[hamlet|
#else
[$hamlet|
#endif
<h1>Invalid Arguments <h1>Invalid Arguments
<ul> <ul>
$forall msg <- ia $forall msg <- ia
@ -456,21 +444,13 @@ defaultErrorHandler (InvalidArgs ia) =
|] |]
defaultErrorHandler (InternalError e) = defaultErrorHandler (InternalError e) =
applyLayout' "Internal Server Error" applyLayout' "Internal Server Error"
#if GHC7 [HAMLET|
[hamlet|
#else
[$hamlet|
#endif
<h1>Internal Server Error <h1>Internal Server Error
<p>#{e} <p>#{e}
|] |]
defaultErrorHandler (BadMethod m) = defaultErrorHandler (BadMethod m) =
applyLayout' "Bad Method" applyLayout' "Bad Method"
#if GHC7 [HAMLET|
[hamlet|
#else
[$hamlet|
#endif
<h1>Method Not Supported <h1>Method Not Supported
<p>Method "#{S8.unpack m}" not supported <p>Method "#{S8.unpack m}" not supported
|] |]
@ -537,12 +517,7 @@ widgetToPageContent (GWidget w) = do
left _ = Nothing left _ = Nothing
right (Right x) = Just x right (Right x) = Just x
right _ = Nothing right _ = Nothing
let head'' = let head'' = [HAMLET|
#if GHC7
[hamlet|
#else
[$hamlet|
#endif
$forall s <- stylesheets $forall s <- stylesheets
^{mkLinkTag s} ^{mkLinkTag s}
$forall s <- css $forall s <- css