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

* cleaned up res/ folder

Browse source 
* serving static/ content from res/ with 20 years expiration date
* linen texture
This commit is contained in:
Vincent Ambo 2012-03-22 14:34:04 +01:00
parent f6f066a93e
commit 6a8ffaf25a
9 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/blog.css
View file

@ -1 +0,0 @@
@charset UTF-8;@font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'), local(PTSans-Regular), url(http://themes.googleusercontent.com/static/fonts/ptsans/v2/7YGmE4Ls5b94ct65u07hVQLUuEpTyoUstqEm5AMlJo4.woff) format(woff);}html,body{margin:0;padding:0;}body{padding-top:10px;font-family:'PT Sans', sans-serif;min-height:850px;background-color:#4A525A;color:#EEE;}a{color:#000;}input,textarea,select{border:1px solid #555;font-size:15px;line-height:1.2em;width:550px;background:#F9F9F9;-webkit-border-radius:.5em;padding:.5em;}.header{z-index:4;padding-left:20px;padding-bottom:70px;padding-top:30px;position:relative;box-shadow:0 6px 5px 1px #848F9A;}.link{color:#EEE;}.middle{position:relative;z-index:2;display:block;width:100%;padding-top:40px;background-color:#EEE;color:#000;}.footer{z-index:4;position:relative;background-color:#4A525A;margin-top:30px;padding-top:20px;box-shadow:0 -6px 5px 1px #848F9A;color:#EEE;}.btitle{text-decoration:none;color:#EEE;font-size:x-large;font-weight:700;margin-top:15px;margin-bottom:10px;}.contacts{float:left;font-weight:bolder;}.righttext{float:right;padding-right:20px;}.rightbox{text-align:right;padding-right:14px;}.innerTitle{margin-left:10px;font-weight:700;}.innerBoxComments{margin-left:10px;}.innerContainer{padding-right:20px;}.centerbox{text-align:center;min-height:45px;}.cInput{margin-left:15px;}.tt{font-family:"courier new",courier,monospace;font-size:13px;}.cl{text-decoration:none;color:#000;}.cHead{font-size:large;font-weight:700;}.notFoundFace{text-align:center;font-size:100px;}.notFoundText{text-align:center;font-size:24px;font-weight:700;}

8
res/blogstyle.css
View file

@ -14,10 +14,8 @@ html, body{
} }
body { body {
padding-top: 10px;
font-family: 'PT Sans', sans-serif; font-family: 'PT Sans', sans-serif;
min-height: 850px; min-height: 850px;
background-color: #4A525A;
color: #EEE; color: #EEE;
} }
@ -37,12 +35,13 @@ input, textarea, select {
/* site sections */ /* site sections */
.header { .header {
background: url(/static/ios-linen.jpg);
z-index: 4; z-index: 4;
padding-left: 20px; padding-left: 20px;
padding-bottom: 70px; padding-bottom: 70px;
padding-top: 30px; padding-top: 30px;
position: relative; position: relative;
box-shadow: 0 6px 5px 1px #848F9A; box-shadow: 0 6px 5px 1px #343537;
} }
.link { .link {
@ -60,12 +59,13 @@ input, textarea, select {
} }
.footer { .footer {
background: url(/static/ios-linen.jpg);
z-index: 4; z-index: 4;
position: relative; position: relative;
background-color: #4A525A; background-color: #4A525A;
margin-top: 30px; margin-top: 30px;
padding-top: 20px; padding-top: 20px;
box-shadow: 0 -6px 5px 1px #848F9A; box-shadow: 0 -6px 5px 1px #343537;
color: #EEE; color: #EEE;
} }

1
res/blogv31.css Normal file
View file

@ -0,0 +1 @@
@charset UTF-8;@font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'), local(PTSans-Regular), url(http://themes.googleusercontent.com/static/fonts/ptsans/v2/7YGmE4Ls5b94ct65u07hVQLUuEpTyoUstqEm5AMlJo4.woff) format(woff);}html,body{margin:0;padding:0;}body{font-family:'PT Sans', sans-serif;min-height:850px;color:#EEE;}a{color:#000;}input,textarea,select{border:1px solid #555;font-size:15px;line-height:1.2em;width:550px;background:#F9F9F9;-webkit-border-radius:.5em;padding:.5em;}.header{background:url(/static/ios-linen.jpg);z-index:4;padding-left:20px;padding-bottom:70px;padding-top:30px;position:relative;box-shadow:0 6px 5px 1px #343537;}.link{color:#EEE;}.middle{position:relative;z-index:2;display:block;width:100%;padding-top:40px;background-color:#EEE;color:#000;}.footer{background:url(/static/ios-linen.jpg);z-index:4;position:relative;background-color:#4A525A;margin-top:30px;padding-top:20px;box-shadow:0 -6px 5px 1px #343537;color:#EEE;}.btitle{text-decoration:none;color:#EEE;font-size:x-large;font-weight:700;margin-top:15px;margin-bottom:10px;}.contacts{float:left;font-weight:bolder;}.righttext{float:right;padding-right:20px;}.rightbox{text-align:right;padding-right:14px;}.innerTitle{margin-left:10px;font-weight:700;}.innerBoxComments{margin-left:10px;}.innerContainer{padding-right:20px;}.centerbox{text-align:center;min-height:45px;}.cInput{margin-left:15px;}.tt{font-family:"courier new",courier,monospace;font-size:13px;}.cl{text-decoration:none;color:#000;}.cHead{font-size:large;font-weight:700;}.notFoundFace{text-align:center;font-size:100px;}.notFoundText{text-align:center;font-size:24px;font-weight:700;}

BIN
res/drama.wav
View file

Binary file not shown.

BIN
res/ios-linen.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
res/loginBoxTop.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 606 B

BIN
res/twtbtn.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.9 KiB

6
src/Blog.hs
View file

@ -43,7 +43,7 @@ blogTemplate lang t_append body = H.docTypeHtml $ do --add body
H.head $ do H.head $ do
H.title $ (toHtml $ blogTitle lang t_append) 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 "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.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;}" --H.style ! A.type_ "text/css" ! A.title "iOS iMessage" ! A.media "screen and (max-device-width: 1024px)" $ "#cosx{display:none;}"
preEscapedText analytics preEscapedText analytics
@ -175,7 +175,7 @@ showSiteNotice = H.docTypeHtml $ do
adminTemplate :: Text -> Html -> Html adminTemplate :: Text -> Html -> Html
adminTemplate title body = H.docTypeHtml $ do adminTemplate title body = H.docTypeHtml $ do
H.head $ 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.meta ! A.httpEquiv "content-type" ! A.content "text/html;charset=UTF-8"
H.title $ toHtml $ T.append "TazBlog Admin: " title H.title $ toHtml $ T.append "TazBlog Admin: " title
H.body H.body
@ -191,7 +191,7 @@ adminLogin = adminTemplate "Login" $
! A.name "account" -- ! A.value "tazjin" ! A.readonly "1" ! A.name "account" -- ! A.value "tazjin" ! A.readonly "1"
H.p $ "Passwort" H.p $ "Passwort"
H.p $ H.input ! A.type_ "password" ! A.style "font-size: 2;" ! A.name "password" 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 :: Text -> Html
adminIndex sUser = adminTemplate "Index" $ adminIndex sUser = adminTemplate "Index" $

3
src/Main.hs
View file

@ -75,6 +75,9 @@ tazBlog acid = 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 setHeaderM "cache-control" "max-age=630720000"
setHeaderM "expires" "Tue, 20 Jan 2037 04:20:42 GMT"
dir "static" $ serveDirectory DisableBrowsing [] "../res"
, serveDirectory DisableBrowsing [] "../res" , serveDirectory DisableBrowsing [] "../res"
, notFound $ toResponse $ showError NotFound DE , notFound $ toResponse $ showError NotFound DE
] ]