From df66e5d98231847d1de791a8a2d69ff35fb3c102 Mon Sep 17 00:00:00 2001 From: Chris Done Date: Fri, 14 Nov 2014 13:39:58 +0100 Subject: [PATCH] Use same style as packages list for tag page (#17) @DanBurton @snoyberg --- Handler/Tag.hs | 10 ++++++---- templates/tag.hamlet | 26 ++++++++++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Handler/Tag.hs b/Handler/Tag.hs index 3718a44..09087f0 100644 --- a/Handler/Tag.hs +++ b/Handler/Tag.hs @@ -17,12 +17,14 @@ getTagListR = do getTagR :: Slug -> Handler Html getTagR tagSlug = do - packages <- fmap (map (\(E.Value v) -> v)) $ runDB $ - E.select $ E.from $ \tag -> do - E.where_ (tag E.^. TagTag E.==. E.val tagSlug) + packages <- fmap (map (\(E.Value t,E.Value s) -> (t,strip s))) $ runDB $ + E.select $ E.from $ \(tag,meta) -> do + E.where_ (tag E.^. TagTag E.==. E.val tagSlug E.&&. + meta E.^. MetadataName E.==. tag E.^. TagPackage) E.orderBy [E.asc (tag E.^. TagPackage)] - return (tag E.^. TagPackage) + return (tag E.^. TagPackage,meta E.^. MetadataSynopsis) let tag = unSlug tagSlug defaultLayout $ do setTitle $ "Stackage tag" $(widgetFile "tag") + where strip x = fromMaybe x (stripSuffix "." x) diff --git a/templates/tag.hamlet b/templates/tag.hamlet index ca316d6..2d900bf 100644 --- a/templates/tag.hamlet +++ b/templates/tag.hamlet @@ -1,7 +1,21 @@ +$newline never +
-

Packages tagged: #{tag} -