From 71b2ccd9275bacc789bce7f94d5792a24598460b Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Thu, 19 Nov 2015 18:16:34 +0100
Subject: [PATCH] Begin cleaning up old things

---
 src/Blog.hs    |  2 --
 src/Locales.hs |  7 +------
 src/Server.hs  | 19 +++----------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/Blog.hs b/src/Blog.hs
index 5659ad595..34b2aaf52 100644
--- a/src/Blog.hs
+++ b/src/Blog.hs
@@ -57,8 +57,6 @@ $doctype 5
             <br>
             <div .span6>
               <span .contacts #cosx>^{contactInfo}
-            <div .span6>
-              <span .righttext>^{preEscapedToHtml $ rightText lang}
       <div .container>
         ^{body}
     <footer .footer>
diff --git a/src/Locales.hs b/src/Locales.hs
index 576ef11ce..b387171ab 100644
--- a/src/Locales.hs
+++ b/src/Locales.hs
@@ -118,12 +118,7 @@ notFoundTitle EN = "Not found"
 
 notFoundText :: BlogLang -> Text
 notFoundText DE = "Das gewünschte Objekt wurde leider nicht gefunden."
-notFoundText EN = "The requested object could unfortunately not be found."
-
--- right side text (this is inserted AS IS. Escape HTML!)
-rightText :: BlogLang -> Text
-rightText DE = "English version <a href=\"/en\" class=\"link\">available here</a>."
-rightText EN = "Deutsche Version <a href=\"/de\" class=\"link\">hier verf&uuml;gbar</a>."
+notFoundText EN = "The requested object could not be found."
 
 -- static information
 repoURL   :: Text = "http://hg.tazj.in/tazblog-haskell"
diff --git a/src/Server.hs b/src/Server.hs
index 85dc06e53..b71b070f1 100644
--- a/src/Server.hs
+++ b/src/Server.hs
@@ -15,21 +15,12 @@ import           Data.Text                    (Text)
 import qualified Data.Text                    as T
 import           Data.Time
 import           Happstack.Server             hiding (Session)
-import           Happstack.Server.Compression
 
 import Blog
 import BlogDB  hiding (updateEntry)
 import Locales
 import RSS
 
-
-instance FromReqURI BlogLang where
-  fromReqURI sub =
-    case map toLower sub of
-      "de" -> Just DE
-      "en" -> Just EN
-      _    -> Nothing
-
 tmpPolicy :: BodyPolicy
 tmpPolicy = defaultBodyPolicy "/tmp" 0 200000 1000
 
@@ -39,13 +30,9 @@ runBlog acid port respath =
 
 tazBlog :: AcidState Blog -> String -> ServerPart Response
 tazBlog acid resDir = do
-    compr <- compressedResponseFilter
-    msum [ path $ \(lang :: BlogLang) -> blogHandler acid lang
-         , nullDir >> showIndex acid EN
-         , dir " " $ nullDir >>
-            seeOther ("https://plus.google.com/115916629925754851590" :: Text) (toResponse ())
+    msum [ nullDir >> blogHandler acid EN
+         , dir "de" $ blogHandler acid DE
          , path $ \(year :: Int) -> path $ \(month :: Int) -> path $ \(id_ :: String) -> formatOldLink year month id_
-         , dir "res" $ serveDirectory DisableBrowsing [] "../res"
          , dir "notice" $ ok $ toResponse showSiteNotice
          {- :Admin handlers -}
          , do dirs "admin/postentry" nullDir
@@ -75,7 +62,7 @@ tazBlog acid resDir = do
               setHeaderM "expires" "Tue, 20 Jan 2037 04:20:42 GMT"
               dir "static" $ serveDirectory DisableBrowsing [] resDir
          , serveDirectory DisableBrowsing [] resDir
-         , notFound $ toResponse $ showError NotFound DE
+         , notFound $ toResponse $ showError NotFound EN
          ]
 
 blogHandler :: AcidState Blog -> BlogLang -> ServerPart Response