git.iko.soy/hakyll
on master help sign in
Micro cleanup
2895a05Jasper Van der Jeugt
src/Hakyll/Check.hs+3−3
compare with master
unifiedsplit
@@ -198,13 +198,13 @@ checkExternalUrl url = do
198 else do
198 else do
199 isOk <- liftIO $ handle (failure logger) $
199 isOk <- liftIO $ handle (failure logger) $
200 Http.withManager $ \mgr -> do
200 Http.withManager $ \mgr -> do
201− request <- Http.parseUrl $ urlToCheck url
201+ request <- Http.parseUrl urlToCheck
202 response <- Http.http (settings request) mgr
202 response <- Http.http (settings request) mgr
203 let code = Http.statusCode (Http.responseStatus response)
203 let code = Http.statusCode (Http.responseStatus response)
204 return $ code >= 200 && code < 300
204 return $ code >= 200 && code < 300
205
205
206 modify $ if schemeRelative url
206 modify $ if schemeRelative url
207− then S.insert (urlToCheck url) . S.insert url
207+ then S.insert urlToCheck . S.insert url
208 else S.insert url
208 else S.insert url
209 if isOk then ok url else faulty url
209 if isOk then ok url else faulty url
210 where
210 where
@@ -226,7 +226,7 @@ checkExternalUrl url = do
226
226
227 -- Check scheme-relative links
227 -- Check scheme-relative links
228 schemeRelative = isPrefixOf "//"
228 schemeRelative = isPrefixOf "//"
229− urlToCheck uri = if schemeRelative uri then "http:" ++ uri else uri
229+ urlToCheck = if schemeRelative url then "http:" ++ url else url
230#else
230#else
231checkExternalUrl _ = return ()
231checkExternalUrl _ = return ()
232#endif
232#endif
src/Hakyll/Web/Tags.hs+8−10
@@ -198,17 +198,15 @@ renderTagCloud :: Double
198 -- ^ Rendered cloud
198 -- ^ Rendered cloud
199renderTagCloud = renderTagCloudWith makeLink (intercalate " ")
199renderTagCloud = renderTagCloudWith makeLink (intercalate " ")
200 where
200 where
201− makeLink minSize maxSize tag url count min' max' = renderHtml $
201+ makeLink minSize maxSize tag url count min' max' =
202− H.a ! A.style (toValue $ "font-size: " ++ size count min' max')
203− ! A.href (toValue url)
204− $ toHtml tag
205− where
206 -- Show the relative size of one 'count' in percent
202 -- Show the relative size of one 'count' in percent
207− size count min' max' =
208− let diff = 1 + fromIntegral max' - fromIntegral min'
203+ let diff = 1 + fromIntegral max' - fromIntegral min'
209− relative = (fromIntegral count - fromIntegral min') / diff
204+ relative = (fromIntegral count - fromIntegral min') / diff
210− size' = floor $ minSize + relative * (maxSize - minSize)
205+ size = floor $ minSize + relative * (maxSize - minSize) :: Int
211− in show (size' :: Int) ++ "%"
206+ in renderHtml $
207+ H.a ! A.style (toValue $ "font-size: " ++ show size ++ "%")
208+ ! A.href (toValue url)
209+ $ toHtml tag
212
210
213
211
214--------------------------------------------------------------------------------
212--------------------------------------------------------------------------------