logo       
Google Custom Search
    AddThis Social Bookmark Button
-->

CVS: tmda-cgi/display/themes/Blue/template view.ht,1.4,1.5 view.html,1.10,1: msg#00366

Subject: CVS: tmda-cgi/display/themes/Blue/template view.ht,1.4,1.5 view.html,1.10,1.11
Update of /cvsroot/tmda/tmda-cgi/display/themes/Blue/template
In directory sc8-pr-cvs1:/tmp/cvs-serv31117/display/themes/Blue/template

Modified Files:
        view.ht view.html 
Log Message:
If a viewed e-mail has multiple equivilant parts, show only the preferred one.


Index: view.ht
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/display/themes/Blue/template/view.ht,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- view.ht     25 Apr 2003 16:49:21 -0000      1.4
+++ view.ht     30 Apr 2003 17:44:36 -0000      1.5
@@ -1,6 +1,18 @@
 Title: Pending E-mail
 
-%(ConfirmScript)s<table width="100%" border="2" cellpadding="0" cellspacing="0"
+<script>
+function ConfirmDelete()
+{
+  if (confirm("Permanently delete this pending message?\nAny confirmation that 
follows will fail."))
+    document.location.href = 
"%(Script)s?cmd=view&subcmd=delete&msgid=%(MsgID)s&SID=%(SID)s"
+}
+function ConfirmBlacklist()
+{
+  if (confirm("Blacklist sender and permanently delete this pending message?"))
+    document.location.href = 
"%(Script)s?cmd=view&subcmd=black&msgid=%(MsgID)s&SID=%(SID)s"
+}
+</script>
+<table width="100%" border="2" cellpadding="0" cellspacing="0"
   bordercolor="#4E508F">
   <tr>
     <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -42,8 +54,9 @@
             height="18" alt="Last" title="Last"></a><!-- /var --></td>
         </tr>
         <tr bgcolor="#DADCEB">
-          <td colspan="%(Columns)d" class="email"><!-- var: Headers --><table
-              class="Headers" border="0" cellspacing="0" cellpadding="0">
+          <td colspan="%(Columns)d" class="email">
+<!-- var: ShortHeaders -->
+            <table class="Headers" border="0" cellspacing="0" cellpadding="0">
 <!-- var: HeaderRow -->
               <tr>
                 <td><b>%(Name)s:</b></td>
@@ -51,8 +64,33 @@
                 <td>%(Value)s</td>
               </tr>
 <!-- /var (HeaderRow) -->
-            </table><br><!-- /var (Headers) -->
-            %(Content)s</td>
+            </table><br>
+<!-- /var (ShortHeaders) -->
+<!-- var: AllHeaders -->
+            <pre>%(Headers)s</pre>
+<!-- /var (AllHeaders) -->
+<!-- var: Part -->
+<!-- var: Divider -->
+            <hr width="50%">
+<!-- /var (Divider) -->
+            %(Content)s
+<!-- /var (Part) -->
+<!-- var: NoAttachments -->
+            <table class=Attachments>
+              <tr>
+<!-- var: Attachment -->
+                <td>
+                  <img src="%(DispDir)s/icons/%(Icon)s.gif" width="32" 
+                    height="32"><br>
+                  %(Filename)s<br>
+                  (%(Size)s)
+                </td>
+                <td width="10">&nbsp;</td>
+<!-- /var (Attachment) -->
+              </tr>
+            </table>
+<!-- /var (NoAttachments) -->
+          </td>
         </tr>
         <tr align="center" bgcolor="#7A7AB6" height="24">
           <td><!-- var: FirstButt2 --><a

Index: view.html
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/display/themes/Blue/template/view.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- view.html   29 Apr 2003 04:36:29 -0000      1.10
+++ view.html   30 Apr 2003 17:44:37 -0000      1.11
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="%(ThemeDir)s/styles.css" type="text/css"?>
 <html>
 <!-- THIS PAGE IS AUTOMATICALLY GENERATED.  DO NOT EDIT. -->
-<!-- Mon Apr 28 21:22:29 2003 -->
+<!-- Wed Apr 30 10:29:50 2003 -->
 <!-- USING HT2HTML 2.1 -->
 <!-- SEE http://ht2html.sf.net -->
 <!-- User-specified headers:
@@ -77,7 +77,19 @@
 </td>
 <!-- end of sidebar cell -->
 <!-- start of body cell -->
-<td valign="top" class="body">%(ConfirmScript)s<table width="100%" border="2" 
cellpadding="0" cellspacing="0"
+<td valign="top" class="body"><script>
+function ConfirmDelete()
+{
+  if (confirm("Permanently delete this pending message?\nAny confirmation that 
follows will fail."))
+    document.location.href = 
"%(Script)s?cmd=view&subcmd=delete&msgid=%(MsgID)s&SID=%(SID)s"
+}
+function ConfirmBlacklist()
+{
+  if (confirm("Blacklist sender and permanently delete this pending message?"))
+    document.location.href = 
"%(Script)s?cmd=view&subcmd=black&msgid=%(MsgID)s&SID=%(SID)s"
+}
+</script>
+<table width="100%" border="2" cellpadding="0" cellspacing="0"
   bordercolor="#4E508F">
   <tr>
     <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -119,8 +131,9 @@
             height="18" alt="Last" title="Last"></a><!-- /var --></td>
         </tr>
         <tr bgcolor="#DADCEB">
-          <td colspan="%(Columns)d" class="email"><!-- var: Headers --><table
-              class="Headers" border="0" cellspacing="0" cellpadding="0">
+          <td colspan="%(Columns)d" class="email">
+<!-- var: ShortHeaders -->
+            <table class="Headers" border="0" cellspacing="0" cellpadding="0">
 <!-- var: HeaderRow -->
               <tr>
                 <td><b>%(Name)s:</b></td>
@@ -128,8 +141,33 @@
                 <td>%(Value)s</td>
               </tr>
 <!-- /var (HeaderRow) -->
-            </table><br><!-- /var (Headers) -->
-            %(Content)s</td>
+            </table><br>
+<!-- /var (ShortHeaders) -->
+<!-- var: AllHeaders -->
+            <pre>%(Headers)s</pre>
+<!-- /var (AllHeaders) -->
+<!-- var: Part -->
+            %(Content)s
+<!-- var: Divider -->
+            <hr width="50%">
+<!-- /var (Divider) -->
+<!-- /var (Part) -->
+<!-- var: NoAttachments -->
+            <table class=Attachments>
+              <tr>
+<!-- var: Attachment -->
+                <td>
+                  <img src="%(DispDir)s/icons/%(Icon)s.gif" width="32" 
+                    height="32"><br>
+                  %(Filename)s<br>
+                  (%(Size)s)
+                </td>
+                <td width="10">&nbsp;</td>
+<!-- /var (Attachment) -->
+              </tr>
+            </table>
+<!-- /var (NoAttachments) -->
+          </td>
         </tr>
         <tr align="center" bgcolor="#7A7AB6" height="24">
           <td><!-- var: FirstButt2 --><a

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs



<Prev in Thread] Current Thread [Next in Thread>