Merge pull request #729 from haskell/gb/change-breaking

whitespace changes

Author: gbaz

Distribution/Server/Pages/Package.hs

@@ -353,23 +353,19 @@ showDependencies :: [Dependency] -> Html
 showDependencies deps = commaList (map showDependency deps)
 
 showDependency ::  Dependency -> Html
-showDependency (Dependency (unPackageName -> pname) vs) = showPkg +++ vsHtml
+showDependency (Dependency (unPackageName -> pname) vs) = nonbreakingSpan << (showPkg +++ vsHtml)
   where vsHtml = if vs == anyVersion then noHtml
-                                     else nonbreakingHtml (" (" ++ display vs ++ ")")
+                                     else toHtml (" (" ++ display vs ++ ")")
         -- mb_vers links to latest version in range. This is a bit computationally
         -- expensive, not cache-friendly, and perhaps unexpected in some cases
         {-mb_vers = maybeLast $ filter (`withinRange` vs) $ map packageVersion $
                     PackageIndex.lookupPackageName vmap (PackageName pname)-}
         -- nonetheless, we should ensure that the package exists /before/
         -- passing along the PackageRender, which is not the case here
-        showPkg = anchor ! [href . packageURL $ PackageIdentifier (mkPackageName pname) nullVersion] << nonbreakingHtml pname
-
-nonbreakingHtml :: String -> Html
-nonbreakingHtml = primHtml . concatMap htmlizeChar2 . stringToHtmlString
-   where
-      htmlizeChar2 ' ' = "&nbsp;"
-      htmlizeChar2 '-' = "&#8209;"
-      htmlizeChar2 c   = [c]
+        showPkg = anchor ! [href . packageURL $ PackageIdentifier (mkPackageName pname) nullVersion] << pname
+
+nonbreakingSpan :: Html -> Html
+nonbreakingSpan str = thespan ! [thestyle "white-space: nowrap"] << str
 
 renderDetailedDependencies :: PackageRender -> Html
 renderDetailedDependencies pkgRender =

datafiles/templates/Html/package-page.html.st

@@ -56,23 +56,23 @@
 
         <tr>
           <th>License</th>
-          <td>$package.license$</td>
+          <td class="word-wrap">$package.license$</td>
         </tr>
 
         $if(package.optional.hasCopyright)$
         <tr>
           <th>Copyright</th>
-          <td>$package.optional.copyright$</td>
+          <td class="word-wrap">$package.optional.copyright$</td>
         </tr>
         $endif$
 
         <tr>
           <th>Author</th>
-          <td>$package.author$</td>
+          <td class="word-wrap">$package.author$</td>
         </tr>
         <tr>
           <th>Maintainer</th>
-          <td>$package.maintainer$</td>
+          <td class="word-wrap">$package.maintainer$</td>
         </tr>
 
         $if(hackage.hasUpdateTime)$