Show Next/Prev when disabled and CSS improvements

Author: LeviButcher

datafiles/static/browse.js

@@ -248,13 +248,16 @@ const createPageLink = (num) => {
   return a;
 };
 
-const createPrevNext = (prevNextNum, txt) => {
+const createPrevNext = (prevNextNum, hasLink, txt) => {
   const el = d.createElement("a");
-  el.setAttribute("href", "#");
-  el.addEventListener('click', (evt) => {
-    evt.preventDefault();
-    changePage(prevNextNum);
-  });
+
+  if(hasLink) {
+    el.setAttribute("href", "#");
+    el.addEventListener('click', (evt) => {
+      evt.preventDefault();
+      changePage(prevNextNum);
+    });
+  }
 
   el.appendChild(d.createTextNode(txt));
   return el;
@@ -271,7 +274,7 @@ const createPaginator = () => {
 
   const pag = d.createElement("div");
   pag.classList.add("paginator");
-  if (state.page !== 0) pag.appendChild(createPrevNext(state.page - 1, "Previous"));
+  pag.appendChild(createPrevNext(state.page - 1, state.page !== 0, "Previous"));
   // note that page is zero-indexed
   if (maxPage <= 4) {
     // No ellipsis
@@ -304,7 +307,7 @@ const createPaginator = () => {
   }
   const isNowOnLastPage = state.page === maxPage;
 
-  if(!isNowOnLastPage) pag.appendChild(createPrevNext(state.page + 1, "Next"));
+  pag.appendChild(createPrevNext(state.page + 1, !isNowOnLastPage, "Next"));
 
   return pag;
 };

datafiles/static/hackage.css

@@ -1046,50 +1046,49 @@ a.deprecated[href]:visited {
   display: flex;
   align-items: center;
   flex-wrap: wrap;
+  justify-content: space-between;
+}
+
+#paginatorContainer > div {
+  padding: 1em 0;
 }
 
 .paginator {
-  margin-left: auto;
+  display: flex;
+  flex-wrap: wrap;
 }
 
+/* Styles Next/Prev when they have no href */
 .paginator a {
-  box-sizing: border-box;
-  display: inline-block;
-  min-width: 1.5em;
+  color: #666;
+  cursor: default;
+  background: none;
+  border: none;
   padding: 0.5em 1em;
-  margin-left: 2px;
-  text-align: center;
   text-decoration: none;
-  color: #333;
-  border: 1px solid transparent;
-  border-radius: 2px;
 }
 
-/* Targeting of href for a tags higher up makes it more cumbersome to override */
-.paginator a[href]:link, .paginator a[href]:visited {
+.paginator span {
   color: #333;
-  text-decoration: none;
+  padding: 0.5em 1em;
 }
 
-.paginator .current,
-.paginator .current:hover {
+.paginator a:link, .paginator a:visited {
   color: #333;
-  border: 1px solid #979797;
-  background: linear-gradient(to bottom, #fff 0%, #dcdcdc 100%);
+  border: 1px solid transparent;
+  border-radius: 2px;
 }
 
-.paginator a[href]:hover {
+.paginator a:link:hover, .paginator a:visited:hover {
   color: white;
   border: 1px solid #111;
   background: linear-gradient(to bottom, #585858 0%, #111 100%);
+  text-decoration: none;
 }
 
-.paginator a[href][disabled] { 
-  color: #666;
-  cursor: default;
+.paginator .current,
+.paginator .current:hover {
+  color: #333;
+  border: 1px solid #979797;
+  background: linear-gradient(to bottom, #fff 0%, #dcdcdc 100%);
 }
-
-.paginator a[href][disabled]:hover {
-  background: none;
-  border: none;
-}

src/Distribution/Server/Pages/Recent.hs

@@ -73,12 +73,9 @@ paginator pc@PaginatedConfiguration{currPage,totalAmount} baseUrl =
     infoText = "Showing " ++ show start ++ " to " ++ show end ++ " of " ++ show totalAmount ++ " entries"
     info = XHtml.thediv << infoText
 
-    next = if hasNext pc 
-      then XHtml.anchor ! [XHtml.href (fromMaybe "" (nextURL baseUrl pc))] << "Next" 
-      else XHtml.noHtml
-    prev = if hasPrev pc 
-      then XHtml.anchor ! [XHtml.href (fromMaybe "" (prevURL baseUrl pc)) ] << "Previous" 
-      else XHtml.noHtml 
+    next = XHtml.anchor ! [XHtml.href (fromMaybe "" (nextURL baseUrl pc)) | hasNext pc] << "Next" 
+    prev = XHtml.anchor ! [XHtml.href (fromMaybe "" (prevURL baseUrl pc)) | hasPrev pc] << "Previous"
+      
 
     pagedURLS = zip [1..] (allPagedURLs baseUrl pc)
     pagedLinks = (\(x,y) -> XHtml.anchor ! [XHtml.href y, 
@@ -90,7 +87,6 @@ paginator pc@PaginatedConfiguration{currPage,totalAmount} baseUrl =
 
   in XHtml.thediv ! [XHtml.identifier "paginatorContainer"] << mconcat [info, wrapper]
 
--- | Results in a empty attr, kinda hackish but surprisingly XHtml.HtmlAttr has no concept of a mempty
 noAttr :: XHtml.HtmlAttr
 noAttr = XHtml.theclass ""
 
@@ -205,7 +201,7 @@ recentFeed conf users hostURI now pkgs = RSS
   (map (releaseItem users hostURI) pkgList)
   where
     (start,end) = pageIndexRange conf
-    desc = "Showing" ++ show start ++ " - " ++ show end ++ " most recent additions to Hackage, the Haskell package database."
+    desc = "Showing " ++ show start ++ " - " ++ show end ++ " most recent additions to Hackage, the Haskell package database."
     pkgList = paginate conf pkgs
     updated = maybe now (fst . pkgOriginalUploadInfo) (listToMaybe pkgList)
 
@@ -218,12 +214,12 @@ recentRevisionsFeed conf users hostURI now pkgs = RSS
   (map (revisionItem users hostURI) pkgList)
   where
     (start, end) = pageIndexRange conf
-    desc = "Showing" ++ show start ++ " - " ++ show end ++ " most recent revisions to cabal metadata in Hackage, the Haskell package database."
+    desc = "Showing " ++ show start ++ " - " ++ show end ++ " most recent revisions to cabal metadata in Hackage, the Haskell package database."
     pkgList = paginate conf pkgs
     updated = maybe now (fst . pkgOriginalUploadInfo) (listToMaybe pkgList)
 
 channel :: UTCTime -> [RSS.ChannelElem]
-channel updated =
+channel updated = 
   [ RSS.Language "en"
   , RSS.ManagingEditor email
   , RSS.WebMaster email