From e086b058f690780b632731b79ad8dae387505e1e Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sat, 31 Oct 2020 19:56:36 +0800
Subject: [PATCH] put latest nightly and lts in News: drop rows and Recent
 Snapshots

---
 src/Handler/Home.hs             | 12 ++++++------
 templates/default-layout.hamlet |  2 +-
 templates/home.hamlet           | 32 ++++++++++++++------------------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs
index 4abe9e9..5369d43 100644
--- a/src/Handler/Home.hs
+++ b/src/Handler/Home.hs
@@ -30,9 +30,12 @@ getHomeR :: Handler Html
 getHomeR = track "Handler.Snapshots.getAllSnapshotsR" $ do
     cacheSeconds $ 60 * 60
     now' <- getCurrentTime
-    (map entityVal -> snapshots) <-
-        getSnapshots Nothing snapshotsPerPage 0
-    let groups = groupUp now' snapshots
+    (map entityVal -> nightly) <-
+        getSnapshots (Just  NightlyBranch) 1 0
+    let latestNightly = groupUp now' nightly
+    (map entityVal -> lts) <-
+        getSnapshots (Just  LtsBranch) 1 0
+    let latestLts = groupUp now' lts
     latestLtsNameWithHoogle <- getLatestLtsNameWithHoogle
     latestLtsByGhc <- getLatestLtsByGhc
 
@@ -49,9 +52,6 @@ getHomeR = track "Handler.Snapshots.getAllSnapshotsR" $ do
         groupUp now' = groupBy (on (==) (\(_,_,uploaded) -> uploaded))
                      . map (uncrapify now')
 
-snapshotsPerPage :: Int
-snapshotsPerPage = 8
-
 getAuthorsR :: Handler Html
 getAuthorsR = contentHelper "Library Authors" wcAuthors
 
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 47ce8f7..8a71bcc 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -10,7 +10,7 @@
             <li> <a href="/nightly">Nightly</a>
             <li> <a href="/snapshots">Snapshots</a>
             <li> <a href="https://github.com/fpco/stackage#frequently-asked-questions">FAQ</a>
-            <li> <a href="/blog">News</a>
+            <li> <a href="/blog">Blog</a>
 
 $maybe msg <- mmsg
     <div .container>
diff --git a/templates/home.hamlet b/templates/home.hamlet
index b5b66f6..a5b581f 100644
--- a/templates/home.hamlet
+++ b/templates/home.hamlet
@@ -1,5 +1,5 @@
 <div .container>
-    <div .row .header>
+    <div .header>
         <div .span5>
             <img src=@{StaticR img_logo_png} .logo>
         <div .span3>
@@ -12,7 +12,7 @@
               <label class="checkbox exact-lookup" for="exact" title="Only find identifiers matching your search term precisely">
                 <input type="checkbox" name="exact" id="exact">
                 Exact lookup
-    <div .row>
+    <div>
         <div .span6>
             <h3>Stable Haskell package sets
             <ul>
@@ -20,13 +20,22 @@
               <li><a href="https://haskellstack.org">stack</a> makes using Stackage easy
               <li>Stackage is a community project: <a href="https://github.com/fpco/stackage/blob/master/MAINTAINERS.md#adding-a-package"><b>how to add packages to Stackage</b></a>
         <div .span6>
-            <h3>Recent News
+            <h3>News
+              <ul .snapshots>
+              $forall stackages <- latestNightly
+                  $forall (ident, title, uploaded) <- stackages
+                      <li>
+                          <strong>
+                              <a href=@{SnapshotR ident StackageHomeR}>#{title}</a>, #{uploaded}
+              $forall stackages <- latestLts
+                  $forall (ident, title, uploaded) <- stackages
+                      <li>
+                          <strong>
+                              <a href=@{SnapshotR ident StackageHomeR}>#{title}</a>, #{uploaded}
             $maybe post <- mrecentBlog
               <p>
                 <a href=@{BlogPostR (postYear post) (postMonth post) (postSlug post)}>#{postTitle post}</a>,
                 <abbr title=#{show $ postTime post}>#{dateDiff now' (utctDay $ postTime post)}</abbr>
-              <p><a href="blog">other posts</a>
-    <div .row>
         <div .span6>
             <h3>
                 Latest LTS release per GHC version
@@ -36,19 +45,6 @@
                     <a href=@{SnapshotR (SNLts major minor) StackageHomeR}>LTS #{major}.#{minor} for #{ghc}#
                     \, published #{dateDiff now' date}
 
-        <div .span6>
-            <h3>Recent Snapshots
-            $forall stackages <- groups
-              <ul .snapshots>
-                  $forall (ident, title, uploaded) <- stackages
-                      <li>
-                          <strong>
-                              <a href=@{SnapshotR ident StackageHomeR}>#{title}</a>, #{uploaded}
-              <p>
-                <a href=@{AllSnapshotsR}>
-                    Snapshots archive
-
-    <div .row>
         <div .span6>
             <h3 id="about">
                 About Stackage