git.iko.soy/hakyll
on master help sign in
defaultRelativizeUrls → relativizeUrlsCompiler
commitbc4fef81b7143d3b2035f3bd28fe89bea8dbc30d authorJasper Van der Jeugt <jaspervdj@gmail.com> dateTue 15 Feb 2011, 22:20 (16 years ago) parentd000263
3 files changed+20−15
compare with master
unifiedsplit
src/Hakyll/Web.hs+1−12 src/Hakyll/Web/CompressCss.hs+1−2 src/Hakyll/Web/RelativizeUrls.hs+18−1
src/Hakyll/Web.hs+1−12
@@ -3,14 +3,11 @@
33module Hakyll.Web
44 ( defaultTemplateRead
55 , defaultTemplateReadWith
6− , defaultRelativizeUrls
76 , defaultCopyFile
87 , defaultApplyTemplate
98 ) where
109
11−import Prelude hiding (id)
12−import Control.Category (id)
13−import Control.Arrow ((>>^), (&&&))
10+import Control.Arrow ((>>^))
1411
1512import Text.Hamlet (HamletSettings)
1613
@@ -20,14 +17,6 @@ import Hakyll.Core.Identifier
2017import Hakyll.Core.ResourceProvider
2118import Hakyll.Web.Page
2219import Hakyll.Web.Template
23−import Hakyll.Web.RelativizeUrls
24−import Hakyll.Web.Util.String
25−
26−defaultRelativizeUrls :: Compiler (Page String) (Page String)
27−defaultRelativizeUrls = getRoute &&& id >>^ uncurry relativize
28− where
29− relativize Nothing = id
30− relativize (Just r) = fmap (relativizeUrls $ toSiteRoot r)
3120
3221defaultTemplateRead :: Compiler Resource Template
3322defaultTemplateRead = cached "Hakyll.Web.defaultTemplateRead" $ templateRead
src/Hakyll/Web/CompressCss.hs+1−2
@@ -14,8 +14,7 @@ import Hakyll.Core.Compiler
1414import Hakyll.Core.ResourceProvider
1515import Hakyll.Web.Util.String
1616
17−-- | Compiler form of 'compressCss' which automatically picks the right root
18−-- path
17+-- | Compiler form of 'compressCss'
1918--
2019compressCssCompiler :: Compiler Resource String
2120compressCssCompiler = getResourceString >>^ compressCss
src/Hakyll/Web/RelativizeUrls.hs+18−1
@@ -15,14 +15,31 @@
1515-- > <img src="../images/lolcat.png" alt="Funny zomgroflcopter" />
1616--
1717module Hakyll.Web.RelativizeUrls
18− ( relativizeUrls
18+ ( relativizeUrlsCompiler
19+ , relativizeUrls
1920 ) where
2021
22+import Prelude hiding (id)
23+import Control.Category (id)
24+import Control.Arrow ((&&&), (>>^))
2125import Data.List (isPrefixOf)
2226import qualified Data.Set as S
2327
2428import Text.HTML.TagSoup
2529
30+import Hakyll.Core.Compiler
31+import Hakyll.Web.Page
32+import Hakyll.Web.Util.String
33+
34+-- | Compiler form of 'compressCss' which automatically picks the right root
35+-- path
36+--
37+relativizeUrlsCompiler :: Compiler (Page String) (Page String)
38+relativizeUrlsCompiler = getRoute &&& id >>^ uncurry relativize
39+ where
40+ relativize Nothing = id
41+ relativize (Just r) = fmap (relativizeUrls $ toSiteRoot r)
42+
2643-- | Relativize URL's in HTML
2744--
2845relativizeUrls :: String -- ^ Path to the site root