Changed the display logic for message author. New conditional COND:MAIL:LOCAL which...

[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
old mode 100755 (executable)
new mode 100644 (file)
index 0dfee3d..3053b16
--- a/webcit/static/t/view_blog/post.html
+++ b/webcit/static/t/view_blog/post.html
@@ -1,30 +1,9 @@
-<div class="blog_post">
+<div class="blog_post" id="msgdiv|<?MAIL:SUMM:N>|<?MAIL:SUMM:INREPLYTO()>">
        <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)>
+               <?!("COND:MAIL:SUBJ", 7)><a class="blog_permalink_link" href='/readfwd?go=<?THISROOM:NAME("U")>?p=<?BLOG:TOPLEVEL:MSGID()>'><?MAIL:SUMM:SUBJECT("X")></a><??("X", 7)>
        </div>
        <div class="blog_post_content">
-               <div>
+               <div>   
                        <?MAIL:BODY>
                        <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)>
                                <?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")>
@@ -34,5 +13,17 @@
                        <?!("X", 11)>
                </div>
        </div>
+       <div class="blog_post_header">
+               <span>Posted by <??("COND:MAIL:ANON",1)>
+                       <?!("COND:MAIL:LOCAL", 2)><a href="do_template?template=user_show?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a><?!("X", 2)>
+                       <??("COND:MAIL:LOCAL", 2)><?MAIL:SUMM:FROM("X")> &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
+               <??("X", 1)></span>
+               <span>on <?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 id="comment_replyto" style="display:none"><?MAIL:SUMM:INREPLYTO("X")></div>
-</div>
+<!-- closing /div provided by blogview_render.c -->