diff --git a/hl.cabal b/hl.cabal index b29b06e..342a857 100644 --- a/hl.cabal +++ b/hl.cabal @@ -13,7 +13,7 @@ cabal-version: >=1.8 executable hl hs-source-dirs: src/ - ghc-options: -Wall -O2 + ghc-options: -Wall -O2 -fno-warn-unused-do-bind main-is: Main.hs build-depends: blaze-html, monad-extras, diff --git a/src/HL/V.hs b/src/HL/V.hs index c5d0e04..c579bed 100644 --- a/src/HL/V.hs +++ b/src/HL/V.hs @@ -19,15 +19,38 @@ import Yesod.Senza as V -- Latest Bootstrap requires extra work to get the old grid layout -- behaviour of spans. I'll probably move this into senza. +span1 :: [Attribute] -> Senza -> Senza span1 xs = div ([class_ "span1 col-md-1"] ++ xs) + +span2 :: [Attribute] -> Senza -> Senza span2 xs = div ([class_ "span2 col-md-2"] ++ xs) + +span3 :: [Attribute] -> Senza -> Senza span3 xs = div ([class_ "span3 col-md-3"] ++ xs) + +span4 :: [Attribute] -> Senza -> Senza span4 xs = div ([class_ "span4 col-md-4"] ++ xs) + +span5 :: [Attribute] -> Senza -> Senza span5 xs = div ([class_ "span5 col-md-5"] ++ xs) + +span6 :: [Attribute] -> Senza -> Senza span6 xs = div ([class_ "span6 col-md-6"] ++ xs) + +span7 :: [Attribute] -> Senza -> Senza span7 xs = div ([class_ "span7 col-md-7"] ++ xs) + span8 xs = div ([class_ "span8 col-md-8"] ++ xs) +span8 :: [Attribute] -> Senza -> Senza + span9 xs = div ([class_ "span9 col-md-9"] ++ xs) +span9 :: [Attribute] -> Senza -> Senza + span10 xs = div ([class_ "span10 col-md-10"] ++ xs) +span10 :: [Attribute] -> Senza -> Senza + span11 xs = div ([class_ "span11 col-md-11"] ++ xs) +span11 :: [Attribute] -> Senza -> Senza + span12 xs = div ([class_ "span12 col-md-12"] ++ xs) +span12 :: [Attribute] -> Senza -> Senza diff --git a/src/HL/V/Template.hs b/src/HL/V/Template.hs index 4d3a07f..0095aaa 100644 --- a/src/HL/V/Template.hs +++ b/src/HL/V/Template.hs @@ -21,7 +21,7 @@ template template crumbs ptitle inner = skeleton ptitle - (\cur url -> return ()) + (\_ _ -> return ()) (\cur url -> div [class_ "template"] (do navigation True cur url @@ -206,6 +206,8 @@ footer r = Nothing -> a [href "http://www.haskell.org/haskellwiki/"] "Go to haskell.org wiki" - Just page -> - a [href (toValue ("http://www.haskell.org/haskellwiki/index.php?title=" <> page <> "&action=edit"))] + Just pn -> + a [href (toValue ("http://www.haskell.org/haskellwiki/index.php?title=" <> + pn <> + "&action=edit"))] "Edit this page"