diff --git a/yesod-newsfeed/Yesod/AtomFeed.hs b/yesod-newsfeed/Yesod/AtomFeed.hs index e35ad408..fc338f8a 100644 --- a/yesod-newsfeed/Yesod/AtomFeed.hs +++ b/yesod-newsfeed/Yesod/AtomFeed.hs @@ -1,5 +1,4 @@ {-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE CPP #-} --------------------------------------------------------- -- -- Module : Yesod.AtomFeed @@ -36,12 +35,7 @@ atomFeed :: Feed (Route master) -> GHandler sub master RepAtom atomFeed = liftM RepAtom . hamletToContent . template template :: Feed url -> HtmlUrl url -template arg = -#if __GLASGOW_HASKELL__ >= 700 - [xhamlet| -#else - [$xhamlet| -#endif +template arg = [xhamlet| \ #{feedTitle arg} @@ -54,12 +48,7 @@ template arg = |] entryTemplate :: FeedEntry url -> HtmlUrl url -entryTemplate arg = -#if __GLASGOW_HASKELL__ >= 700 - [xhamlet| -#else - [$xhamlet| -#endif +entryTemplate arg = [xhamlet| @{feedEntryLink arg} String -- ^ title -> GWidget s m () -atomLink r title = addHamletHead -#if __GLASGOW_HASKELL__ >= 700 - [hamlet| -#else - [$hamlet| -#endif +atomLink r title = addHamletHead [hamlet| GHandler sub master RepRss rssFeed = liftM RepRss . hamletToContent . template template :: Feed url -> HtmlUrl url -template arg = -#if __GLASGOW_HASKELL__ >= 700 - [xhamlet| -#else - [$xhamlet| -#endif +template arg = [xhamlet| \ HtmlUrl url -entryTemplate arg = -#if __GLASGOW_HASKELL__ >= 700 - [xhamlet| -#else - [$xhamlet| -#endif +entryTemplate arg = [xhamlet| #{feedEntryTitle arg} @{feedEntryLink arg} @@ -72,11 +61,6 @@ entryTemplate arg = rssLink :: Route m -> String -- ^ title -> GWidget s m () -rssLink r title = addHamletHead -#if __GLASGOW_HASKELL__ >= 700 - [hamlet| -#else - [$hamlet| -#endif +rssLink r title = addHamletHead [hamlet|