From 0548c1a76200aff7e14bcca0204c5f431996ab4d Mon Sep 17 00:00:00 2001 From: Sergey Koposov Date: Sun, 17 Nov 2013 15:10:33 +0000 Subject: [PATCH 1/2] Fix the recent activity page when binary files are changed/added --- Network/Gitit/Handlers.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Network/Gitit/Handlers.hs b/Network/Gitit/Handlers.hs index 2bc15df38..b4e998454 100644 --- a/Network/Gitit/Handlers.hs +++ b/Network/Gitit/Handlers.hs @@ -392,14 +392,15 @@ showActivity = withData $ \(params :: Params) -> do let fileFromChange (Added f) = f fileFromChange (Modified f) = f fileFromChange (Deleted f) = f - let dropDotPage file = if isPageFile file - then dropExtension file - else file + base' <- getWikiBase let fileAnchor revis file = anchor ! [href $ base' ++ "/_diff" ++ urlForPage file ++ "?to=" ++ revis] << file + let fileAnchor revis file = if isPageFile file + then anchor ! [href $ base' ++ "/_diff" ++ urlForPage(dropExtension(file)) ++ "?to=" ++ revis] << dropExtension file + else anchor ! [href $ base' ++ urlForPage file ] << file let filesFor changes revis = intersperse (primHtmlChar "nbsp") $ - map (fileAnchor revis . dropDotPage . fileFromChange) changes + map (fileAnchor revis . fileFromChange) changes let heading = h1 << ("Recent changes by " ++ fromMaybe "all users" forUser) let revToListItem rev = li << [ thespan ! [theclass "date"] << (show $ revDateTime rev) From e2b93013252c8225898ff5cda037e1905e7f7a36 Mon Sep 17 00:00:00 2001 From: Sergey Koposov Date: Mon, 18 Nov 2013 14:14:18 +0000 Subject: [PATCH 2/2] use normal spaces instead of nbsp in the activity page --- Network/Gitit/Handlers.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Network/Gitit/Handlers.hs b/Network/Gitit/Handlers.hs index b4e998454..0be614d79 100644 --- a/Network/Gitit/Handlers.hs +++ b/Network/Gitit/Handlers.hs @@ -399,7 +399,7 @@ showActivity = withData $ \(params :: Params) -> do let fileAnchor revis file = if isPageFile file then anchor ! [href $ base' ++ "/_diff" ++ urlForPage(dropExtension(file)) ++ "?to=" ++ revis] << dropExtension file else anchor ! [href $ base' ++ urlForPage file ] << file - let filesFor changes revis = intersperse (primHtmlChar "nbsp") $ + let filesFor changes revis = intersperse (stringToHtml " ") $ map (fileAnchor revis . fileFromChange) changes let heading = h1 << ("Recent changes by " ++ fromMaybe "all users" forUser) let revToListItem rev = li <<