yesod-form 1.1.0 → 1.1.0.1

raw patch · 6 files changed

+12/−30 lines, 6 files

Files

• Yesod/Form/Fields.hs +8/−14
• Yesod/Form/Functions.hs +0/−4
• Yesod/Form/I18n/Norwegian.hs +3/−3
• Yesod/Form/MassInput.hs +0/−4
• Yesod/Form/Types.hs +0/−4
• yesod-form.cabal +1/−1

@@ -52,14 +52,10 @@ import Yesod.Widget (toWidget, whamlet, GWidget) import Yesod.Message (RenderMessage (renderMessage), SomeMessage (..)) import Text.Hamlet-#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze (ToMarkup (toMarkup), preEscapedToMarkup, unsafeByteString) #define ToHtml ToMarkup #define toHtml toMarkup #define preEscapedText preEscapedToMarkup-#else-import Text.Blaze (ToHtml (..), preEscapedText, unsafeByteString)-#endif import Text.Cassius import Data.Time (Day, TimeOfDay(..)) import qualified Text.Email.Validate as Email@@ -75,11 +71,7 @@ import Blaze.ByteString.Builder.Internal.Write (fromWriteList) import Database.Persist.Store (PersistEntityBackend) -#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze.Html.Renderer.String (renderHtml)-#else-import Text.Blaze.Renderer.String (renderHtml)-#endif import qualified Data.ByteString as S import qualified Data.ByteString.Lazy as L import Data.Text (Text, unpack, pack)@@ -388,15 +380,17 @@ |])     (\theId name isSel -> [whamlet| $newline never-<div>-    <input id=#{theId}-none type=radio name=#{name} value=none :isSel:checked>-    <label for=#{theId}-none>_{MsgSelectNone}+<label .radio for=#{theId}-none>+    <div>+        <input id=#{theId}-none type=radio name=#{name} value=none :isSel:checked>+        _{MsgSelectNone} |])     (\theId name attrs value isSel text -> [whamlet| $newline never-<div>-    <input id=#{theId}-#{value} type=radio name=#{name} value=#{value} :isSel:checked *{attrs}>-    <label for=#{theId}-#{value}>#{text}+<label .radio for=#{theId}-#{value}>+    <div>+        <input id=#{theId}-#{value} type=radio name=#{name} value=#{value} :isSel:checked *{attrs}>+        \#{text} |])  boolField :: RenderMessage master FormMessage => Field sub master Bool

@@ -47,13 +47,9 @@ import Control.Monad.Trans.Class (lift) import Control.Monad (liftM, join) import Crypto.Classes (constTimeEq)-#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze (Markup, toMarkup) #define Html Markup #define toHtml toMarkup-#else-import Text.Blaze (Html, toHtml)-#endif import Yesod.Handler (GHandler, getRequest, runRequestBody, newIdent, getYesod) import Yesod.Core (RenderMessage, SomeMessage (..)) import Yesod.Widget (GWidget, whamlet)

@@ -16,11 +16,11 @@ norwegianBokmålFormMessage (MsgInvalidHour t) = "Ugyldig time: " `mappend` t norwegianBokmålFormMessage (MsgInvalidMinute t) = "Ugyldig minutt: " `mappend` t norwegianBokmålFormMessage (MsgInvalidSecond t) = "Ugyldig sekund: " `mappend` t-norwegianBokmålFormMessage MsgValueRequired = "Feltet er obligatoriskt"+norwegianBokmålFormMessage MsgValueRequired = "Feltet er obligatorisk" norwegianBokmålFormMessage (MsgInputNotFound t) = "Feltet ble ikke funnet: " `mappend` t norwegianBokmålFormMessage MsgSelectNone = "<Ingenting>"-norwegianBokmålFormMessage (MsgInvalidBool t) = "Ugyldig boolsk: " `mappend` t+norwegianBokmålFormMessage (MsgInvalidBool t) = "Ugyldig sannhetsverdi: " `mappend` t norwegianBokmålFormMessage MsgBoolYes = "Ja" norwegianBokmålFormMessage MsgBoolNo = "Nei"-norwegianBokmålFormMessage MsgDelete = "Slett?"+norwegianBokmålFormMessage MsgDelete = "Slette?" norwegianBokmålFormMessage MsgCsrfWarning = "Som beskyttelse mot «cross-site request forgery»-angrep, vennligst bekreft innsendt skjema."

@@ -15,11 +15,7 @@ import Yesod.Widget (GWidget, whamlet) import Yesod.Message (RenderMessage) import Yesod.Handler (newIdent, GHandler)-#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze.Html (Html)-#else-import Text.Blaze (Html)-#endif import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.RWS (get, put, ask) import Data.Maybe (fromMaybe)

@@ -23,14 +23,10 @@ import Yesod.Request (FileInfo) import Data.Text (Text) import Data.Monoid (Monoid (..))-#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze (Markup, ToMarkup (toMarkup)) #define Html Markup #define ToHtml ToMarkup #define toHtml toMarkup-#else-import Text.Blaze (Html, ToHtml (toHtml))-#endif import Control.Applicative ((<$>), Applicative (..)) import Control.Monad (liftM) import Data.String (IsString (..))

@@ -1,5 +1,5 @@ name:            yesod-form-version:         1.1.0+version:         1.1.0.1 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>