From 790fb45372d775b4c52ad03f1e270cf553b67097 Mon Sep 17 00:00:00 2001 From: tonio Date: Fri, 30 Apr 2010 18:33:42 +0200 Subject: [PATCH] Ticket #41 but this is not enough... --- .../amavis_quarantine/templates/index.html | 9 +++++++++ .../amavis_quarantine/templatetags/amextras.py | 17 +++++++++++++++++ extensions/webmail/imap_listing.py | 1 - lib/tables.py | 2 +- templates/common/table_body.html | 2 +- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/extensions/amavis_quarantine/templates/index.html b/extensions/amavis_quarantine/templates/index.html index fd5704304..78f537496 100644 --- a/extensions/amavis_quarantine/templates/index.html +++ b/extensions/amavis_quarantine/templates/index.html @@ -68,6 +68,15 @@ tr.table-tr-selected { } }); } + $$("a[name=selectmsgs]").addEvent("click", function(evt) { + evt.stop(); + var type = evt.target.get("href"); + $$("td[name=type]").each(function(item) { + if (item.get("html").trim() == type) { + item.getParent().addClass("table-tr-selected"); + } + }); + }); $$("a[name=release]").addEvent("click", function(event) { if (!checkTableSelection("{% trans "Release this selection?" %}")) { event.stop(); diff --git a/extensions/amavis_quarantine/templatetags/amextras.py b/extensions/amavis_quarantine/templatetags/amextras.py index b71b3e908..03e1d31a0 100644 --- a/extensions/amavis_quarantine/templatetags/amextras.py +++ b/extensions/amavis_quarantine/templatetags/amextras.py @@ -63,6 +63,23 @@ def quar_menu(selection, perms): "url" : "", "img" : "/static/pics/remove.png", "label" : _("Delete")}, + {"name" : "select", + "url" : "", + "img" : "/static/pics/domains.png", + "label" : _("Select all"), + "class" : "menubardropdown", + "menu" : [ + {"name" : "selectmsgs", + "url" : "S", + "label" : _("Spam")}, + {"name" : "selectmsgs", + "url" : "H", + "label" : _("Bad header")}, + {"name" : "selectmsgs", + "url" : "M", + "label" : _("Bad MIME")} + ] + } ] menu = render_to_string('main/menu.html', diff --git a/extensions/webmail/imap_listing.py b/extensions/webmail/imap_listing.py index 2b650afd6..ba6e0bfce 100644 --- a/extensions/webmail/imap_listing.py +++ b/extensions/webmail/imap_listing.py @@ -112,7 +112,6 @@ class IMAPheader(object): def parse_subject(value, **kwargs): res = "" dcd = decode_header(re.sub("[\\r\\n]+", "", value)) - print dcd for part in dcd: if res != "": res += " " diff --git a/lib/tables.py b/lib/tables.py index 3a14cdc15..a987dd5f2 100644 --- a/lib/tables.py +++ b/lib/tables.py @@ -55,7 +55,7 @@ class Table(object): for row in rows: nrow = {"id" : row[self.idkey], "cols" : []} for c in self.columns: - newcol = {} + newcol = {"name" : c.name} try: newcol["width"] = getattr(c, "width") except AttributeError: diff --git a/templates/common/table_body.html b/templates/common/table_body.html index f46156ebd..1b5ee2138 100644 --- a/templates/common/table_body.html +++ b/templates/common/table_body.html @@ -2,7 +2,7 @@ {% for row in table.rows %} {% for cell in row.cols %} - + {% if cell.safe %}{{ cell.value|safe }}{% else %}{{ cell.value }}{% endif %} {% endfor %}