diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs index b249fa5..ea7be28 100644 --- a/make-pages/SinglePage.hs +++ b/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||] where path' = bigFile path @@ -158,7 +157,6 @@ make' root siteName prefix nsfw _dataDir dir $formattedDate $updateDate

- $artistTag back to gallery

@@ -174,6 +172,8 @@ make' root siteName prefix nsfw _dataDir dir
+ $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
|] +makeArtist :: Maybe Artist -> Builder +makeArtist Nothing = "" +makeArtist (Just (Artist {name, url})) = [b|@0 +
+

by

+
$artistLink
+
+ |] where artistLink = case url of Just u -> [b|$name|] @@ -271,8 +276,7 @@ makeButtonBar title images =
|] - else - "" + else "" flatten :: [(Text, [(Image, a)])] -> [(Image, Text)] flatten cats =