projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9ddbdb0)
* Added the words 'to' and 'Subject:' back into the message header displays.
authorArt Cancro <ajc@citadel.org>
Sat, 31 Jan 2009 05:40:15 +0000 (05:40 +0000)
committerArt Cancro <ajc@citadel.org>
Sat, 31 Jan 2009 05:40:15 +0000 (05:40 +0000)
* Removed links and action buttons from the printable version of the message display.

webcit/static/t/view_message.html patch | blob | history
webcit/static/t/view_message_print.html patch | blob | history
webcit/static/t/view_message_replyquote.html patch | blob | history

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index daed09e0993e8ffdae83586508644a4195bdb5bd..94a3931e587dc5c5f333228f05d4e037822a9816 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -10,7 +10,7 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",3)> @ <?MAIL:SUMM:H_NODE><??("X",3)>
 <??("X", 1)>
  <?!("COND:MAIL:ANON", 4)>***<??("X", 4)>
- <?MAIL:SUMM:TO("X")><br/>
+ <?_("to")> <?MAIL:SUMM:TO("X")><br/>
  <?!("COND:MAIL:SUMM:CCCC", 5)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 5)>
 
 
@@ -32,7 +32,7 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 
    <a href="#" onclick="window.open('printmsg/<?MAIL:SUMM:N>', 'print<?MAIL:SUMM:N>', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); "><span>[</span><?_("Print")><span>]</span></a>
  </p>
- <p class="message_subject"><?MAIL:SUMM:SUBJECT></p>
+ <p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p>
 </div>
 <div class="message_content"><div>
 <?MAIL:BODY>
diff --git a/webcit/static/t/view_message_print.html b/webcit/static/t/view_message_print.html
index 8051c8b3f979009bdd988415795b1a6abcb2a46f..a96ab8291e10c1438c4eaad4c28a075b97ac8bf8 100644 (file)
--- a/webcit/static/t/view_message_print.html
+++ b/webcit/static/t/view_message_print.html
@@ -1,30 +1,21 @@
-<html>\n<head><title>
+<html><head><title>
 <?CURRENT_USER>
 </title></head>
 <body onLoad=" window.print(); window.close(); ">
 <div class="fix_scrollbar_bug message"
 <div class="message_header"><span><?MAIL:SUMM:DATEFULL></span>
-<?_("from ")>
-<?MAIL:SUMM:FROM("X")><??("X", 1)>
-<?!("COND:MAIL:ANON",2)>***<??("X", 2)>
-<p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons">
-
-<a href="display_enter?recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
-
-<a href="display_enter?replyquote=<?MAIL:SUMM:N>&recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a> 
-
-<a href="display_enter?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a> 
-
-<a href="confirm_move_msg?msgid=<?MAIL:SUMM:N>"><span>[</span><?_("Move")><span>]</span></a> 
-
-<a href="delete_msg?msgid=<?MAIL:SUMM:N>" onclick="return confirm('<?_("Delete this message?")>');"><span>[</span><?_("Delete")><span>]</span> </a> 
-
-<a href="#" onclick="window.open('msgheaders/<?MAIL:SUMM:N>', 'headers<?MAIL:SUMM:N>', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); "><span>[</span><?_("Headers")><span>]</span></a>
-
-<a href="#" onclick="window.open('printmsg/<?MAIL:SUMM:N>', 'print<?MAIL:SUMM:N>', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); "><span>[</span><?_("Print")><span>]</span></a>
-</p></div>
+ <span><?MAIL:SUMM:DATEFULL></span>
+ <?_("from ")>
+ <??("COND:MAIL:ANON",1)>
+<?!("COND:MAIL:SUMM:RFCA", 2)><?!("X", 2)>
+<??("COND:MAIL:SUMM:RFCA", 3)><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",3)> @ <?MAIL:SUMM:H_NODE><??("X",3)>
+<??("X", 1)>
+ <?!("COND:MAIL:ANON", 4)>***<??("X", 4)>
+ <?_("to")> <?MAIL:SUMM:TO("X")><br/>
+ <?!("COND:MAIL:SUMM:CCCC", 5)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 5)>
+</div>
 
-<p class="message_subject"><?MAIL:SUMM:SUBJECT></p>
+<p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p>
 
 <div class="message_content"><div align="justify">
 <?MAIL:BODY>    
diff --git a/webcit/static/t/view_message_replyquote.html b/webcit/static/t/view_message_replyquote.html
index 452dc8c7cf2dcc9345ee08818b36efff4b1a234d..6d1f931fedebfd9c373f9ac3b361eb979eb67208 100644 (file)
--- a/webcit/static/t/view_message_replyquote.html
+++ b/webcit/static/t/view_message_replyquote.html
@@ -5,7 +5,7 @@
       <??("COND:MAIL:ANON",1)><?MAIL:SUMM:FROM("X")> &lt;<?MAIL:SUMM:RFCA("X")>&gt;<??("X", 1)>
       <?!("COND:MAIL:ANON",2)>***<??("X", 2)>
     </span>
-    <p class="message_subject"><?MAIL:SUMM:SUBJECT></p>
+    <p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p>
   </div><?ITERATE("MAIL:MIME:ATTACH:ATT", "load_attachments")>
   
   <div class="message_content">
Citadel server, clients, utilities