From 3363279e974777fdbc7480643532612006da263c Mon Sep 17 00:00:00 2001
From: the_mgt <themgt@uncensored.citadel.org>
Date: Thu, 19 Jul 2012 23:30:59 +0200
Subject: [PATCH] The penultimo fix to the blog view: moved the "x comments |
 permalink" stuff inside of blog_post div, added a horizontal ruler to
 separate blog entries and styled the hell out of the whole shebang

---
 webcit/blogview_renderer.c          | 12 ++++++------
 webcit/static/styles/blog.css       | 20 +++++++++++++++++---
 webcit/static/styles/webcit.css     | 12 ------------
 webcit/static/t/view_blog/post.html |  2 +-
 4 files changed, 24 insertions(+), 22 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("<a name=\"comments\"></a>\n");
+		wc_printf("<a class=\"blog_show_comments_link\" name=\"comments\"></a>\n");
 		wc_printf(_("%d comments"), bp->num_msgs - 1);
-		wc_printf(" | <a href=\"");
+		wc_printf(" | <a class=\"blog_permalink_link\" href=\"");
 		tmplput_blog_permalink(NULL, NULL);
 		wc_printf("\">%s</a>", _("permalink"));
-		wc_printf("<br>\n");
+		wc_printf("</div>\n");
 		for (i=1; i<bp->num_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("<a href=\"readfwd?p=%d?go=", bp->top_level_id);
+		wc_printf("<a class=\"blog_show_comments_link\" href=\"readfwd?p=%d?go=", bp->top_level_id);
 		urlescputs(ChrPtr(WC->CurRoom.name));
 		wc_printf("#comments\">");
 		wc_printf(_("%d comments"), bp->num_msgs - 1);
-		wc_printf("</a> | <a href=\"");
+		wc_printf("</a> | <a class=\"blog_permalink_link\" href=\"");
 		tmplput_blog_permalink(NULL, NULL);
 		wc_printf("\">%s</a>", _("permalink"));
-		wc_printf("<br><br><br>\n");
+		wc_printf("<hr>\n</div>\n");
 	}
 }
 
diff --git a/webcit/static/styles/blog.css b/webcit/static/styles/blog.css
index 88a8d4391..9242b55f6 100755
--- a/webcit/static/styles/blog.css
+++ b/webcit/static/styles/blog.css
@@ -1,8 +1,12 @@
 .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:link, .blog_post_title a:visited, .blog_post_title a:active {
@@ -22,7 +26,7 @@
  }
 
 .blog_post_header {
-	margin: 0 0.5em;
+	margin: 0 1em; /* adjust with .blog_show_comments_link */
 	font-size: smaller;
 }
 
@@ -31,6 +35,16 @@
 	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;
 	padding: 0.5em 0.25em 0.25em;
diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css
index e0ec4730f..9d9067558 100644
--- a/webcit/static/styles/webcit.css
+++ b/webcit/static/styles/webcit.css
@@ -1264,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/post.html b/webcit/static/t/view_blog/post.html
index f6d125b79..daab42cab 100644
--- a/webcit/static/t/view_blog/post.html
+++ b/webcit/static/t/view_blog/post.html
@@ -35,4 +35,4 @@
 		<??("X", 16)>
 	</div>
 	<div id="comment_replyto" style="display:none"><?MAIL:SUMM:INREPLYTO("X")></div>
-</div>
+<!-- closing /div provided by blogview_render.c -->
-- 
2.30.2