haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Michael Snoyman 2012-03-23 16:02:50 +02:00
parent f69f0b0cba
commit 1f1c6ca9d4
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yesod-core/Yesod/Internal/Core.hs
View File

@ -586,12 +586,12 @@ $forall s <- stylesheets
$forall s <- css $forall s <- css
$maybe t <- right $ snd s $maybe t <- right $ snd s
$maybe media <- fst s $maybe media <- fst s
<link rel=stylesheet media=#{media} href=#{t} <link rel=stylesheet media=#{media} href=#{t}>
$nothing $nothing
<link rel=stylesheet href=#{t} <link rel=stylesheet href=#{t}>
$maybe content <- left $ snd s $maybe content <- left $ snd s
$maybe media <- fst s $maybe media <- fst s
<style media=#{media}>#{content} <style media=#{media}>#{content}>
$nothing $nothing
<style>#{content} <style>#{content}
$case jsLoader master $case jsLoader master

8
yesod-core/helloworld.hs
View File

@ -3,6 +3,7 @@
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
import Yesod.Core import Yesod.Core
import Control.Monad.IO.Class (liftIO)
import Network.Wai.Handler.Warp (run) import Network.Wai.Handler.Warp (run)
import Data.Text (unpack) import Data.Text (unpack)
import Text.Julius (julius) import Text.Julius (julius)
@ -31,13 +32,14 @@ handleSubMultiR x = do
return . RepPlain . toContent . show $ (x, y) return . RepPlain . toContent . show $ (x, y)
data HelloWorld = HelloWorld { getSubsite :: String -> Subsite } data HelloWorld = HelloWorld { getSubsite :: String -> Subsite }
mkYesod "HelloWorld" [$parseRoutes| mkYesod "HelloWorld" [parseRoutes|
/ RootR GET / RootR GET
/subsite/#String SubsiteR Subsite getSubsite /subsite/#String SubsiteR Subsite getSubsite
|] |]
instance Yesod HelloWorld where instance Yesod HelloWorld where
approot _ = "" addStaticContent a b c = do
yepnopeJs _ = Just $ Left "http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.0.6/modernizr.min.js" liftIO $ print (a, b, c)
return Nothing
getRootR = do getRootR = do
$(logOther "HAHAHA") "Here I am" $(logOther "HAHAHA") "Here I am"

12
yesod-newsfeed/Yesod/AtomFeed.hs
View File

@ -39,10 +39,10 @@ atomFeed = liftM RepAtom . hamletToContent . template
template :: Feed url -> HtmlUrl url template :: Feed url -> HtmlUrl url
template arg = [xhamlet| template arg = [xhamlet|
\<?xml version="1.0" encoding="utf-8"?> \<?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} <title>#{feedTitle arg}
<link rel=self href=@{feedLinkSelf arg} <link rel=self href=@{feedLinkSelf arg}>
<link href=@{feedLinkHome arg} <link href=@{feedLinkHome arg}>
<updated>#{formatW3 $ feedUpdated arg} <updated>#{formatW3 $ feedUpdated arg}
<id>@{feedLinkHome arg} <id>@{feedLinkHome arg}
$forall entry <- feedEntries arg $forall entry <- feedEntries arg
@ -51,9 +51,9 @@ template arg = [xhamlet|
entryTemplate :: FeedEntry url -> HtmlUrl url entryTemplate :: FeedEntry url -> HtmlUrl url
entryTemplate arg = [xhamlet| entryTemplate arg = [xhamlet|
<entry <entry>
<id>@{feedEntryLink arg} <id>@{feedEntryLink arg}
<link href=@{feedEntryLink arg} <link href=@{feedEntryLink arg}>
<updated>#{formatW3 $ feedEntryUpdated arg} <updated>#{formatW3 $ feedEntryUpdated arg}
<title>#{feedEntryTitle arg} <title>#{feedEntryTitle arg}
<content type=html> <content type=html>
@ -67,5 +67,5 @@ atomLink :: Route m
-> Text -- ^ title -> Text -- ^ title
-> GWidget s m () -> GWidget s m ()
atomLink r title = toWidgetHead [hamlet| 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}>
|] |]

12
yesod-newsfeed/Yesod/RssFeed.hs
View File

@ -35,10 +35,10 @@ rssFeed = liftM RepRss . hamletToContent . template
template :: Feed url -> HtmlUrl url template :: Feed url -> HtmlUrl url
template arg = [xhamlet| template arg = [xhamlet|
\<?xml version="1.0" encoding="utf-8"?> \<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel <channel>
<atom:link href=@{feedLinkSelf arg} rel="self" type=#{S8.unpack typeRss} <atom:link href=@{feedLinkSelf arg} rel="self" type=#{S8.unpack typeRss}>
<title> #{feedTitle arg} <title> #{feedTitle arg}
<link> @{feedLinkHome arg} <link> @{feedLinkHome arg}
<description> #{feedDescription arg} <description> #{feedDescription arg}
@ -51,7 +51,7 @@ template arg = [xhamlet|
entryTemplate :: FeedEntry url -> HtmlUrl url entryTemplate :: FeedEntry url -> HtmlUrl url
entryTemplate arg = [xhamlet| entryTemplate arg = [xhamlet|
<item <item>
<title> #{feedEntryTitle arg} <title> #{feedEntryTitle arg}
<link> @{feedEntryLink arg} <link> @{feedEntryLink arg}
<guid> @{feedEntryLink arg} <guid> @{feedEntryLink arg}
@ -64,5 +64,5 @@ rssLink :: Route m
-> Text -- ^ title -> Text -- ^ title
-> GWidget s m () -> GWidget s m ()
rssLink r title = toWidgetHead [hamlet| 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}>
|] |]