From 3ecbf43f5d2c2a94ac9b51d50acef608f96a4384 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 1 Jul 2012 20:59:37 +0300 Subject: [PATCH] $newline --- yesod-auth/Yesod/Auth.hs | 6 +++- yesod-auth/Yesod/Auth/BrowserId.hs | 1 + yesod-auth/Yesod/Auth/Dummy.hs | 1 + yesod-auth/Yesod/Auth/Email.hs | 13 ++++++-- yesod-auth/Yesod/Auth/GoogleEmail.hs | 5 ++- yesod-auth/Yesod/Auth/HashDB.hs | 7 ++-- yesod-auth/Yesod/Auth/OpenId.hs | 1 + yesod-auth/Yesod/Auth/Rpxnow.hs | 1 + yesod-auth/yesod-auth.cabal | 2 +- yesod-core/Yesod/Handler.hs | 1 + yesod-core/Yesod/Internal.hs | 9 +++-- yesod-core/Yesod/Internal/Core.hs | 10 ++++++ yesod-core/test/YesodCoreTest/Links.hs | 2 +- yesod-core/test/YesodCoreTest/Widget.hs | 9 +++-- yesod-core/yesod-core.cabal | 4 +-- yesod-form/Yesod/Form/Fields.hs | 44 ++++++++++++++++++++++--- yesod-form/Yesod/Form/Functions.hs | 13 ++++++-- yesod-form/Yesod/Form/Jquery.hs | 2 ++ yesod-form/Yesod/Form/MassInput.hs | 8 ++++- yesod-form/Yesod/Form/Nic.hs | 1 + yesod-form/yesod-form.cabal | 2 +- yesod-newsfeed/Yesod/AtomFeed.hs | 1 + yesod-newsfeed/Yesod/RssFeed.hs | 1 + yesod-newsfeed/yesod-newsfeed.cabal | 4 +-- yesod-sitemap/yesod-sitemap.cabal | 2 +- yesod-test/yesod-test.cabal | 2 +- yesod/yesod.cabal | 2 +- 27 files changed, 122 insertions(+), 32 deletions(-) diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs index 6b284e7c..3e8d7106 100644 --- a/yesod-auth/Yesod/Auth.hs +++ b/yesod-auth/Yesod/Auth.hs @@ -149,7 +149,10 @@ setCreds doRedirects creds = do Nothing -> when doRedirects $ do case authRoute y of - Nothing -> do rh <- defaultLayout $ toWidget [shamlet|

Invalid login |] + Nothing -> do rh <- defaultLayout $ toWidget [shamlet| +$newline never +

Invalid login +|] sendResponse rh Just ar -> do setMessageI Msg.InvalidLogin redirect ar @@ -168,6 +171,7 @@ getCheckR = do where html' creds = [shamlet| +$newline never

Authentication Status $maybe _ <- creds

Logged in. diff --git a/yesod-auth/Yesod/Auth/BrowserId.hs b/yesod-auth/Yesod/Auth/BrowserId.hs index 4b3f7c88..be847acf 100644 --- a/yesod-auth/Yesod/Auth/BrowserId.hs +++ b/yesod-auth/Yesod/Auth/BrowserId.hs @@ -62,6 +62,7 @@ helper maudience = AuthPlugin , apLogin = \toMaster -> do addScriptRemote browserIdJs toWidget [hamlet| +$newline never

diff --git a/yesod-auth/Yesod/Auth/Dummy.hs b/yesod-auth/Yesod/Auth/Dummy.hs index e9ba805c..7ba931e5 100644 --- a/yesod-auth/Yesod/Auth/Dummy.hs +++ b/yesod-auth/Yesod/Auth/Dummy.hs @@ -24,6 +24,7 @@ authDummy = url = PluginR "dummy" [] login authToMaster = toWidget [hamlet| +$newline never

Your new identifier is: # diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs index 4e35f09a..5101ff0e 100644 --- a/yesod-auth/Yesod/Auth/Email.hs +++ b/yesod-auth/Yesod/Auth/Email.hs @@ -79,6 +79,7 @@ authEmail :: YesodAuthEmail m => AuthPlugin m authEmail = AuthPlugin "email" dispatch $ \tm -> [whamlet| +$newline never @@ -112,6 +113,7 @@ getRegisterR = do defaultLayout $ do setTitleI Msg.RegisterLong [whamlet| +$newline never

_{Msg.EnterEmail}

_{Msg.ConfirmationEmailSent email} |] + [whamlet| +$newline never +

_{Msg.ConfirmationEmailSent email} +|] getVerifyR :: YesodAuthEmail m => AuthEmailId m -> Text -> GHandler Auth m RepHtml @@ -161,7 +166,10 @@ getVerifyR lid key = do _ -> return () defaultLayout $ do setTitleI Msg.InvalidKey - [whamlet|

_{Msg.InvalidKey} |] + [whamlet| +$newline never +

_{Msg.InvalidKey} +|] postLoginR :: YesodAuthEmail master => GHandler Auth master () postLoginR = do @@ -200,6 +208,7 @@ getPasswordR = do defaultLayout $ do setTitleI Msg.SetPassTitle [whamlet| +$newline never

_{Msg.SetPass}

diff --git a/yesod-auth/Yesod/Auth/GoogleEmail.hs b/yesod-auth/Yesod/Auth/GoogleEmail.hs index 6bc1578e..8f06abe3 100644 --- a/yesod-auth/Yesod/Auth/GoogleEmail.hs +++ b/yesod-auth/Yesod/Auth/GoogleEmail.hs @@ -46,7 +46,10 @@ authGoogleEmail = where complete = PluginR pid ["complete"] login tm = - [whamlet|_{Msg.LoginGoogle}|] + [whamlet| +$newline never +_{Msg.LoginGoogle} +|] dispatch "GET" ["forward"] = do render <- getUrlRender toMaster <- getRouteToMaster diff --git a/yesod-auth/Yesod/Auth/HashDB.hs b/yesod-auth/Yesod/Auth/HashDB.hs index cbce0785..1e400aeb 100644 --- a/yesod-auth/Yesod/Auth/HashDB.hs +++ b/yesod-auth/Yesod/Auth/HashDB.hs @@ -76,7 +76,7 @@ import Yesod.Handler import Yesod.Form import Yesod.Auth import Yesod.Widget (toWidget) -import Text.Hamlet (hamlet, shamlet) +import Text.Hamlet (hamlet) import Control.Applicative ((<$>), (<*>)) import Control.Monad (replicateM,liftM) @@ -176,7 +176,7 @@ postLoginR uniq = do (validateUser <$> (uniq =<< mu) <*> mp) if isValid then setCreds True $ Creds "hashdb" (fromMaybe "" mu) [] - else do setMessage [shamlet| Invalid username/password |] + else do setMessage "Invalid username/password" toMaster <- getRouteToMaster redirect $ toMaster LoginR @@ -207,7 +207,7 @@ getAuthIdHashDB authR uniq creds = do -- user exists Just (Entity uid _) -> return $ Just uid Nothing -> do - setMessage [shamlet| User not found |] + setMessage "User not found" redirect $ authR LoginR -- | Prompt for username and password, validate that against a database @@ -221,6 +221,7 @@ authHashDB :: ( YesodAuth m, YesodPersist m , PersistUnique b (GHandler Auth m)) => (Text -> Maybe (Unique user b)) -> AuthPlugin m authHashDB uniq = AuthPlugin "hashdb" dispatch $ \tm -> toWidget [hamlet| +$newline never