WIP yesod 1.2

Assistant/WebApp/Form.hs

@@ -24,7 +24,7 @@ import Data.Text (Text)
  -
  - Required fields are still checked by Yesod.
  -}
-textField :: RenderMessage master FormMessage => Field sub master Text
+textField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Text
 textField = F.textField
 	{ fieldView = \theId name attrs val _isReq -> [whamlet|
 <input id="#{theId}" name="#{name}" *{attrs} type="text" value="#{either id id val}">
@@ -32,7 +32,7 @@ textField = F.textField
 	}
 
 {- Also without required attribute. -}
-passwordField :: RenderMessage master FormMessage => Field sub master Text
+passwordField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Text
 passwordField = F.passwordField
 	{ fieldView = \theId name attrs val _isReq -> toWidget [hamlet|
 <input id="#{theId}" name="#{name}" *{attrs} type="password" value="#{either id id val}">
@@ -40,7 +40,7 @@ passwordField = F.passwordField
 	}
 
 {- Makes a note widget be displayed after a field. -}
-withNote :: Field sub master v -> GWidget sub master () -> Field sub master v
+withNote :: (Monad m, ToWidget (HandlerSite m) a) => Field m v -> a -> Field m v
 withNote field note = field { fieldView = newview }
   where
 	newview theId name attrs val isReq = 
@@ -48,7 +48,7 @@ withNote field note = field { fieldView = newview }
 		in [whamlet|^{fieldwidget}&nbsp;&nbsp;<span>^{note}</span>|]
 
 {- Note that the toggle string must be unique on the form. -}
-withExpandableNote :: Field sub master v -> (String, GWidget sub master ()) -> Field sub master v
+withExpandableNote :: (Monad m, ToWidget (HandlerSite m) w) => Field m v -> (String, w) -> Field m v
 withExpandableNote field (toggle, note) = withNote field $ [whamlet|
 <a .btn data-toggle="collapse" data-target="##{ident}">
   #{toggle}
@@ -62,7 +62,7 @@ data EnableEncryption = SharedEncryption | NoEncryption
 	deriving (Eq)
 
 {- Adds a check box to an AForm to control encryption. -}
-enableEncryptionField :: RenderMessage master FormMessage => AForm sub master EnableEncryption
+enableEncryptionField :: (RenderMessage site FormMessage) => AForm (HandlerT site IO) EnableEncryption
 enableEncryptionField = areq (selectFieldList choices) "Encryption" (Just SharedEncryption)
   where
 	choices :: [(Text, EnableEncryption)]