about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Blog.hs6
-rw-r--r--src/Main.hs3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Blog.hs b/src/Blog.hs
index 0e6ed519547b..7e719466a014 100644
--- a/src/Blog.hs
+++ b/src/Blog.hs
@@ -43,7 +43,7 @@ blogTemplate lang t_append body = H.docTypeHtml $ do --add body
     H.head $ do
         H.title $ (toHtml $ blogTitle lang t_append)
         H.link ! A.rel "alternate" ! A.type_ "application/rss+xml" ! A.title "RSS-Feed" ! A.href "/rss"
-        H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/res/blog.css" ! A.media "all"
+        H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/static/blogv31.css" ! A.media "all"
         H.meta ! A.httpEquiv "content-type" ! A.content "text/html;charset=UTF-8"
         --H.style ! A.type_ "text/css" ! A.title "iOS iMessage" ! A.media "screen and (max-device-width: 1024px)" $ "#cosx{display:none;}"
         preEscapedText analytics
@@ -175,7 +175,7 @@ showSiteNotice = H.docTypeHtml $ do
 adminTemplate :: Text -> Html -> Html
 adminTemplate title body = H.docTypeHtml $ do
     H.head $ do
-        H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/res/admin.css" ! A.media "all"
+        H.link ! A.rel "stylesheet" ! A.type_ "text/css" ! A.href "/static/admin.css" ! A.media "all"
         H.meta ! A.httpEquiv "content-type" ! A.content "text/html;charset=UTF-8"
         H.title $ toHtml $ T.append "TazBlog Admin: " title
     H.body
@@ -191,7 +191,7 @@ adminLogin = adminTemplate "Login" $
             ! A.name "account" -- ! A.value "tazjin" ! A.readonly "1"
         H.p $ "Passwort"
         H.p $ H.input ! A.type_ "password" ! A.style "font-size: 2;" ! A.name "password"
-        H.p $ H.input ! A.alt "Anmelden" ! A.type_ "image" ! A.src "/res/signin.gif"
+        H.p $ H.input ! A.alt "Anmelden" ! A.type_ "image" ! A.src "/static/signin.gif"
 
 adminIndex :: Text -> Html
 adminIndex sUser = adminTemplate "Index" $
diff --git a/src/Main.hs b/src/Main.hs
index f0c28b9b5bd2..f1bc9114a6cd 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -75,6 +75,9 @@ tazBlog acid = do
               ok $ toResponse $ adminIndex ("tazjin" :: Text)
          , dir "admin" $ ok $ toResponse $ adminLogin 
          , dir "dologin" $ processLogin acid
+         , do setHeaderM "cache-control" "max-age=630720000"
+              setHeaderM "expires" "Tue, 20 Jan 2037 04:20:42 GMT"
+              dir "static" $ serveDirectory DisableBrowsing [] "../res"
          , serveDirectory DisableBrowsing [] "../res"
          , notFound $ toResponse $ showError NotFound DE
          ]