Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / webcit / static / t / view_blog / post.html

diff --git a/webcit/static/t/view_blog/post.html b/webcit/static/t/view_blog/post.html
index 0dfee3de41602c9ff56174f4deca7b829c34562a..ff1b11b0760184d8e25de09a074f8ba99bc11a9a 100644 (file)
--- a/webcit/static/t/view_blog/post.html
+++ b/webcit/static/t/view_blog/post.html
@@ -36,3 +36,30 @@
        </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