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

[citadel.git] / webcit / static / t / view_message / replyquote.html

diff --git a/webcit/static/t/view_message/replyquote.html b/webcit/static/t/view_message/replyquote.html
index 8e5ca6aaa0d8af63d644fd96be215ebe5646c674..58cda01cb15891c78d00eae5c6761733eb2bcce5 100644 (file)
--- a/webcit/static/t/view_message/replyquote.html
+++ b/webcit/static/t/view_message/replyquote.html
@@ -1,14 +1,13 @@
 <blockquote> <div class="message_header"> <span><?MAIL:SUMM:DATEFULL></span> 
-
 <??("COND:MAIL:ANON",1)>
 <span><?_("from ")>
-<?!("COND:MAIL:SUMM:RFCA", 2)>"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;<?!("X", 2)>
-<??("COND:MAIL:SUMM:RFCA", 3)><?MAIL:SUMM:FROM("X")><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
+<?!("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)>
 </span>
-<?!("COND:MAIL:ANON",5)><span><?_("from ")>***</span><??("X", 5)>
+<??("X", 1)><?!("COND:MAIL:ANON",5)><span><?_("from ")>***</span><??("X", 5)>
 <?!("COND:MAIL:SUBJ",6)><span class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></span><?!("X", 6)>
-</div><?ITERATE("MAIL:MIME:ATTACH:ATT", "load_attachments")>  
+</div><?ITERATE("MAIL:MIME:ATTACH:ATT", ="load_attachments")>  
  <div class="message_content"> <?MAIL:BODY>
- <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
+ <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", ="view_message_inline_attach")><?!("X", 10)>
 </div>
 </blockquote>