diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs index 167b9b9d..c2e2526c 100644 --- a/yesod-form/Yesod/Form/Fields.hs +++ b/yesod-form/Yesod/Form/Fields.hs @@ -82,20 +82,6 @@ import Yesod.Core (toPathPiece, GHandler, PathPiece) import Yesod.Persist (selectList, runDB, Filter, SelectOpt, YesodPersistBackend, Key, YesodPersist, PersistEntity, PersistQuery) import Control.Arrow ((&&&)) -#if __GLASGOW_HASKELL__ >= 700 -#define WHAMLET whamlet -#define HAMLET hamlet -#define CASSIUS cassius -#define JULIUS julius -#define HTML html -#else -#define WHAMLET $whamlet -#define HAMLET $hamlet -#define CASSIUS $cassius -#define JULIUS $julius -#define HTML $html -#endif - import Control.Applicative ((<$>)) defaultFormMessage :: FormMessage -> Text @@ -115,7 +101,7 @@ intField = Field _ -> Left $ MsgInvalidInteger s , fieldView = \theId name theClass val isReq -> addHamlet - [HAMLET|\ + [hamlet| |] } @@ -131,7 +117,7 @@ doubleField = Field _ -> Left $ MsgInvalidNumber s , fieldView = \theId name theClass val isReq -> addHamlet - [HAMLET|\ + [hamlet| |] } @@ -141,7 +127,7 @@ dayField :: RenderMessage master FormMessage => Field sub master Day dayField = Field { fieldParse = blank $ parseDate . unpack , fieldView = \theId name theClass val isReq -> addHamlet - [HAMLET|\ + [hamlet| |] } @@ -151,7 +137,7 @@ timeField :: RenderMessage master FormMessage => Field sub master TimeOfDay timeField = Field { fieldParse = blank $ parseTime . unpack , fieldView = \theId name theClass val isReq -> addHamlet - [HAMLET|\ + [hamlet| |] } @@ -167,7 +153,7 @@ htmlField = Field { fieldParse = blank $ Right . preEscapedText . sanitizeBalance , fieldView = \theId name theClass val _isReq -> addHamlet -- FIXME: There was a class="html" attribute, for what purpose? - [HAMLET|\ + [hamlet|\