3532d5f · hakyll · git.iko.soy

git.iko.soy/hakyll

Top-level module for reading templates

commit3532d5f1001c9942f815a1d9411f51a2051a1f96 authorJasper Van der Jeugt <jaspervdj@gmail.com> dateThu 10 Feb 2011, 12:30 (16 years ago) parent7e05b16

8 files changed+16−10

compare with master

unifiedsplit

src/Hakyll.hs+2 src/Hakyll/Web.hs+1−2 src/Hakyll/Web/Feed.hs+1 src/Hakyll/Web/Template.hs+1−1 src/Hakyll/Web/Template/Read.hs+10 src/Hakyll/Web/Template/Read/Hakyll.hs−1 src/Hakyll/Web/Template/Read/Hamlet.hs−4 tests/Hakyll/Web/Template/Tests.hs+1−2

src/Hakyll.hs+2

@@ -10,6 +10,7 @@ module Hakyll

1010 , module Hakyll.Core.Util.Arrow

1111 , module Hakyll.Core.Util.File

1212 , module Hakyll.Core.Writable

13+ , module Hakyll.Main

1314 , module Hakyll.Web

1415 , module Hakyll.Web.CompressCss

1516 , module Hakyll.Web.Feed

@@ -33,6 +34,7 @@ import Hakyll.Core.Rules

3334import Hakyll.Core.Util.Arrow

3435import Hakyll.Core.Util.File

3536import Hakyll.Core.Writable

37+import Hakyll.Main

3638import Hakyll.Web

3739import Hakyll.Web.CompressCss

3840import Hakyll.Web.Feed

src/Hakyll/Web.hs+1−2

@@ -20,8 +20,7 @@ import Hakyll.Core.Identifier

2020import Hakyll.Web.Page

2121import Hakyll.Web.Pandoc

2222import Hakyll.Web.Template

23−import Hakyll.Web.Template.Read.Hakyll

24−import Hakyll.Web.Template.Read.Hamlet

23+import Hakyll.Web.Template.Read

2524import Hakyll.Web.RelativizeUrls

2625import Hakyll.Web.Util.String

2726import Hakyll.Web.CompressCss

src/Hakyll/Web/Feed.hs+1

@@ -32,6 +32,7 @@ import Hakyll.Core.Compiler

3232import Hakyll.Web.Page

3333import Hakyll.Web.Page.Metadata

3434import Hakyll.Web.Template

35+import Hakyll.Web.Template.Read.Hakyll (readTemplate)

3536

3637import Paths_hakyll

3738

src/Hakyll/Web/Template.hs+1−1

@@ -8,7 +8,7 @@ import Data.Maybe (fromMaybe)

88import qualified Data.Map as M

1010import Hakyll.Web.Template.Internal

11−import Hakyll.Web.Template.Read.Hakyll (readTemplate)

11+import Hakyll.Web.Template.Read

1212import Hakyll.Web.Page

1313

1414-- | 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

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

77import Data.List (isPrefixOf)

88import Data.Char (isAlphaNum)

9−import Data.Maybe (fromMaybe)

109

1110import Hakyll.Web.Template.Internal

1211

src/Hakyll/Web/Template/Read/Hamlet.hs−4

@@ -6,12 +6,8 @@ module Hakyll.Web.Template.Read.Hamlet

66 , readHamletTemplateWith

77 ) where

9−import Control.Monad.Trans (liftIO)

10−import System.FilePath (takeExtension)

11−

129import Text.Hamlet (HamletSettings (..), defaultHamletSettings)

1310import Text.Hamlet.RT

14−import Control.Failure

1511

1612import Hakyll.Web.Template.Internal

1713

tests/Hakyll/Web/Template/Tests.hs+1−2

@@ -11,8 +11,7 @@ import qualified Data.Map as M

1111

1212import Hakyll.Web.Page

1313import Hakyll.Web.Template

14−import Hakyll.Web.Template.Read.Hakyll

15−import Hakyll.Web.Template.Read.Hamlet

14+import Hakyll.Web.Template.Read

1615import TestSuite.Util

1716

1817tests :: [Test]