[Make the rendering function signatures more sane
David Fox <dsf@seereason.com>**20111209230655
 Ignore-this: 3dcc78fd749576ba5d2e7a65ce80baab
] hunk ./debian/changelog 1
+haskell-happstack-scaffolding (0.18) unstable; urgency=low
+
+  * Make the signatures of userMarkup and userLink more sane.
+  * Remove second copy of those functions from Scaffolding.ProfileData.Pages,
+    leave the ones in Scaffolding.User.Markup.
+
+ -- David Fox <dsf@seereason.com>  Fri, 09 Dec 2011 15:06:37 -0800
+
hunk ./happstack-scaffolding.cabal 2
-Version:          0.17
+Version:          0.18
hunk ./src/Scaffolding/ProfileData/Markup.hs 18
-userMarkup :: (MonadRoute m, MonadUserName m, MkURL (URL m), MonadIO m, XMLGenerator x, EmbedAsAttr x (Attr String Text)) =>
-              UserId -> m (HSX.XMLGenT x (HSX.XML x))
+userMarkup :: (MonadRoute m, MonadUserName m, MkURL (URL m), MonadIO m, XMLGenerator m, EmbedAsAttr m (Attr String Text)) =>
+              UserId -> HSX.XMLGenT m (HSX.XML m)
hunk ./src/Scaffolding/ProfileData/Markup.hs 23
-       return $ <span><% link %>:<% either show T.unpack name %></span>
+       <span><% link %>:<% either show T.unpack name %></span>
hunk ./src/Scaffolding/ProfileData/Markup.hs 25
-userLink :: (MonadRoute m, MonadUserName m, MkURL (URL m), XMLGenerator x, EmbedAsAttr x (Attr String Text)) =>
-            UserId -> m (HSX.XMLGenT x (HSX.XML x))
+userLink :: (MonadRoute m, MonadUserName m, MkURL (URL m), XMLGenerator m, EmbedAsAttr m (Attr String Text)) =>
+            UserId -> HSX.XMLGenT m (HSX.XML m)
hunk ./src/Scaffolding/ProfileData/Markup.hs 29
-       return <a href=url>U<% show (unUserId u) %></a>
+       <a href=url>U<% show (unUserId u) %></a>
hunk ./src/Scaffolding/ProfileData/Pages.hs 6
-    , userMarkup
-    , userLink
hunk ./src/Scaffolding/ProfileData/Pages.hs 15
-import qualified Data.Text as T
hunk ./src/Scaffolding/ProfileData/Pages.hs 25
-import Scaffolding.ProfileData.User (MonadUserName, askAcidProfileData, lookUser, lookUsername, userName, lookUsername')
+import Scaffolding.ProfileData.User (MonadUserName, askAcidProfileData, lookUser, lookUsername, lookUsername')
hunk ./src/Scaffolding/ProfileData/Pages.hs 104
-userMarkup :: (MonadRoute m, MonadUserName m, MkURL (URL m), MonadIO m, XMLGenerator x, EmbedAsAttr x (Attr String Text)) =>
-              UserId -> m (XMLGenT x (HSX.XML x))
-userMarkup u =
-    do name <- userName u
-       link <- userLink u
-       return $ <span><% link %>:<% either show T.unpack name %></span>
-
-userLink :: (MonadUserName m, MkURL (URL m), MonadRoute m, XMLGenerator x, EmbedAsAttr x (Attr String Text)) =>
-            UserId -> m (XMLGenT x (HSX.XML x))
-userLink u =
-    do url <- showURL (userURL u)
-       return <a href=url>U<% show (unUserId u) %></a>
-