From 6fcb72889fd8cf692be59af0a8d25e8ad8c4d116 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Feb 2016 17:56:29 +0900 Subject: [PATCH 1/9] Handler.Package: hide empty from Import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit stackage-server/Handler/Package.hs:170:9: Warning: This binding for ‘empty’ shadows the existing binding imported from ‘Import’ at Handler/Package.hs:20:1-23 (and originally defined in ‘GHC.Base’) --- Handler/Package.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Handler/Package.hs b/Handler/Package.hs index b798e8b..ea8dd00 100644 --- a/Handler/Package.hs +++ b/Handler/Package.hs @@ -16,7 +16,7 @@ import qualified Data.Text.Lazy as LT import Distribution.Package.ModuleForest import Graphics.Badge.Barrier import Control.Lens -import Import +import Import hiding (empty) import qualified Text.Blaze.Html.Renderer.Text as LT import Text.Email.Validate import Stackage.Database From 30896f3663128005fee1ffe4ce11cd0a46ae068c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Feb 2016 17:59:23 +0900 Subject: [PATCH 2/9] package.hamlet: link to hackage, license/author markup, number of revdeps --- templates/package.hamlet | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/package.hamlet b/templates/package.hamlet index 7ce5c34..12f4a30 100644 --- a/templates/package.hamlet +++ b/templates/package.hamlet @@ -17,7 +17,8 @@ $newline never

#{pn} # - #{displayedVersion} # + + #{displayedVersion}

#{synopsis} \ # @@ -41,12 +42,11 @@ $newline never

- - #{packageLicenseName package} licensed # + #{packageLicenseName package} licensed $if null maintainers and maintained # $if not (null authors) - by # + \ by # $forall (i,identity) <- authors $case identity @@ -126,7 +126,7 @@ $if not (LT.null (LT.renderHtml (packageChangelog package))) #{name} $if not $ null revdeps
- Used by + Used by #{length revdeps} packages:
$forall (i,(name, range)) <- revdeps $if i /= 0 From 13d12cabf71548995048a8354663db62f299f849 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Feb 2016 18:36:11 +0900 Subject: [PATCH 3/9] Database: prettyName put GHC version in parens before: LTS - GHC X.Y after: LTS (GHC X.Y) --- Stackage/Database.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Stackage/Database.hs b/Stackage/Database.hs index a6ef073..89728c6 100644 --- a/Stackage/Database.hs +++ b/Stackage/Database.hs @@ -470,7 +470,7 @@ snapshotTitle :: Snapshot -> Text snapshotTitle s = prettyName (snapshotName s) (snapshotGhc s) prettyName :: SnapName -> Text -> Text -prettyName name ghc = concat [prettyNameShort name, " - GHC ", ghc] +prettyName name ghc = concat [prettyNameShort name, " (GHC ", ghc, ")"] prettyNameShort :: SnapName -> Text prettyNameShort name = From 89c8cdb1be971fa8708ef9b08b4a4238f0bdbb79 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Feb 2016 18:37:05 +0900 Subject: [PATCH 4/9] package.hamlet: list LTS and Nightly versions on separate lines --- templates/package.hamlet | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/package.hamlet b/templates/package.hamlet index 12f4a30..bfcc3ac 100644 --- a/templates/package.hamlet +++ b/templates/package.hamlet @@ -26,11 +26,11 @@ $newline never #{url} - $forall (idx, li) <- enumerate latests - $if idx /= 0 - , # - - #{prettyName (liSnapName li) (liGhc li)} (#{liVersion li}) + $forall li <- latests +
+ + #{prettyName (liSnapName li) (liGhc li)} + \: #{liVersion li} $if null latests

From 60dcfba8de9d396d490f8f80978c115526293b54 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 17 Feb 2016 19:29:41 +0900 Subject: [PATCH 5/9] Handler.Package: fix the empty warning correctly (thanks zudov) --- Handler/Package.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Handler/Package.hs b/Handler/Package.hs index ea8dd00..098f0ea 100644 --- a/Handler/Package.hs +++ b/Handler/Package.hs @@ -16,7 +16,7 @@ import qualified Data.Text.Lazy as LT import Distribution.Package.ModuleForest import Graphics.Badge.Barrier import Control.Lens -import Import hiding (empty) +import Import import qualified Text.Blaze.Html.Renderer.Text as LT import Text.Email.Validate import Stackage.Database @@ -161,13 +161,13 @@ data Identifier -- parseIdentitiesLiberally :: Text -> [Identifier] parseIdentitiesLiberally = - filter (not . empty) . + filter (not . emptyPlainText) . map strip . concatPlains . map parseChunk . T.split (== ',') - where empty (PlainText e) = T.null e - empty _ = False + where emptyPlainText (PlainText e) = T.null e + emptyPlainText _ = False strip (PlainText t) = PlainText (T.strip t) strip x = x concatPlains = go From 0af19eed1cfff082ae6e7758526d79cc62374db0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Feb 2016 18:25:05 +0900 Subject: [PATCH 6/9] package.hamlet: revert space change since no link anymore --- templates/package.hamlet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/package.hamlet b/templates/package.hamlet index bfcc3ac..fe4c1b8 100644 --- a/templates/package.hamlet +++ b/templates/package.hamlet @@ -42,11 +42,11 @@ $newline never

- #{packageLicenseName package} licensed + #{packageLicenseName package} licensed # $if null maintainers and maintained # $if not (null authors) - \ by # + by # $forall (i,identity) <- authors $case identity From b577b7577455a88555e390706a9c3da0315564dc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Feb 2016 19:57:35 +0900 Subject: [PATCH 7/9] prettyprint "(GHC version)" as "(ghc-version)" --- Stackage/Database.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Stackage/Database.hs b/Stackage/Database.hs index 89728c6..a1da774 100644 --- a/Stackage/Database.hs +++ b/Stackage/Database.hs @@ -470,7 +470,7 @@ snapshotTitle :: Snapshot -> Text snapshotTitle s = prettyName (snapshotName s) (snapshotGhc s) prettyName :: SnapName -> Text -> Text -prettyName name ghc = concat [prettyNameShort name, " (GHC ", ghc, ")"] +prettyName name ghc = concat [prettyNameShort name, " (ghc-", ghc, ")"] prettyNameShort :: SnapName -> Text prettyNameShort name = From df90a4875679c95befe2db258c3ddf9cf7addf1b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Feb 2016 20:00:56 +0900 Subject: [PATCH 8/9] templates/package: move latest version to a Hackage line below Stackage versions --- templates/package.hamlet | 15 ++++++++++----- templates/package.lucius | 5 ++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/templates/package.hamlet b/templates/package.hamlet index fe4c1b8..e31c85c 100644 --- a/templates/package.hamlet +++ b/templates/package.hamlet @@ -15,10 +15,7 @@ $newline never #{pn}

- #{pn} # - - - #{displayedVersion} + #{pn}

#{synopsis} \ # @@ -30,7 +27,15 @@ $newline never

#{prettyName (liSnapName li) (liGhc li)} - \: #{liVersion li} + \: # + + #{liVersion li} +
+ + Hackage + \: # + + #{displayedVersion} # $if null latests

diff --git a/templates/package.lucius b/templates/package.lucius index cc49a22..167973a 100644 --- a/templates/package.lucius +++ b/templates/package.lucius @@ -11,9 +11,8 @@ h3 { width: auto; margin-left: auto; } -.latest-version { - color: #777; - font-size: 24.5px; +.version { + font-weight: bold; } #disqus_thread { margin-top: 2em; From 053c2e06318a10faf82a6fea3cfb3daa20bd084e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Feb 2016 20:38:15 +0900 Subject: [PATCH 9/9] add renderNoPackages to handle plural, and append colon --- Handler/Package.hs | 5 +++++ templates/package.hamlet | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Handler/Package.hs b/Handler/Package.hs index 098f0ea..5f5f392 100644 --- a/Handler/Package.hs +++ b/Handler/Package.hs @@ -7,6 +7,7 @@ module Handler.Package , getPackageSnapshotsR , packagePage , getPackageBadgeR + , renderNoPackages ) where import Data.Char @@ -226,3 +227,7 @@ getPackageSnapshotsR pn = $(combineStylesheets 'StaticR [css_font_awesome_min_css]) $(widgetFile "package-snapshots")) + +renderNoPackages :: Int -> Text +renderNoPackages n = + T.pack $ show n ++ " package" ++ (if n == 1 then "" else "s") diff --git a/templates/package.hamlet b/templates/package.hamlet index e31c85c..9118d7b 100644 --- a/templates/package.hamlet +++ b/templates/package.hamlet @@ -122,7 +122,7 @@ $if not (LT.null (LT.renderHtml (packageChangelog package)))

- Depends on + Depends on:
$forall (i,(name, range)) <- deps $if i /= 0 @@ -131,7 +131,7 @@ $if not (LT.null (LT.renderHtml (packageChangelog package))) #{name} $if not $ null revdeps
- Used by #{length revdeps} packages: + Used by #{renderNoPackages $ length revdeps}:
$forall (i,(name, range)) <- revdeps $if i /= 0