* re-enumerate conditionals in view_message.html

[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 ee15a8d5098eb59ada91840692d1b7eba7e66d27..ef7aa5100fed2513c8bac71314642144f3d8b6cc 100644 (file)
--- a/webcit/static/t/view_message_replyquote.html
+++ b/webcit/static/t/view_message_replyquote.html
@@ -1,5 +1,12 @@
-<blockquote> <div class="message_header"> <span><?MAIL:SUMM:DATEFULL></span> <??("COND:MAIL:ANON",1)><span><?_("from ")><?MAIL:SUMM:FROM("X")> &lt;<?MAIL:SUMM:RFCA("X")>&gt;</span><??("X", 1)><?!("COND:MAIL:ANON",2)><span><?_("from ")>***</span><??("X", 2)>
-<?!("COND:MAIL:SUBJ",3)><span class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></span><?!("X", 3)>
+<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)>
+</span>
+<?!("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 class="message_content"> <?MAIL:BODY> </div>
 </blockquote>