mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* started moving blog to bootstrap, but keeping the design. Currently far from done

Browse source
This commit is contained in:
"Vincent Ambo ext:(%22) 2013-04-28 23:07:56 +02:00
parent 92f4aecbee
commit 9af249c0b2
3 changed files with 64 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/Blog.hs
View file

@ -42,27 +42,49 @@ markdownCutoff = fromJust $ parseTime defaultTimeLocale "%s" "1367149834"
-- blog CSS (admin is still static) -- blog CSS (admin is still static)
stylesheetSource = $(luciusFile "res/blogstyle.lucius") stylesheetSource = $(luciusFile "../res/blogbs.lucius")
blogStyle = renderCssUrl undefined stylesheetSource blogStyle = renderCssUrl undefined stylesheetSource
-- <link rel="stylesheet" type="text/css" href="/static/blogv34.css" media="all">
{-
<div class="header">
<p style="clear: both;">
<span class="contacts" id="cosx">^{contactInfo}
<span class="righttext">^{preEscapedToHtml $ rightText lang}
<div class="middle">
^{body}
<div class="footer">
^{showFooter lang $ pack version}
<div class="centerbox">
<span style="font-size:17px;font-family:Helvetica;">ಠ_ಠ
-}
-- blog HTML -- blog HTML
blogTemplate :: BlogLang -> Text -> Html -> Html blogTemplate :: BlogLang -> Text -> Html -> Html
blogTemplate lang t_append body = [shamlet| blogTemplate lang t_append body = [shamlet|
$doctype 5 $doctype 5
<head> <head>
<title>#{blogTitle lang t_append} <title>#{blogTitle lang t_append}
<link rel="stylesheet" type="text/css" href="/static/blogv34.css" media="all"> <link rel="stylesheet" type="text/css" href="/static/bootstrap.css" media="all">
<link rel="stylesheet" type="text/css" href="/static/blogv300.css" media="all">
<link rel="alternate" type="application/rss+xml" title="RSS-Feed" href=#{rssUrl}> <link rel="alternate" type="application/rss+xml" title="RSS-Feed" href=#{rssUrl}>
<meta http-equiv="content-type" content="text/html;charset=UTF-8"> <meta http-equiv="content-type" content="text/html;charset=UTF-8">
<body> <body>
<div class="header"> <div .container .header>
<div .row>
<div .span12 .blogtitle>
<a class="btitle" href=#{append "/" (show' lang)}>#{blogTitle lang empty} <a class="btitle" href=#{append "/" (show' lang)}>#{blogTitle lang empty}
<p style="clear: both;"> <div .row>
<span class="contacts" id="cosx">^{contactInfo} <br>
<span class="righttext">^{preEscapedToHtml $ rightText lang} <div .span6>
<div class="middle"> <span .contacts #cosx>^{contactInfo}
<div .span6>
<span .righttext>^{preEscapedToHtml $ rightText lang}
<div .container>
^{body} ^{body}
<div class="footer"> <div .container>
<footer>
^{showFooter lang $ pack version} ^{showFooter lang $ pack version}
<div class="centerbox"> <div class="centerbox">
<span style="font-size:17px;font-family:Helvetica;">ಠ_ಠ <span style="font-size:17px;font-family:Helvetica;">ಠ_ಠ
@ -98,22 +120,31 @@ renderEntryMarkdown = markdown def {msXssProtect = False} . fromStrict
renderEntries :: Bool -> [Entry] -> Text -> Maybe Html -> Html renderEntries :: Bool -> [Entry] -> Text -> Maybe Html -> Html
renderEntries showAll entries topText footerLinks = [shamlet| renderEntries showAll entries topText footerLinks = [shamlet|
<div .row>
<div .span12>
<p>
<span class="innerTitle">#{topText} <span class="innerTitle">#{topText}
<div class="innerContainer">
<ul style="max-width:57em;">
$forall entry <- elist $forall entry <- elist
<li> <div .row >
$if (isEntryMarkdown entry) <div .span2>
<a href=#{linkElems entry}>#{linkText $ length $ comments entry} <a #bar href=#{linkElems entry}>
<b>#{title entry} <b>#{title entry}
<br>
<i>#{pack $ formatTime defaultTimeLocale "%Y-%M-%d" $ edate entry}
<br>
#{linkText $ length $ comments entry}
#{cHead $ lang entry}
<div .span10>
$if (isEntryMarkdown entry)
^{renderEntryMarkdown $ append " " $ btext entry} ^{renderEntryMarkdown $ append " " $ btext entry}
$else $else
<a href=#{linkElems entry}>#{linkText $ length $ comments entry}
^{preEscapedToHtml $ append " " $ btext entry} ^{preEscapedToHtml $ append " " $ btext entry}
$if ((/=) (mtext entry) empty) $if ((/=) (mtext entry) empty)
<p><a href=#{linkElems entry}>#{readMore $ lang entry} <p>
<a #foo href=#{linkElems entry}>#{readMore $ lang entry}
$else $else
<br>&nbsp; <br>&nbsp;
<hr>
$maybe links <- footerLinks $maybe links <- footerLinks
^{links} ^{links}
|] |]
@ -157,7 +188,7 @@ renderEntry e@Entry{..} = [shamlet|
^{preEscapedToHtml $ btext} ^{preEscapedToHtml $ btext}
<p>^{preEscapedToHtml $ mtext} <p>^{preEscapedToHtml $ mtext}
<div class="innerBoxComments"> <div class="innerBoxComments">
<div class="cHead">#{cHead lang} <div class="cHead">#{cHead lang}:
<ul style="max-width:57em;">#{renderComments comments lang} <ul style="max-width:57em;">#{renderComments comments lang}
^{renderCommentBox lang entryId} ^{renderCommentBox lang entryId}
|] |]

4
src/Locales.hs
View file

@ -109,8 +109,8 @@ noComments DE = " Keine Kommentare"
noComments EN = " No comments yet" noComments EN = " No comments yet"
cHead :: BlogLang -> Text cHead :: BlogLang -> Text
cHead DE = "Kommentare:" cHead DE = "Kommentare"
cHead EN = "Comments:" cHead EN = "Comments"
cwHead :: BlogLang -> Text cwHead :: BlogLang -> Text
cwHead DE = "Kommentieren:" cwHead DE = "Kommentieren:"

2
src/Main.hs
View file

@ -95,7 +95,7 @@ tazBlog acid captchakey = do
ok $ toResponse $ adminIndex ("tazjin" :: Text) ok $ toResponse $ adminIndex ("tazjin" :: Text)
, dir "admin" $ ok $ toResponse adminLogin , dir "admin" $ ok $ toResponse adminLogin
, dir "dologin" $ processLogin acid , dir "dologin" $ processLogin acid
, do dirs "static/blogv34.css" nullDir , do dirs "static/blogv300.css" nullDir
setHeaderM "content-type" "text/css" setHeaderM "content-type" "text/css"
setHeaderM "cache-control" "max-age=630720000" setHeaderM "cache-control" "max-age=630720000"
setHeaderM "expires" "Tue, 20 Jan 2037 04:20:42 GMT" setHeaderM "expires" "Tue, 20 Jan 2037 04:20:42 GMT"