diff options
| author | Vincent Ambo <tazjin@google.com> | 2019-08-25T19·22+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2019-08-25T19·22+0100 |
| commit | 094aafecddc61f36de178205ba9bfd592dc3481f (patch) | |
| tree | 8b33d5028464b2e68a992108974967a5e21d9f54 /services | |
| parent | 6450347bf13ae8f7f5b9004cbaee353f5670c628 (diff) | |
chore(tazblog): Remove 'read more' feature r/62
Diffstat (limited to 'services')
| -rw-r--r-- | services/tazblog/src/Blog.hs | 14 | ||||
| -rw-r--r-- | services/tazblog/src/BlogStore.hs | 6 | ||||
| -rw-r--r-- | services/tazblog/src/RSS.hs | 2 |
3 files changed, 7 insertions, 15 deletions
diff --git a/services/tazblog/src/Blog.hs b/services/tazblog/src/Blog.hs index 15ac9993eba4..6c61c2ce26c1 100644 --- a/services/tazblog/src/Blog.hs +++ b/services/tazblog/src/Blog.hs @@ -82,13 +82,9 @@ $forall entry <- entries <aside .date> #{pack $ formatTime defaultTimeLocale "%Y-%m-%d" $ edate entry} $if (isEntryMarkdown entry) - ^{renderEntryMarkdown $ btext entry} + ^{renderEntryMarkdown $ text entry} $else - ^{preEscapedToHtml $ btext entry} - $if ((/=) (mtext entry) empty) - <p> - <a .uncoloured-link href=#{linkElems entry}> - #{readMore $ lang entry} + ^{preEscapedToHtml $ text entry} <hr> $maybe links <- pageLinks ^{links} @@ -126,11 +122,9 @@ renderEntry e@Entry {..} = <aside .date> #{pack $ formatTime defaultTimeLocale "%Y-%m-%d" edate} $if (isEntryMarkdown e) - ^{renderEntryMarkdown btext} - <p>^{renderEntryMarkdown $ mtext} + ^{renderEntryMarkdown text} $else - ^{preEscapedToHtml $ btext} - <p>^{preEscapedToHtml $ mtext} + ^{preEscapedToHtml $ text} <hr> |] diff --git a/services/tazblog/src/BlogStore.hs b/services/tazblog/src/BlogStore.hs index 0472fef56bc9..4e5171252e7d 100644 --- a/services/tazblog/src/BlogStore.hs +++ b/services/tazblog/src/BlogStore.hs @@ -57,8 +57,7 @@ data Entry lang :: BlogLang, author :: Text, title :: Text, - btext :: Text, - mtext :: Text, + text :: Text, edate :: Day } deriving (Eq, Ord, Show) @@ -170,8 +169,7 @@ entryFromDNS cache eid = do lang = EN, author = "tazjin", title = t, - btext = text, - mtext = "", + text = text, edate = d } ) diff --git a/services/tazblog/src/RSS.hs b/services/tazblog/src/RSS.hs index d3e78ba0fb85..0ee9a6e43539 100644 --- a/services/tazblog/src/RSS.hs +++ b/services/tazblog/src/RSS.hs @@ -29,7 +29,7 @@ createItem :: Entry -> Item createItem Entry {..} = [ Title $ T.unpack title, Link $ makeLink lang entryId, - Description $ T.unpack btext, + Description $ T.unpack text, PubDate $ UTCTime edate $ secondsToDiffTime 0 ] |