[more integration of user accounts Jeremy Shaw **20111109021425 Ignore-this: 1b7015e52d96bfcfcf9167cdfb69bf ] hunk ./CMSMonad.hs 40 +import Text.Blaze (Html) +import Text.Blaze.Renderer.String (renderHtml) hunk ./CMSMonad.hs 205 - -instance EmbedAsChild CMS FbXML where - asChild = XMLGenT . return . (:[]) . CMSChild hunk ./CMSMonad.hs 209 +instance EmbedAsChild (CMS url) Html where + asChild = XMLGenT . return . (:[]) . CMSChild . cdata . renderHtml + hunk ./Main.hs 1 +{-# LANGUAGE RecordWildCards #-} hunk ./Main.hs 4 -import Admin.Route (routeAdmin) -import Control.Monad.State (evalStateT) +import Admin.Route (routeAdmin) +import Admin.Template (template) +import Control.Monad.State (get, evalStateT) hunk ./Main.hs 9 +import Happstack.Auth hunk ./Main.hs 12 +import ProfileData.URL (ProfileDataURL(..)) hunk ./Main.hs 44 + (Auth apURL) -> + do Acid{..} <- acidState <$> get + u <- showURL $ Profile CreateNewProfileData + nestURL Auth $ handleAuthProfile acidAuth acidProfile template Nothing Nothing u apURL hunk ./Page.hs 24 +

login

hunk ./URL.hs 2 -module URL where +module URL + ( SiteURL(..) + , AuthURL(..) + , ProfileURL(..) + , AuthProfileURL(..) + , ProfileDataURL(..) + ) where hunk ./URL.hs 13 +import Happstack.Auth (AuthURL(..), ProfileURL(..), AuthProfileURL(..)) hunk ./URL.hs 23 + | Auth AuthProfileURL