From dcc2173a0530d95d5b5eca9119077b740297a1b9 Mon Sep 17 00:00:00 2001 From: Mark Lentczner Date: Thu, 4 Nov 2010 22:45:07 -0700 Subject: [PATCH] fix bad commit from before --- seed/Template.hs | 21 +++++++++++---------- seed/lib/DevUtils.hs | 7 +++++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/seed/Template.hs b/seed/Template.hs index 3dbcb4d..36cb947 100644 --- a/seed/Template.hs +++ b/seed/Template.hs @@ -1,10 +1,11 @@ -module Template where - -import Text.Html - -nu = () -- DO NOT DELETE THIS - -page = thehtml << [ - h1 << "Hi!", - paragraph << "testing" - ] +module Template where + +import Text.Html + +nu = () -- DO NOT DELETE THIS + +page = thehtml << [ + h1 << "Hi!", + paragraph << "testing", + ulist << map (li <<) [ bold << "one", italics << "two", tt << "three"] + ] diff --git a/seed/lib/DevUtils.hs b/seed/lib/DevUtils.hs index e21c6b7..1dc9b37 100644 --- a/seed/lib/DevUtils.hs +++ b/seed/lib/DevUtils.hs @@ -63,9 +63,9 @@ topbar = thediv ! [identifier "topbar"] << [ , ulist ! [theclass "right"] << map li siteLinks ] where + makelink (title, url) = anchor ! [href url] << title makeDocLink doc = anchor ! [href $ docUrl doc, target "_blank"] << docName doc - makelink (title, url) = anchor ! [href url] << title communityLinks = [ ("Platform", "http://hackage.haskell.org/platform/") , ("Hackage", "http://hackage.haskell.org/packages/hackage.html") @@ -73,18 +73,21 @@ topbar = thediv ! [identifier "topbar"] << [ , ("Stack Overflow", "http://stackoverflow.com/questions/tagged?tagnames=haskell") ] + siteLinks = [ makelink ("Home", "/") , makelink ("Project", "/project") , makelink ("Documentation", "/documentation") +++ unordList (map makeDocLink documents) , makelink ("Help", "/help") - , ("Help", "/help") ] + scripts :: [String] -> Html scripts = toHtml . map script where script s = tag "script" ! [ thetype "text/javascript", src s ] << noHtml + + data Doc = Doc { docId :: String, docName :: String, docUrl :: String } documents :: [Doc]