diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,2 +1,13 @@
+#!/usr/bin/env runghc
+
+module Main where
+
import Distribution.Simple
-main = defaultMain
+import Distribution.Simple.Program
+
+hsx2hsProgram = simpleProgram "hsx2hs"
+
+main :: IO ()
+main = defaultMainWithHooks simpleUserHooks {
+ hookedPrograms = [hsx2hsProgram]
+ }
diff --git a/Theme.hs b/Theme.hs
--- a/Theme.hs
+++ b/Theme.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE FlexibleContexts, OverloadedStrings, RecordWildCards #-}
-{-# OPTIONS_GHC -F -pgmFtrhsx #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs #-}
module Theme where
import Clckwrks
@@ -7,8 +7,10 @@
import Clckwrks.NavBar.API (getNavBarData)
import Clckwrks.NavBar.Types (NavBar(..), NavBarItem(..))
import Clckwrks.Monad
-import Data.Text (Text)
-import HSP
+import Data.Text.Lazy (Text)
+import qualified Data.Text as T
+import HSP.XMLGenerator
+import HSP.XML
import Paths_clckwrks_theme_bootstrap (getDataDir)
theme :: Theme
@@ -45,7 +47,7 @@
pageTemplate :: ( EmbedAsChild (ClckT ClckURL (ServerPartT IO)) headers
, EmbedAsChild (ClckT ClckURL (ServerPartT IO)) body
) =>
- Text
+ T.Text
-> headers
-> body
-> XMLGenT (ClckT ClckURL (ServerPartT IO)) XML
@@ -54,8 +56,8 @@
<% ttl %>
-
-
+
+
<% hdr %>
<% googleAnalytics %>
diff --git a/clckwrks-theme-bootstrap.cabal b/clckwrks-theme-bootstrap.cabal
--- a/clckwrks-theme-bootstrap.cabal
+++ b/clckwrks-theme-bootstrap.cabal
@@ -1,5 +1,5 @@
name: clckwrks-theme-bootstrap
-version: 0.2.8
+version: 0.2.11
synopsis: simple bootstrap based template for clckwrks
homepage: http://www.clckwrks.com/
license: BSD3
@@ -7,11 +7,11 @@
author: Jeremy Shaw
maintainer: jeremy@n-heptane.com
category: Clckwrks
-build-type: Simple
+build-type: Custom
cabal-version: >=1.8
data-files:
- data/hscolour.css
+ data/css/hscolour.css
data/css/bootstrap-responsive.min.css
data/css/bootstrap.css
data/css/bootstrap-responsive.css
@@ -25,9 +25,12 @@
location: http://hub.darcs.net/stepcut/clckwrks
library
+ build-tools:
+ hsx2hs
+
exposed-modules: Theme
Paths_clckwrks_theme_bootstrap
build-depends: base > 4 && <5,
- clckwrks >= 0.16 && < 0.17,
- hsp == 0.7.*,
+ clckwrks >= 0.18 && < 0.19,
+ hsp == 0.9.*,
text == 0.11.*
diff --git a/data/css/hscolour.css b/data/css/hscolour.css
new file mode 100644
--- /dev/null
+++ b/data/css/hscolour.css
@@ -0,0 +1,5 @@
+.hs-keyglyph, .hs-layout {color: red;}
+.hs-keyword {color: blue;}
+.hs-comment, .hs-comment a {color: green;}
+.hs-str, .hs-chr {color: teal;}
+.hs-keyword, .hs-conid, .hs-varid, .hs-conop, .hs-varop, .hs-num, .hs-cpp, .hs-sel, .hs-definition {}
diff --git a/data/hscolour.css b/data/hscolour.css
deleted file mode 100644
--- a/data/hscolour.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.hs-keyglyph, .hs-layout {color: red;}
-.hs-keyword {color: blue;}
-.hs-comment, .hs-comment a {color: green;}
-.hs-str, .hs-chr {color: teal;}
-.hs-keyword, .hs-conid, .hs-varid, .hs-conop, .hs-varop, .hs-num, .hs-cpp, .hs-sel, .hs-definition {}