From 55479b7bdd317aefedcf2094f442a63d10d36bdd Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 18 Oct 2010 06:39:42 +0200 Subject: [PATCH] Prepare for larger HTML/CSS rework. --- src/main/resources/i18n/sone.en.properties | 2 + src/main/resources/static/css/sone.css | 91 +++++++++++++++++++-- src/main/resources/static/images/sone.png | Bin 0 -> 1404 bytes src/main/resources/templates/include/head.html | 19 +++++ src/main/resources/templates/include/tail.html | 2 + src/main/resources/templates/include/viewPost.html | 38 +++++---- src/main/resources/templates/index.html | 8 +- 7 files changed, 133 insertions(+), 27 deletions(-) create mode 100644 src/main/resources/static/images/sone.png create mode 100644 src/main/resources/templates/include/head.html create mode 100644 src/main/resources/templates/include/tail.html diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties index 9b95cb8..9bc974d 100644 --- a/src/main/resources/i18n/sone.en.properties +++ b/src/main/resources/i18n/sone.en.properties @@ -118,5 +118,7 @@ Page.NoPermission.Text.NoPermission=You tried to do something that you do not ha Page.Logout.Title=Logout - Sone +View.Head.ProfileLink.Text=Your Profile + View.Post.DeleteLink=Delete Post View.Post.SendReply=Post Reply! diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css index 4b9928d..ab4d8a5 100644 --- a/src/main/resources/static/css/sone.css +++ b/src/main/resources/static/css/sone.css @@ -1,16 +1,48 @@ /* Sone Main CSS File */ -#sone h1 { - font-family: inherit; - font-size: 200%; +#sone { + width: 50em; + margin: auto; +} + +#sone a { + color: inherit; + text-decoration: none; +} + +#sone a:visited { + color: inherit; +} + +#sone #sidebar { + width: 200px; + position: absolute; +} + +#sone .profile-link { font-weight: bold; + color: #23e; } -#sone .error label { - color: red; +#sone #profile .picture { + float: left; +} + +#sone .nice-name { font-weight: bold; } +#sone #main { + margin-left: 200px; + padding-left: 1em; +} + +#sone .post { + padding: 1ex 0px; + border-bottom: solid 1px #ccc; + margin-bottom: 1ex; +} + #sone .post .author { display: inline; font-weight: bold; @@ -20,6 +52,53 @@ display: inline; } +#sone .post .time { + color: #666; + float: left; + font-size: 85%; +} + +#sone .post .delete { + float: right; +} + +#sone .post .replies { + clear: both; +} + +#sone .post .reply { + clear: both; + background-color: #eef; + font-size: 85%; + margin: 1ex 0px; + padding: 1ex; +} + +#sone .post .reply div { + font-size: inherit; /* or else fproxy's css rules will fuck us. */ +} + +#sone .post .reply .time { + float: none; + color: #666; + font-size: inherit; +} + +#sone .post .create-reply { + clear: both; +} + +#sone h1 { + font-family: inherit; + font-size: 200%; + font-weight: bold; +} + +#sone .error label { + color: red; + font-weight: bold; +} + #sone input.createpost.default { color: #888; -} +} \ No newline at end of file diff --git a/src/main/resources/static/images/sone.png b/src/main/resources/static/images/sone.png new file mode 100644 index 0000000000000000000000000000000000000000..e69aad1dbc7a292a85bc7e220a0ce01e94209c35 GIT binary patch literal 1404 zcmV-?1%vvDP)$(jh00004b3#c}2nYxW zdXaeHld)I4E__BE8 zVYbt&s?bF?1h(V=+(CL+6mH+*ERvnqgo>5^(|1z%^_3qYx- zto2p}0RvWOzJNXADW_1XAfR7*F@@`f#H>kd;vRW@J#R~b5t9=6HEcH&EOqkmM0nK zA5$M7;2MF`o5)t+3)o)<&pxU-&%D8VH+2Ba^R3fcO%;>u0X{SIK}hf-%29{!IuMsn z6+at}&7vDgv`< zj3m!!r~Xm|=2jXO6fgR@C5&dm0)GS7dV^;Wm_kh6ApoQICh(2X3vd!ydD@eqSpa4@ ztowC3vtU)gq>q@kkN`#u_Gwzp-r4YI@g{)j&^xNCHyyqBm#vQ6d1e5X!h%%*lWrPO z;=o71WkZ#Hztc9SQa>2^bA>dDI!v)aeOFl=21rA^lV4d=^5FWxUS|7UTdH z1=fO8^}4Dy1MR@)++Jtgy#OScCQn!Z5^hggUhpvwP~w0!!-(!@GG_xK+ez(X_yhP4 zc+k+VtKo5n!FvU`3%K89RMlbWlbE(>)CWtwm05gfE?4P zTRIyaE#4ErcHn7)x5wbgsqB+)%lJ$ + + + + + + +
diff --git a/src/main/resources/templates/include/tail.html b/src/main/resources/templates/include/tail.html new file mode 100644 index 0000000..0e7d491 --- /dev/null +++ b/src/main/resources/templates/include/tail.html @@ -0,0 +1,2 @@ +
+ diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html index 5d44274..e0d1e83 100644 --- a/src/main/resources/templates/include/viewPost.html +++ b/src/main/resources/templates/include/viewPost.html @@ -1,21 +1,27 @@
-
<% post.sone.niceName|html>
-
<% post.text|html>
+
+
<% post.sone.niceName|html>
+
<% post.text|html>
+
<% post.time|date format="MMM d, yyyy, HH:mm:ss">
<%if post.sone.isCurrent>
<%= View.Post.DeleteLink|l10n|html>
<%/if> -
-<%foreach post.replies reply> -
-
<% reply.sone.niceName|html>
-
<% reply.text|html>
-
<% reply.time|date format="MMM d, yyyy, HH:mm:ss">
+
+ <%foreach post.replies reply> +
+
+
<% reply.sone.niceName|html>
+
<% reply.text|html>
+
+
<% reply.time|date format="MMM d, yyyy, HH:mm:ss">
+
+ <%/foreach> +
+
+ + + + +
+
-<%/foreach> -
-
- - - - -
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 3db413d..3a5bb70 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,7 +1,4 @@ -
- - - +<%include include/head.html>