diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs index 16718694..7a09d8c6 100644 --- a/yesod-auth/Yesod/Auth/Email.hs +++ b/yesod-auth/Yesod/Auth/Email.hs @@ -485,13 +485,13 @@ defaultEmailLoginHandler toParent = do let userRes = UserLoginForm Control.Applicative.<$> emailRes Control.Applicative.<*> passwordRes let widget = do - [whamlet| - #{extra} -
- ^{fvInput emailView} -
- ^{fvInput passwordView} - |] + [whamlet| + #{extra} +
+ ^{fvInput emailView} +
+ ^{fvInput passwordView} + |] return (userRes, widget) emailSettings emailMsg = do @@ -545,11 +545,11 @@ defaultRegisterHandler = do let userRes = UserForm <$> emailRes let widget = do - [whamlet| - #{extra} - ^{fvLabel emailView} - ^{fvInput emailView} - |] + [whamlet| + #{extra} + ^{fvLabel emailView} + ^{fvInput emailView} + |] return (userRes, widget) @@ -659,11 +659,11 @@ defaultForgotPasswordHandler = do let forgotPasswordRes = ForgotPasswordForm <$> emailRes let widget = do - [whamlet| - #{extra} - ^{fvLabel emailView} - ^{fvInput emailView} - |] + [whamlet| + #{extra} + ^{fvLabel emailView} + ^{fvInput emailView} + |] return (forgotPasswordRes, widget) emailSettings = @@ -808,29 +808,29 @@ defaultSetPasswordHandler needOld = do let passwordFormRes = PasswordForm <$> currentPasswordRes <*> newPasswordRes <*> confirmPasswordRes let widget = do - [whamlet| - #{extra} - - $if needOld - - - - -
- ^{fvLabel currentPasswordView} - - ^{fvInput currentPasswordView} -
- ^{fvLabel newPasswordView} - - ^{fvInput newPasswordView} -
- ^{fvLabel confirmPasswordView} - - ^{fvInput confirmPasswordView} -
- - |] + [whamlet| + #{extra} + + $if needOld + + + + +
+ ^{fvLabel currentPasswordView} + + ^{fvInput currentPasswordView} +
+ ^{fvLabel newPasswordView} + + ^{fvInput newPasswordView} +
+ ^{fvLabel confirmPasswordView} + + ^{fvInput confirmPasswordView} +
+ + |] return (passwordFormRes, widget) currentPasswordSettings = diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index f936ca85..21d24b18 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,3 +1,4 @@ +cabal-version: >=1.10 name: yesod-auth version: 1.6.10.1 license: MIT @@ -7,7 +8,6 @@ maintainer: Michael Snoyman synopsis: Authentication for Yesod. category: Web, Yesod stability: Stable -cabal-version: >= 1.6.0 build-type: Simple homepage: http://www.yesodweb.com/ description: API docs and the README are available at @@ -20,6 +20,7 @@ flag network-uri default: True library + default-language: Haskell2010 build-depends: base >= 4.10 && < 5 , aeson >= 0.7 , authenticate >= 1.3.4