Fixup bad layout in page-header <div>

hvr · hvr · commit 7c94de40910d · 2018-03-19T00:56:35.000+01:00
The issue was the <a> element being rendered into a different row from the <ul> element on Firefox (but not on Chromium). This reverts a change from 0858245 While at it, this also fixes some minor inconsistencies/simplifies code.
diff --git a/Distribution/Server/Pages/Package.hs b/Distribution/Server/Pages/Package.hs
@@ -25,7 +25,7 @@ module Distribution.Server.Pages.Package
 
 import Distribution.Server.Features.PreferredVersions
 
-import Distribution.Server.Pages.Template (hackagePageWith)
+import Distribution.Server.Pages.Template (hackagePageWithHead)
 import qualified Distribution.Server.Pages.Package.HaddockParse as Haddock
 import Distribution.Server.Pages.Package.HaddockHtml
 import Distribution.Server.Packages.ModuleForest
@@ -37,7 +37,6 @@ import qualified Distribution.ModuleName as Module
 import Distribution.ModuleName (ModuleName)
 import Distribution.Package
 import Distribution.PackageDescription as P
-import Distribution.Simple.Utils ( cabalVersion )
 import Distribution.Version
 import Distribution.Types.CondTree
 import Distribution.Text        (display)
@@ -72,7 +71,7 @@ packagePage :: PackageRender -> [Html] -> [Html] -> [(String, Html)]
 packagePage render headLinks top sections
             bottom mdocIndex mreadMe
             docURL isCandidate =
-    hackagePageWith [canonical] docTitle docSubtitle docBody [docFooter]
+    hackagePageWithHead [canonical] docTitle docBody
   where
     pkgid   = rendPkgId render
     pkgName = display $ packageName pkgid
@@ -85,7 +84,6 @@ packagePage render headLinks top sections
             ++ case synopsis (rendOther render) of
                  ""    -> ""
                  short -> ": " ++ short
-    docSubtitle = anchor ! [theclass "caption"] << "Hackage :: [Package]"
 
     docBody = bodyTitle
           : concat [
@@ -123,14 +121,6 @@ packagePage render headLinks top sections
         items -> [thediv ! [thestyle "font-size: small"] <<
             (map (\item -> "[" +++ item +++ "] ") items)]
 
-    docFooter = thediv ! [identifier "footer"]
-                  << paragraph
-                       << [ toHtml "Produced by "
-                          , anchor ! [href "/"] << "hackage"
-                          , toHtml " and "
-                          , anchor ! [href cabalHomeURL] << "Cabal"
-                          , toHtml (" " ++ display cabalVersion) ]
-
     pair (title, content) =
         toHtml [ h2 << title, content ]
 
@@ -676,7 +666,3 @@ packageURL pkgId = "/package" </> display pkgId
 
 --cabalLogoURL :: URL
 --cabalLogoURL = "/built-with-cabal.png"
-
--- global URLs
-cabalHomeURL :: URL
-cabalHomeURL = "http://haskell.org/cabal/"
diff --git a/Distribution/Server/Pages/Template.hs b/Distribution/Server/Pages/Template.hs
@@ -40,8 +40,8 @@ hackagePageWith headExtra docTitle docSubtitle docContent bodyExtra =
                 ]
     docBody   = [ thediv  ! [identifier "page-header"] << docHeader
                 , thediv  ! [identifier "content"] << docContent ]
-    docHeader = [ docSubtitle
-                , navigationBar
+    docHeader = [ navigationBar
+                , docSubtitle
                 ]
     googleFontURL = "https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700"
 
diff --git a/datafiles/templates/Html/package-page.html.st b/datafiles/templates/Html/package-page.html.st
@@ -15,7 +15,7 @@
 </head>
 
 <body>
-  $hackagePageHeader(title={<a class="caption" href="$baseurl$/">Hackage :: [Package]</a>})$
+  $hackagePageHeader()$
 
   <div id="content">
     <h1><a href="$baseurl$/package/$package.name$">$package.name$</a>$if(package.optional.hasSynopsis)$: <small>$package.optional.synopsis$</small>$endif$</h1>
diff --git a/datafiles/templates/hackagePageHeader.st b/datafiles/templates/hackagePageHeader.st
@@ -1,11 +1,5 @@
 <div id="page-header">
 
-$if(title)$
-$title$
-$else$
-<a class="caption" href="/">Hackage : : [Package]</a>
-$endif$
-
 <ul class="links" id="page-menu">
 
     <li><a href="/">Home</a></li>
@@ -27,4 +21,10 @@ $endif$
 
 </ul>
 
+$if(title)$
+$title$
+$else$
+<a class="caption" href="/">Hackage :: [Package]</a>
+$endif$
+
 </div>

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ hackagePageWith headExtra docTitle docSubtitle docContent bodyExtra =`
`40`	`40`	`]`
`41`	`41`	`docBody = [ thediv ! [identifier "page-header"] << docHeader`
`42`	`42`	`, thediv ! [identifier "content"] << docContent ]`
`43`		`- docHeader = [ docSubtitle`
`44`		`- , navigationBar`
	`43`	`+ docHeader = [ navigationBar`
	`44`	`+ , docSubtitle`
`45`	`45`	`]`
`46`	`46`	`googleFontURL = "https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700"`
`47`	`47`