From 1f1c6ca9d49273c962a54b11deb4838d852afb39 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 23 Mar 2012 16:02:50 +0200
Subject: [PATCH] Fixes

---
 yesod-core/Yesod/Internal/Core.hs |  6 +++---
 yesod-core/helloworld.hs          |  8 +++++---
 yesod-newsfeed/Yesod/AtomFeed.hs  | 12 ++++++------
 yesod-newsfeed/Yesod/RssFeed.hs   | 12 ++++++------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index 89ebca32..7e906a0e 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -586,12 +586,12 @@ $forall s <- stylesheets
 $forall s <- css
     $maybe t <- right $ snd s
         $maybe media <- fst s
-            <link rel=stylesheet media=#{media} href=#{t}
+            <link rel=stylesheet media=#{media} href=#{t}>
         $nothing
-            <link rel=stylesheet href=#{t}
+            <link rel=stylesheet href=#{t}>
     $maybe content <- left $ snd s
         $maybe media <- fst s
-            <style media=#{media}>#{content}
+            <style media=#{media}>#{content}>
         $nothing
             <style>#{content}
 $case jsLoader master
diff --git a/yesod-core/helloworld.hs b/yesod-core/helloworld.hs
index 34cf8c0c..4e42a2a5 100644
--- a/yesod-core/helloworld.hs
+++ b/yesod-core/helloworld.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE TemplateHaskell #-}
 import Yesod.Core
+import Control.Monad.IO.Class (liftIO)
 import Network.Wai.Handler.Warp (run)
 import Data.Text (unpack)
 import Text.Julius (julius)
@@ -31,13 +32,14 @@ handleSubMultiR x = do
     return . RepPlain . toContent . show $ (x, y)
 
 data HelloWorld = HelloWorld { getSubsite :: String -> Subsite }
-mkYesod "HelloWorld" [$parseRoutes|
+mkYesod "HelloWorld" [parseRoutes|
 / RootR GET
 /subsite/#String SubsiteR Subsite getSubsite
 |]
 instance Yesod HelloWorld where
-    approot _ = ""
-    yepnopeJs _ = Just $ Left "http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.0.6/modernizr.min.js"
+    addStaticContent a b c = do
+        liftIO $ print (a, b, c)
+        return Nothing
 
 getRootR = do
     $(logOther "HAHAHA") "Here I am"
diff --git a/yesod-newsfeed/Yesod/AtomFeed.hs b/yesod-newsfeed/Yesod/AtomFeed.hs
index 3d6489c5..ef1200f0 100644
--- a/yesod-newsfeed/Yesod/AtomFeed.hs
+++ b/yesod-newsfeed/Yesod/AtomFeed.hs
@@ -39,10 +39,10 @@ atomFeed = liftM RepAtom . hamletToContent . template
 template :: Feed url -> HtmlUrl url
 template arg = [xhamlet|
 \<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"
+<feed xmlns="http://www.w3.org/2005/Atom">
     <title>#{feedTitle arg}
-    <link rel=self href=@{feedLinkSelf arg}
-    <link href=@{feedLinkHome arg}
+    <link rel=self href=@{feedLinkSelf arg}>
+    <link href=@{feedLinkHome arg}>
     <updated>#{formatW3 $ feedUpdated arg}
     <id>@{feedLinkHome arg}
     $forall entry <- feedEntries arg
@@ -51,9 +51,9 @@ template arg = [xhamlet|
 
 entryTemplate :: FeedEntry url -> HtmlUrl url
 entryTemplate arg = [xhamlet|
-<entry
+<entry>
     <id>@{feedEntryLink arg}
-    <link href=@{feedEntryLink arg}
+    <link href=@{feedEntryLink arg}>
     <updated>#{formatW3 $ feedEntryUpdated arg}
     <title>#{feedEntryTitle arg}
     <content type=html>
@@ -67,5 +67,5 @@ atomLink :: Route m
          -> Text -- ^ title
          -> GWidget s m ()
 atomLink r title = toWidgetHead [hamlet|
-<link href=@{r} type=#{S8.unpack typeAtom} rel="alternate" title=#{title}
+<link href=@{r} type=#{S8.unpack typeAtom} rel="alternate" title=#{title}>
 |]
diff --git a/yesod-newsfeed/Yesod/RssFeed.hs b/yesod-newsfeed/Yesod/RssFeed.hs
index 6e032041..14b85c9f 100644
--- a/yesod-newsfeed/Yesod/RssFeed.hs
+++ b/yesod-newsfeed/Yesod/RssFeed.hs
@@ -35,10 +35,10 @@ rssFeed = liftM RepRss . hamletToContent . template
 
 template :: Feed url -> HtmlUrl url
 template arg = [xhamlet|
-    \<?xml version="1.0" encoding="utf-8"?> 
-    <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"
-        <channel
-            <atom:link href=@{feedLinkSelf arg} rel="self" type=#{S8.unpack typeRss}
+    \<?xml version="1.0" encoding="utf-8"?>
+    <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+        <channel>
+            <atom:link href=@{feedLinkSelf arg} rel="self" type=#{S8.unpack typeRss}>
             <title>        #{feedTitle arg}
             <link>         @{feedLinkHome arg}
             <description>  #{feedDescription arg}
@@ -51,7 +51,7 @@ template arg = [xhamlet|
 
 entryTemplate :: FeedEntry url -> HtmlUrl url
 entryTemplate arg = [xhamlet|
-    <item
+    <item>
         <title>      #{feedEntryTitle arg}
         <link>       @{feedEntryLink arg}
         <guid>       @{feedEntryLink arg}
@@ -64,5 +64,5 @@ rssLink :: Route m
         -> Text -- ^ title
         -> GWidget s m ()
 rssLink r title = toWidgetHead [hamlet|
-    <link href=@{r} type=#{S8.unpack typeRss} rel="alternate" title=#{title}
+    <link href=@{r} type=#{S8.unpack typeRss} rel="alternate" title=#{title}>
     |]