diff --git a/Makefile b/Makefile index d7f4fa770..d46a4d7f5 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,8 @@ HADDOCKSOURCEFILES:= \ hledger-web/Hledger/*hs \ hledger-web/Hledger/*/*hs \ hledger-web/Hledger/Web/Settings/*hs \ - hledger-vty/Hledger/*hs \ - hledger-vty/Hledger/*/*hs +# hledger-vty/Hledger/*hs \ +# hledger-vty/Hledger/*/*hs # hledger-chart/Hledger/*hs # hledger-chart/Hledger/*/*hs @@ -549,8 +549,10 @@ HADDOCK=haddock --no-warnings --prologue .haddockprologue #--optghc='-hide-packa printf "\nThis haddock covers all hledger-* packages, for individual package haddocks see hackage.\n" >>$@ # generate api docs for the whole project +# we define HADDOCK to disable cabal-file-th code which requires a cabal file in the current dir haddock: .haddockprologue $(HADDOCK) --title "hledger-* API docs" \ + --optghc '-DHADDOCK' \ -o site/api \ --html \ --source-module=src/%{MODULE/./-}.html \ diff --git a/hledger-web/Hledger/Web/Foundation.hs b/hledger-web/Hledger/Web/Foundation.hs index 8d1016060..2cc621ac3 100644 --- a/hledger-web/Hledger/Web/Foundation.hs +++ b/hledger-web/Hledger/Web/Foundation.hs @@ -77,21 +77,17 @@ instance Yesod App where defaultLayout widget = do master <- getYesod mmsg <- getMessage - -- We break up the default layout into two components: -- default-layout is the contents of the body tag, and -- default-layout-wrapper is the entire page. Since the final -- value passed to hamletToRepHtml cannot be a widget, this allows -- you to use normal widget features in default-layout. - - pc <- widgetToPageContent $ do - -- $(widgetFile "normalize") - -- $(widgetFile "default-layout") + -- pc <- widgetToPageContent $ do + -- $(widgetFile "normalize") + -- $(widgetFile "default-layout") -- hamletToRepHtml $(hamletFile "templates/default-layout-wrapper.hamlet") - - widget - -- addCassius $(cassiusFile "default-layout") - -- hamletToRepHtml $(hamletFile "default-layout") + pc <- widgetToPageContent $ do + widget hamletToRepHtml [$hamlet| !!!