move artist to main info for visiblity

make-pages/SinglePage.hs

@@ -45,8 +45,6 @@ make' root siteName prefix nsfw _dataDir dir
 
   let undir = joinPath (replicate (length (splitPath dir)) "..")
 
-  let artistTag = ifJust artist makeArtist
-
   let formattedDate = formatLong date
 
   let buttonBar = makeButtonBar title $ addIds images
@@ -58,11 +56,12 @@ make' root siteName prefix nsfw _dataDir dir
   let download0 = fromMaybe (bigFile path0) download0'
   let path0'    = pageFile path0
 
-  let descSection = makeDesc $ descFor nsfw info
-  let tagsList    = makeTags undir $ tagsFor nsfw info
-  let linksList   = extLinks $ linksFor nsfw info
-  let updates     = sort $ updatesFor nsfw info
-  let updatesList = makeUpdates updates
+  let artistSection = makeArtist artist
+  let descSection   = makeDesc $ descFor nsfw info
+  let tagsList      = makeTags undir $ tagsFor nsfw info
+  let linksList     = extLinks $ linksFor nsfw info
+  let updates       = sort $ updatesFor nsfw info
+  let updatesList   = makeUpdates updates
 
   let makePrefetch (Image {path}) = [b|<link rel=prefetch href=$path'>|]
         where path' = bigFile path
@@ -158,7 +157,6 @@ make' root siteName prefix nsfw _dataDir dir
           $formattedDate $updateDate
         </h2>
         <h2 class="left corner">
-          $artistTag
           <a href=$undir>back to gallery</a>
         </h2>
       </header>
@@ -174,6 +172,8 @@ make' root siteName prefix nsfw _dataDir dir
         </figure>
 
         <div id=info>
+          $6.artistSection
+
           $6.descSection
 
           $6.updatesList
@@ -193,9 +193,14 @@ make' root siteName prefix nsfw _dataDir dir
 last' :: [a] -> Maybe a
 last' xs = if null xs then Nothing else Just $ last xs
 
-makeArtist :: Artist -> Builder
-makeArtist (Artist {name, url}) =
-  [b|by $artistLink <br>|]
+makeArtist :: Maybe Artist -> Builder
+makeArtist Nothing = ""
+makeArtist (Just (Artist {name, url})) = [b|@0
+    <section id=desc class=info-section>
+      <h2>by</h2>
+      <div>$artistLink</div>
+    </section>
+  |]
  where
    artistLink = case url of
     Just u  -> [b|<a href="$u">$name</a>|]
@@ -271,8 +276,7 @@ makeButtonBar title images =
           <label for=skipAll>skip warnings</label>
         </div>
       |]
-    else
-      ""
+    else ""
 
 flatten :: [(Text, [(Image, a)])] -> [(Image, Text)]
 flatten cats =