haskell/stackage-server
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage-server.git synced 2026-02-20 14:55:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly display latest vs current package version #177

Browse Source
This commit is contained in:
Michael Snoyman 2016-05-17 19:44:34 +03:00
parent 413aa50450
commit b81ff2a59d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Handler/Package.hs
View File

@ -81,7 +81,8 @@ packagePage mversion pname = do
[] -> return Nothing [] -> return Nothing
let ixInFavourOf = zip [0::Int ..] inFavourOf let ixInFavourOf = zip [0::Int ..] inFavourOf
displayedVersion = maybe (packageLatest package) (toPathPiece . snd) mversion mdisplayedVersion = toPathPiece . snd <$> mversion
latestVersion = packageLatest package
let homepage = case T.strip (packageHomepage package) of let homepage = case T.strip (packageHomepage package) of
x | null x -> Nothing x | null x -> Nothing

18
templates/package.hamlet
View File

@ -24,23 +24,25 @@ $newline never
#{url} #{url}
<table> <table>
$forall displayedVersion <- mdisplayedVersion
<tr>
<td align=right>Version on this page:
<td>
<span .version>#{displayedVersion}
$forall li <- latests $forall li <- latests
<tr> <tr>
<td align="right"> <td align="right">
<a href=@{SnapshotR (liSnapName li) StackageHomeR}> <a href=@{SnapshotR (liSnapName li) StackageHomeR}>
#{prettyNameShort (liSnapName li)} #{prettyNameShort (liSnapName li)}
\: # :
<td> <td>
<span .version> <span .version>
#{liVersion li} <a href=@{SnapshotR (liSnapName li) (StackageSdistR (PNVName pn))}>#{liVersion li}
<tr> <tr>
<td align="right"> <td align="right">Latest on Hackage:
<a href="https://hackage.haskell.org/package/#{pn}">
Hackage
\: #
<td> <td>
<span .version> <a href="https://hackage.haskell.org/package/#{pn}-#{latestVersion}">
#{displayedVersion} # <span .version>#{latestVersion}
$if null latests $if null latests
<p .add-to-nightly> <p .add-to-nightly>