Hopefully this commits the correct fixes to the blogpost view:

More indention and adding a closing </div>

diff --git a/webcit/static/t/view_blog/post.html b/webcit/static/t/view_blog/post.html
deleted file mode 100644 (file)
index ff1b11b..0000000
--- a/webcit/static/t/view_blog/post.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="blog_post">
-       <div class="blog_post_title">
-               <?!("COND:MAIL:SUBJ", 7)><a href="<?BLOG:PERMALINK>"><?MAIL:SUMM:SUBJECT("X")></a><??("X", 7)>
-       </div>
-       <div class="blog_post_header">
-               <span><??("COND:MAIL:ANON",1)>
-                       <?!("COND:MAIL:SUMM:RFCA", 2)>
-                       <a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">
-                               "<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;
-                       </a>
-                       <?!("X", 2)>
-                       <??("COND:MAIL:SUMM:RFCA", 3)>
-                       <a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">
-                               <?MAIL:SUMM:FROM("X")>
-                       </a> 
-                       <??("X", 3)>
-                       <?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
-               <??("X", 1)></span>
-               <span><?MAIL:SUMM:DATEFULL></span>
-               <?!("COND:ROOM:EDITACCESS", 16)>
-                       <a href="delete_msg?msgid=<?MAIL:SUMM:N>" onclick="return confirm('<?_("Delete this message?")>');">
-                               <span>[</span><?_("Delete")><span>]</span>
-                       </a> 
-               <??("X", 16)>
-       </div>
-       <div class="blog_post_content">
-               <div>
-                       <?MAIL:BODY>
-                       <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)>
-                               <?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
-                       <?!("X", 10)>
-                       <?!("COND:MAIL:MIME:ATTACH:LINKS", 11)>
-                               <?ITERATE("MAIL:MIME:ATTACH:LINKS", ="view_message_list_attach")>
-                       <?!("X", 11)>
-               </div>
-       </div>
-       <div id="comment_replyto" style="display:none"><?MAIL:SUMM:INREPLYTO("X")></div>
-</div>
-<<<<<<< HEAD
-=======
-<div class="blog_post_header">
-<span>
- <??("COND:MAIL:ANON",1)>
-   <?!("COND:MAIL:SUMM:RFCA", 2)><a href="do_template?temlpate=user_show?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
-   <??("COND:MAIL:SUMM:RFCA", 3)><a href="do_template?temlpate=user_show?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
-      <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
- <??("X", 1)>
-</span>
- <span><?MAIL:SUMM:DATEFULL></span>
-<?!("COND:ROOM:EDITACCESS", 16)>
-   <a href="delete_msg?msgid=<?MAIL:SUMM:N>" onclick="return confirm('<?_("Delete this message?")>');"><span>[</span><?_("Delete")><span>]</span> </a> 
-<??("X", 16)>
-</div>
-<div class="blog_post_content"><div>
-<?MAIL:BODY>
-<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)>
-<?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
-<?!("X", 10)>
-<?!("COND:MAIL:MIME:ATTACH:LINKS", 11)>
-<?ITERATE("MAIL:MIME:ATTACH:LINKS", ="view_message_list_attach")>
-<?!("X", 11)>
-</div>
-</div>
-<div id="comment_replyto" style="display:none"><?MAIL:SUMM:INREPLYTO("X")></div>
->>>>>>> 8fae1a3f7a2c53606f1c7418637f141e424e5b26