CVS: tmda-cgi/display/themes/Blue/template pending.ht, 1.28, 1.29 pending.html, 1.38, 1.39 theme.ht, 1.13, 1.14 theme.html, 1.24, 1.25
Jim Ramsay <[email protected]> Thu, 08 Apr 2004 08:05:22 -0700
| Newsgroups | gmane.mail.spam.tmda.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tmda/tmda-cgi/display/themes/Blue/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29702/display/themes/Blue/template
Modified Files:
pending.ht pending.html theme.ht theme.html
Log Message:
Cool Spamassassin integration from Jared Wangen, also better spamcop
reporting (multiple reports sent in a single email).
Details from ChangeLog:
Index: pending.ht
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/display/themes/Blue/template/pending.ht,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pending.ht 6 Dec 2003 22:26:39 -0000 1.28
+++ pending.ht 8 Apr 2004 15:05:04 -0000 1.29
@@ -148,7 +148,7 @@
title="Blacklist"></a></td>
<!-- /var -->
<!-- var: SCIcon -->
- <td width="1%"><a href="javascript:Set('spamcop')"><img
+ <td width="1%"><a href="javascript:Set('report')"><img
src="%(ThemeDir)s/buttons/options_r1_c6.gif" border="0"
width="20" height="15" alt="Report to SpamCop"
title="Report to SpamCop"></a></td>
@@ -162,11 +162,17 @@
<th width="80" align="left" style="padding-left: 20px">
Date
</th>
- <th width="50" align="right" style="padding-right: 10px">
+ <th width="50" align="right" style="padding-right: 20px">
Size
</th>
+ <!-- var: SsTh -->
+ <th width="50" align="right" style="padding-right: 10px">
+ Score
+ </th>
+ <!-- /var -->
</tr>
-<!-- var: NumCols="10" --><!-- var: NumBlankCols="6" -->
+<!-- var: NumCols="11" --><!-- var: NumBlankCols="6" -->
+<!-- var: NumMainCols="6" -->
<!-- var: EvenRowColor="#DADCEB" --><!-- var: OddRowColor="#DADCEB" -->
<!-- var: Row -->
<tr>
@@ -208,6 +214,11 @@
</td>
<td nowrap valign="top" style="padding-left: 8px">%(Date)s</td>
<td align="right" valign="top" style="padding-right: 5px">%(Size)s</td>
+ <!-- var: SsTd -->
+ <td width="50" align="right" style="padding-right: 5px">
+ %(Score)s
+ </td>
+ <!-- /var -->
</tr>
<!-- /var -->
<!-- var: InProcessRow -->
@@ -220,6 +231,9 @@
<td style="padding-left: 8px">%(Subject)s</td>
<td nowrap style="padding-left: 8px">%(Date)s</td>
<td align="right" style="padding-right: 5px">%(Size)s</td>
+ <!-- var: SsPr -->
+ <td> </td>
+ <!-- /var -->
</tr>
<!-- /var -->
</table></td>
Index: pending.html
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/display/themes/Blue/template/pending.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pending.html 18 Mar 2004 18:44:51 -0000 1.38
+++ pending.html 8 Apr 2004 15:05:04 -0000 1.39
@@ -2,7 +2,7 @@
<?xml-stylesheet href="%(ThemeDir)s/styles.css" type="text/css"?>
<html>
<!-- THIS PAGE IS AUTOMATICALLY GENERATED. DO NOT EDIT. -->
-<!-- Thu Mar 18 12:20:17 2004 -->
+<!-- Wed Apr 7 21:34:20 2004 -->
<!-- USING HT2HTML 2.1 -->
<!-- SEE http://ht2html.sf.net -->
<!-- User-specified headers:
@@ -220,7 +220,7 @@
title="Blacklist"></a></td>
<!-- /var -->
<!-- var: SCIcon -->
- <td width="1%"><a href="javascript:Set('spamcop')"><img
+ <td width="1%"><a href="javascript:Set('report')"><img
src="%(ThemeDir)s/buttons/options_r1_c6.gif" border="0"
width="20" height="15" alt="Report to SpamCop"
title="Report to SpamCop"></a></td>
@@ -234,11 +234,17 @@
<th width="80" align="left" style="padding-left: 20px">
Date
</th>
- <th width="50" align="right" style="padding-right: 10px">
+ <th width="50" align="right" style="padding-right: 20px">
Size
</th>
+ <!-- var: SsTh -->
+ <th width="50" align="right" style="padding-right: 10px">
+ Score
+ </th>
+ <!-- /var -->
</tr>
-<!-- var: NumCols="10" --><!-- var: NumBlankCols="6" -->
+<!-- var: NumCols="11" --><!-- var: NumBlankCols="6" -->
+<!-- var: NumMainCols="6" -->
<!-- var: EvenRowColor="#DADCEB" --><!-- var: OddRowColor="#DADCEB" -->
<!-- var: Row -->
<tr>
@@ -280,6 +286,11 @@
</td>
<td nowrap valign="top" style="padding-left: 8px">%(Date)s</td>
<td align="right" valign="top" style="padding-right: 5px">%(Size)s</td>
+ <!-- var: SsTd -->
+ <td width="50" align="right" style="padding-right: 5px">
+ %(Score)s
+ </td>
+ <!-- /var -->
</tr>
<!-- /var -->
<!-- var: InProcessRow -->
@@ -292,6 +303,9 @@
<td style="padding-left: 8px">%(Subject)s</td>
<td nowrap style="padding-left: 8px">%(Date)s</td>
<td align="right" style="padding-right: 5px">%(Size)s</td>
+ <!-- var: SsPr -->
+ <td> </td>
+ <!-- /var -->
</tr>
<!-- /var -->
</table></td>
Index: theme.ht
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/display/themes/Blue/template/theme.ht,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- theme.ht 16 Nov 2003 18:42:57 -0000 1.13
+++ theme.ht 8 Apr 2004 15:05:05 -0000 1.14
@@ -42,7 +42,8 @@
Login:InitPage:pending:gen_addr, PendingList:CropSender,
PendingList:CropSubject, PendingList:ShowAddr:Name:Address:All,
ViewPending:AllowTags, ViewPending:BlockRemove, General:SpamCopAddr,
- PendingList:ShowDelete:No:Yes, PendingList:ShowBlack:No:Yes" -->
+ PendingList:ShowDelete:No:Yes, PendingList:ShowBlack:No:Yes,
+ PendingList:ShowSpamScore:No:Yes, General:SpamScoreThreshold" -->
<table>
<form method="post" action="%(Script)s">
<tr>
@@ -168,6 +169,16 @@
<td>Show blacklist column in pending list.</td>
</tr>
<tr>
+ <td align="center"><select name="PendingListShowSpamScore">
+ <option %(PendingListShowSpamScoreNoSelected)s
+ value="No">No</option>
+ <option %(PendingListShowSpamScoreYesSelected)s
+ value="Yes">Yes</option>
+ </select></td>
+ <td> </td>
+ <td>Show spam score column in pending list.</td>
+ </tr>
+ <tr>
<td>OK HTML tag</td>
<td> </td>
<td><input type="text" name="ViewPendingAllowTags"
Index: theme.html
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/display/themes/Blue/template/theme.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- theme.html 18 Mar 2004 18:44:51 -0000 1.24
+++ theme.html 8 Apr 2004 15:05:05 -0000 1.25
@@ -2,7 +2,7 @@
<?xml-stylesheet href="%(ThemeDir)s/styles.css" type="text/css"?>
<html>
<!-- THIS PAGE IS AUTOMATICALLY GENERATED. DO NOT EDIT. -->
-<!-- Thu Mar 18 12:20:17 2004 -->
+<!-- Wed Apr 7 21:55:36 2004 -->
<!-- USING HT2HTML 2.1 -->
<!-- SEE http://ht2html.sf.net -->
<!-- User-specified headers:
@@ -129,7 +129,8 @@
Login:InitPage:pending:gen_addr, PendingList:CropSender,
PendingList:CropSubject, PendingList:ShowAddr:Name:Address:All,
ViewPending:AllowTags, ViewPending:BlockRemove, General:SpamCopAddr,
- PendingList:ShowDelete:No:Yes, PendingList:ShowBlack:No:Yes" -->
+ PendingList:ShowDelete:No:Yes, PendingList:ShowBlack:No:Yes,
+ PendingList:ShowSpamScore:No:Yes, General:SpamScoreThreshold" -->
<table>
<form method="post" action="%(Script)s">
<tr>
@@ -255,6 +256,16 @@
<td>Show blacklist column in pending list.</td>
</tr>
<tr>
+ <td align="center"><select name="PendingListShowSpamScore">
+ <option %(PendingListShowSpamScoreNoSelected)s
+ value="No">No</option>
+ <option %(PendingListShowSpamScoreYesSelected)s
+ value="Yes">Yes</option>
+ </select></td>
+ <td> </td>
+ <td>Show spam score column in pending list.</td>
+ </tr>
+ <tr>
<td>OK HTML tag</td>
<td> </td>
<td><input type="text" name="ViewPendingAllowTags"