2895a05 · hakyll · git.iko.soy

git.iko.soy/hakyll

Micro cleanup

commit2895a05a19f7cf53437d609e74ebce28c8c9be29 authorJasper Van der Jeugt <m@jaspervdj.be> dateMon 22 Apr 2013, 20:24 (14 years ago) parent79215f7

2 files changed+11−13

compare with master

unifiedsplit

src/Hakyll/Check.hs+3−3 src/Hakyll/Web/Tags.hs+8−10

src/Hakyll/Check.hs+3−3

@@ -198,13 +198,13 @@ checkExternalUrl url = do

198198 else do

199199 isOk <- liftIO $ handle (failure logger) $

200200 Http.withManager $ \mgr -> do

201− request <- Http.parseUrl $ urlToCheck url

201+ request <- Http.parseUrl urlToCheck

202202 response <- Http.http (settings request) mgr

203203 let code = Http.statusCode (Http.responseStatus response)

204204 return $ code >= 200 && code < 300

205205

206206 modify $ if schemeRelative url

207− then S.insert (urlToCheck url) . S.insert url

207+ then S.insert urlToCheck . S.insert url

208208 else S.insert url

209209 if isOk then ok url else faulty url

210210 where

@@ -226,7 +226,7 @@ checkExternalUrl url = do

226226

227227 -- Check scheme-relative links

228228 schemeRelative = isPrefixOf "//"

229− urlToCheck uri = if schemeRelative uri then "http:" ++ uri else uri

229+ urlToCheck = if schemeRelative url then "http:" ++ url else url

230230#else

231231checkExternalUrl _ = return ()

232232#endif

src/Hakyll/Web/Tags.hs+8−10

@@ -198,17 +198,15 @@ renderTagCloud :: Double

198198 -- ^ Rendered cloud

199199renderTagCloud = renderTagCloudWith makeLink (intercalate " ")

200200 where

201− makeLink minSize maxSize tag url count min' max' = renderHtml $

202− H.a ! A.style (toValue $ "font-size: " ++ size count min' max')

203− ! A.href (toValue url)

204− $ toHtml tag

205− where

201+ makeLink minSize maxSize tag url count min' max' =

206202 -- Show the relative size of one 'count' in percent

207− size count min' max' =

208− let diff = 1 + fromIntegral max' - fromIntegral min'

209− relative = (fromIntegral count - fromIntegral min') / diff

210− size' = floor $ minSize + relative * (maxSize - minSize)

211− in show (size' :: Int) ++ "%"

203+ let diff = 1 + fromIntegral max' - fromIntegral min'

204+ relative = (fromIntegral count - fromIntegral min') / diff

205+ size = floor $ minSize + relative * (maxSize - minSize) :: Int

206+ in renderHtml $

207+ H.a ! A.style (toValue $ "font-size: " ++ show size ++ "%")

208+ ! A.href (toValue url)

209+ $ toHtml tag

212210

213211

214212--------------------------------------------------------------------------------