git.iko.soy/hakyll
on master help sign in
Top-level module for reading templates
3532d5fJasper Van der Jeugt
src/Hakyll.hs+2
compare with master
unifiedsplit
@@ -10,6 +10,7 @@ module Hakyll
10 , module Hakyll.Core.Util.Arrow
10 , module Hakyll.Core.Util.Arrow
11 , module Hakyll.Core.Util.File
11 , module Hakyll.Core.Util.File
12 , module Hakyll.Core.Writable
12 , module Hakyll.Core.Writable
13+ , module Hakyll.Main
13 , module Hakyll.Web
14 , module Hakyll.Web
14 , module Hakyll.Web.CompressCss
15 , module Hakyll.Web.CompressCss
15 , module Hakyll.Web.Feed
16 , module Hakyll.Web.Feed
@@ -33,6 +34,7 @@ import Hakyll.Core.Rules
33import Hakyll.Core.Util.Arrow
34import Hakyll.Core.Util.Arrow
34import Hakyll.Core.Util.File
35import Hakyll.Core.Util.File
35import Hakyll.Core.Writable
36import Hakyll.Core.Writable
37+import Hakyll.Main
36import Hakyll.Web
38import Hakyll.Web
37import Hakyll.Web.CompressCss
39import Hakyll.Web.CompressCss
38import Hakyll.Web.Feed
40import Hakyll.Web.Feed
src/Hakyll/Web.hs+1−2
@@ -20,8 +20,7 @@ import Hakyll.Core.Identifier
20import Hakyll.Web.Page
20import Hakyll.Web.Page
21import Hakyll.Web.Pandoc
21import Hakyll.Web.Pandoc
22import Hakyll.Web.Template
22import Hakyll.Web.Template
23−import Hakyll.Web.Template.Read.Hakyll
23+import Hakyll.Web.Template.Read
24−import Hakyll.Web.Template.Read.Hamlet
25import Hakyll.Web.RelativizeUrls
24import Hakyll.Web.RelativizeUrls
26import Hakyll.Web.Util.String
25import Hakyll.Web.Util.String
27import Hakyll.Web.CompressCss
26import Hakyll.Web.CompressCss
src/Hakyll/Web/Feed.hs+1
@@ -32,6 +32,7 @@ import Hakyll.Core.Compiler
32import Hakyll.Web.Page
32import Hakyll.Web.Page
33import Hakyll.Web.Page.Metadata
33import Hakyll.Web.Page.Metadata
34import Hakyll.Web.Template
34import Hakyll.Web.Template
35+import Hakyll.Web.Template.Read.Hakyll (readTemplate)
35
36
36import Paths_hakyll
37import Paths_hakyll
37
38
src/Hakyll/Web/Template.hs+1−1
@@ -8,7 +8,7 @@ import Data.Maybe (fromMaybe)
8import qualified Data.Map as M
8import qualified Data.Map as M
9
9
10import Hakyll.Web.Template.Internal
10import Hakyll.Web.Template.Internal
11−import Hakyll.Web.Template.Read.Hakyll (readTemplate)
11+import Hakyll.Web.Template.Read
12import Hakyll.Web.Page
12import Hakyll.Web.Page
13
13
14-- | Substitutes @$identifiers@ in the given @Template@ by values from the given
14-- | Substitutes @$identifiers@ in the given @Template@ by values from the given
src/Hakyll/Web/Template/Read.hsnew file+10
@@ -0,0 +1,10 @@
1+-- | Re-exports all different template reading modules
2+--
3+module Hakyll.Web.Template.Read
4+ ( readTemplate
5+ , readHamletTemplate
6+ , readHamletTemplateWith
7+ ) where
8+
9+import Hakyll.Web.Template.Read.Hakyll
10+import Hakyll.Web.Template.Read.Hamlet
src/Hakyll/Web/Template/Read/Hakyll.hs−1
@@ -6,7 +6,6 @@ module Hakyll.Web.Template.Read.Hakyll
6
6
7import Data.List (isPrefixOf)
7import Data.List (isPrefixOf)
8import Data.Char (isAlphaNum)
8import Data.Char (isAlphaNum)
9−import Data.Maybe (fromMaybe)
10
9
11import Hakyll.Web.Template.Internal
10import Hakyll.Web.Template.Internal
12
11
src/Hakyll/Web/Template/Read/Hamlet.hs−4
@@ -6,12 +6,8 @@ module Hakyll.Web.Template.Read.Hamlet
6 , readHamletTemplateWith
6 , readHamletTemplateWith
7 ) where
7 ) where
8
8
9−import Control.Monad.Trans (liftIO)
10−import System.FilePath (takeExtension)
11−
12import Text.Hamlet (HamletSettings (..), defaultHamletSettings)
9import Text.Hamlet (HamletSettings (..), defaultHamletSettings)
13import Text.Hamlet.RT
10import Text.Hamlet.RT
14−import Control.Failure
15
11
16import Hakyll.Web.Template.Internal
12import Hakyll.Web.Template.Internal
17
13
tests/Hakyll/Web/Template/Tests.hs+1−2
@@ -11,8 +11,7 @@ import qualified Data.Map as M
11
11
12import Hakyll.Web.Page
12import Hakyll.Web.Page
13import Hakyll.Web.Template
13import Hakyll.Web.Template
14−import Hakyll.Web.Template.Read.Hakyll
14+import Hakyll.Web.Template.Read
15−import Hakyll.Web.Template.Read.Hamlet
16import TestSuite.Util
15import TestSuite.Util
17
16
18tests :: [Test]
17tests :: [Test]