From 743b44be02183d60ae357c1d48c066f8a35a9214 Mon Sep 17 00:00:00 2001 From: the_mgt Date: Thu, 19 Jul 2012 23:42:42 +0200 Subject: [PATCH] Same penultimo fixed for blog_view as in stable-81x, but based on the slightly more advanced webcit.css from master this will move the "x comments | permalink" into the blog_post div, add a horizontal ruler, indent post.html and comment.html, move the blog_post_header under the blog_content (maybe we should rename it to footer if it we decide to keep it this way) and indents the comment.html, too. Some text was added to both html file which should become translatable in the future. And of course it is styled as in stable-81x now --- webcit/blogview_renderer.c | 12 ++--- webcit/static/styles/blog.css | 60 ++++++++++++++++++++----- webcit/static/styles/webcit.css | 61 +------------------------- webcit/static/t/view_blog/comment.html | 48 ++++++++++---------- webcit/static/t/view_blog/post.html | 28 ++++++------ 5 files changed, 95 insertions(+), 114 deletions(-) diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c index 3e05a377c..fa2c64752 100644 --- a/webcit/blogview_renderer.c +++ b/webcit/blogview_renderer.c @@ -54,12 +54,12 @@ void blogpost_render(struct blogpost *bp, int with_comments) if (with_comments) { /* Show any existing comments, then offer the comment box */ - wc_printf("\n"); + wc_printf("\n"); wc_printf(_("%d comments"), bp->num_msgs - 1); - wc_printf(" | %s", _("permalink")); - wc_printf("
\n"); + wc_printf("\n"); for (i=1; inum_msgs; ++i) { read_message(WC->WBuf, HKEY("view_blog_comment"), bp->msgs[i], NULL, &Mime); } @@ -68,14 +68,14 @@ void blogpost_render(struct blogpost *bp, int with_comments) else { /* Show only the number of comments */ - wc_printf("top_level_id); + wc_printf("top_level_id); urlescputs(ChrPtr(WC->CurRoom.name)); wc_printf("#comments\">"); wc_printf(_("%d comments"), bp->num_msgs - 1); - wc_printf(" | | %s", _("permalink")); - wc_printf("


\n"); + wc_printf("
\n\n"); } } diff --git a/webcit/static/styles/blog.css b/webcit/static/styles/blog.css index e0d85dd5c..9242b55f6 100644 --- a/webcit/static/styles/blog.css +++ b/webcit/static/styles/blog.css @@ -1,33 +1,69 @@ .blog_post { - padding-top: 0.5em; margin: 0.5em; width: 38em; - border-top: 1px solid #5C646B; } +.blog_post hr { + margin: 1em 0.25em; + padding: 0 0.25em; + border: 1px dotted #5C646B; +} -.blog_post_title a { - font-size: large; - color: #5C646B; +.blog_post_title a:link, .blog_post_title a:visited, .blog_post_title a:active { + font-size: 150%; + font-weight: bold; + color: #000; } + +.blog_post_title a:hover { + color: #0E73E3; +} + -.blog_post_header a, .blog_comment_header a { +.blog_post_header a:link, .blog_comment_header a:link { font-style: italic; color: #000; } -.blog_post_header, .blog_comment_header { - margin: 0.3em 0.5em; +.blog_post_header { + margin: 0 1em; /* adjust with .blog_show_comments_link */ font-size: smaller; } -.blog_post_content { +.blog_post_content, .blog_comment_content { font-family: serif; - font-size: small; + font-size: 90%; +} + +a.blog_show_comments_link:link, a.blog_show_comments_link:active, a.blog_show_comments_link:visited { + margin-left: 1em; + color: #000; + font-size: smaller; +} + +.blog_permalink_link { + font-size: smaller; } .blog_comment { - margin: 0.5em; - width: 30em; + margin: 0.5em; + padding: 0.5em 0.25em 0.25em; + width: 35em; + border-top: 1px dotted grey; + background-color: #EDEDE0; +} + +.blog_comment_header { + font-size: smaller; +} + +.blog_comment_date {float:right} + +.blog_comment_content { + margin: 0.25em; +} + +.post_a_comment_title { + font-size: 120%; } diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css index cd723a6b7..9d9067558 100644 --- a/webcit/static/styles/webcit.css +++ b/webcit/static/styles/webcit.css @@ -15,7 +15,7 @@ @import url("message.css"); @import url("modal.css"); @import url("service.css"); -@import url("blog.css") +@import url("blog.css"); @media print { input#toggler, .toolbar { display: none } @@ -1167,53 +1167,6 @@ a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event background: url(/static/webcit_icons/bubble.gif) no-repeat bottom; } - -/*---------- styles for the blog view -----------*/ - -.blog_post { -} - -.blog_post_title { - font-size: 150%; - font-weight: bold; -} - -.blog_post_title a:link, .blog_post_title a:visited, .blog_post_title a:active { - color: #000000; -} - -.blog_post_title a:hover { - color: #0000FF; -} - - -.blog_post_header { - font-size: 100%; - font-style: italic; -} - -.blog_post_content { -} - -.blog_comment { - border: 1px solid grey; - margin-top: 5px; - margin-bottom: 5px; - margin-left: 5%; - margin-right: 5%; - padding: 5px; -} - -.blog_comment_header { - margin-bottom: 1em; - font-size: 100%; - font-style: italic; -} - -.post_a_comment_title { - font-size: 120%; -} - /*---------- styles for the attachments form -----------*/ #attachments_form { @@ -1311,15 +1264,3 @@ a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event background: url('../webcit_icons/openid-small.gif') no-repeat scroll 0pt 50%; padding-left: 18px; } - -.older_blog_posts, .newer_blog_posts { - font-size: 110%; -} - -.older_blog_posts { - text-align: left; -} - -.newer_blog_posts { - text-align: right; -} diff --git a/webcit/static/t/view_blog/comment.html b/webcit/static/t/view_blog/comment.html index 8c118f977..08ad90aff 100644 --- a/webcit/static/t/view_blog/comment.html +++ b/webcit/static/t/view_blog/comment.html @@ -1,24 +1,28 @@
-
- - - ">"" <> - "> - @ - - - - - ')) { DeleteBlogComment(); }">[] - -
-
- - - - - - - -
+
+ + + + ">"" <> + + + "> + + @ + +  says:  + + + ')) { DeleteBlogComment(); }">[] + +
+
+ + + + + + + +
diff --git a/webcit/static/t/view_blog/post.html b/webcit/static/t/view_blog/post.html index 0dfee3de4..daab42cab 100755 --- a/webcit/static/t/view_blog/post.html +++ b/webcit/static/t/view_blog/post.html @@ -2,8 +2,19 @@
+
+
+ + + + + + + +
+
- + Posted by "> "" <> @@ -16,23 +27,12 @@ @ - + on ');"> []
-
-
- - - - - - - -
-
- + -- 2.30.2