From de09c2cc68c1bc7914687a228aa3805ac8bcb9b1 Mon Sep 17 00:00:00 2001 From: "\"Vincent Ambo ext:(%22)" Date: Sat, 27 Apr 2013 22:15:46 +0200 Subject: * fixed comment deletion link * updated contact info * fixed compatibility with current blaze --- src/Blog.hs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'src/Blog.hs') diff --git a/src/Blog.hs b/src/Blog.hs index fd31530c1d37..4906ad5d4004 100644 --- a/src/Blog.hs +++ b/src/Blog.hs @@ -10,7 +10,7 @@ import Data.Text (Text, append, pack, empty) import Data.Time import Network.Captcha.ReCaptcha import System.Locale (defaultTimeLocale) -import Text.Blaze (preEscapedText) +import Text.Blaze.Html (preEscapedToHtml) import Text.Hamlet import Text.Lucius import Locales @@ -47,7 +47,7 @@ $doctype 5 #{blogTitle lang empty}

^{contactInfo iMessage} - ^{preEscapedText $ rightText lang} + ^{preEscapedToHtml $ rightText lang}

^{body}
@@ -89,7 +89,7 @@ renderEntries showAll entries topText footerLinks = [shamlet| $forall entry <- elist
  • #{linkText $ length $ comments entry} - ^{preEscapedText $ append " " $ btext entry} + ^{preEscapedToHtml $ append " " $ btext entry} $if ((/=) (mtext entry) empty)

    #{readMore $ lang entry} $else @@ -130,8 +130,8 @@ renderEntry Entry{..} = [shamlet|

    • - ^{preEscapedText $ btext} -

      ^{preEscapedText $ mtext} + ^{preEscapedToHtml $ btext} +

      ^{preEscapedToHtml $ mtext}

      #{cHead lang}
        #{renderComments comments lang} @@ -146,7 +146,7 @@ renderComments comments lang = [shamlet| $forall comment <- comments
      • #{append (cauthor comment) ": "} - ^{preEscapedText $ ctext comment} + ^{preEscapedToHtml $ ctext comment}

        #{timeString $ cdate comment} |] where @@ -172,17 +172,14 @@ $doctype 5 Impressum <body> - <h2> - Impressum und # - <a alt="Verantwortlich im Sinne des Presserechtes">ViSdP - <i>[German law demands this] + <h2>Impressum <br> <p> Vincent Ambo <br> - Benfleetstr. 8 + Gyllenborgsgatan 8, LGH 1306 <br> - 50858 Köln + 11243 Stockholm <p><a href="/" style="color:black;">Back |] @@ -298,7 +295,7 @@ editComments comments eId = [shamlet| |] where cPostTime = formatTime defaultTimeLocale "%c" - cDeleteLink cd = concat ["/admin/cdelete", show eId, formatTime defaultTimeLocale "/%s%Q" cd] + cDeleteLink cd = concat ["/admin/cdelete/", show eId, formatTime defaultTimeLocale "/%s%Q" cd] commentDeleted :: EntryId -> Html commentDeleted eId = adminTemplate "Kommentar gelöscht" $ [shamlet| -- cgit 1.4.1