diff --git a/extensions/webmail/imaputils.py b/extensions/webmail/imaputils.py index bbc284832..90dbeff7f 100644 --- a/extensions/webmail/imaputils.py +++ b/extensions/webmail/imaputils.py @@ -429,11 +429,12 @@ class IMAPconnector(object): if len(topmailbox): md_mailboxes = [] else: - md_mailboxes = [{"name" : "INBOX", "class" : "icon-home"}, + md_mailboxes = [{"name" : "INBOX", "class" : "icon-inbox"}, {"name" : parameters.get_user(user, "DRAFTS_FOLDER"), "class" : "icon-file"}, - {"name" : 'Junk'}, - {"name" : parameters.get_user(user, "SENT_FOLDER")}, + {"name" : 'Junk', "class" : "icon-fire"}, + {"name" : parameters.get_user(user, "SENT_FOLDER"), + "class" : "icon-envelope"}, {"name" : parameters.get_user(user, "TRASH_FOLDER"), "class" : "icon-trash"}] if until_mailbox: @@ -600,9 +601,12 @@ class IMAPconnector(object): if not r'\Seen' in data[int(uid)]['FLAGS']: msg['style'] = 'unseen' if r'\Answered' in data[int(uid)]['FLAGS']: - msg['img_flags'] = static_url('pics/answered.png') + msg['img_flags'] = [static_url('pics/answered.png')] if r'$Forwarded' in data[int(uid)]['FLAGS']: - msg['img_flags'] = static_url('pics/forwarded.png') + if msg.has_key('img_flags'): + msg['img_flags'] += [static_url('pics/forwarded.png')] + else: + msg['img_flags'] = [static_url('pics/forwarded.png')] bs = BodyStructure(data[int(uid)]['BODYSTRUCTURE']) if bs.has_attachments(): msg['img_withatts'] = static_url('pics/attachment.png') diff --git a/extensions/webmail/lib.py b/extensions/webmail/lib.py index 5e4956c1d..3051b9fc9 100644 --- a/extensions/webmail/lib.py +++ b/extensions/webmail/lib.py @@ -28,7 +28,7 @@ class WMtable(tables.Table): defvalue="%spics/grippy.png" % settings.MEDIA_URL, header="" ) - flags = tables.ImgColumn("flags", width="2%") + flags = tables.ImgColumn("flags", width="4%") withatts = tables.ImgColumn("withatts", width="2%") subject = tables.Column("subject", label=__("Subject"), width="50%", limit=60) from_ = tables.Column("from", width="20%", label=__("From"), limit=30) @@ -427,7 +427,6 @@ def decode_payload(encoding, payload): :param payload: the value to decode :return: a string """ - print payload encoding = encoding.lower() if encoding == "base64": import base64 diff --git a/extensions/webmail/templatetags/webextras.py b/extensions/webmail/templatetags/webextras.py index 355c3fd53..1903fab89 100644 --- a/extensions/webmail/templatetags/webextras.py +++ b/extensions/webmail/templatetags/webextras.py @@ -1,3 +1,4 @@ +# coding: utf-8 from django import template from django.template.loader import render_to_string from django.utils.translation import ugettext as _ @@ -20,33 +21,27 @@ def viewmail_menu(selection, folder, user, mail_id=None): "label" : _("Back")}, {"name" : "reply", "url" : "action=reply&mbox=%s&mailid=%s" % (folder, mail_id), - "img" : static_url("pics/reply.png"), + "img" : "icon-share", "label" : _("Reply")}, {"name" : "replyall", "url" : "action=reply&mbox=%s&mailid=%s&all=1" % (folder, mail_id), - "img" : static_url("pics/reply-all.png"), + "img" : "", "label" : _("Reply all")}, {"name" : "forward", "url" : "action=forward&mbox=%s&mailid=%s" % (folder, mail_id), - "img" : static_url("pics/alias.png"), + "img" : "icon-arrow-right", "label" : _("Forward")}, {"name" : "delete", - "img" : static_url("pics/remove.png"), + "img" : "icon-trash", "url" : reverse(webmail.views.delete) + "?mbox=%s&mailid=%s" % (folder, mail_id), "label" : _("Delete")}, {"name" : "display_options", "label" : _("Display options"), - "img" : static_url("pics/settings.png"), - "class" : "menubardropdown", "menu" : [ {"name" : "activate_links", - "label" : _("Activate links"), - "url" : ""}, - #reverse(webmail.views.viewmail, args=[folder, mail_id]) + "?links=1"}, + "label" : _("Activate links")}, {"name" : "disable_links", - "label" : _("Disable links"), - "url" : ""} - #reverse(webmail.views.viewmail, args=[folder, mail_id]) + "?links=0"}, + "label" : _("Disable links")} ] } ] @@ -80,7 +75,6 @@ def listmailbox_menu(selection, folder, user): "label" : _("New message"), "class" : "btn"}, {"name" : "mark", - "label" : _("Mark messages"), "class" : "btn", "menu" : [ @@ -93,14 +87,12 @@ def listmailbox_menu(selection, folder, user): ] }, {"name" : "actions", - "img" : static_url("pics/settings.png"), "label" : _("Actions"), "class" : "btn", "menu" : [ {"name" : "fdaction", "label" : _("Compress folder"), - "img" : static_url("pics/compress.png"), - "url" : "compact/%s/" % folder}, + "url" : "compact/%s/" % folder} ] } ] diff --git a/lib/tables.py b/lib/tables.py index 662564c47..c38ca7b17 100644 --- a/lib/tables.py +++ b/lib/tables.py @@ -61,6 +61,8 @@ class ImgColumn(Column): return "" def render(self, value): + if type(value) in [list, tuple]: + return "".join(map(lambda i: "" % i, value)) return "" % value class DivColumn(Column): diff --git a/static/js/global.js b/static/js/global.js index d6ed678e9..42e468791 100644 --- a/static/js/global.js +++ b/static/js/global.js @@ -9,7 +9,15 @@ var media_url = ""; * 'media_url' (corresponding to django's MEDIA_URL variable). */ function set_media_url(url) { - media_url = url; + media_url = url; +} + +/* + * Shortcut function that construct an url from the media_url and the + * given value. + */ +function static_url(value) { + return media_url + value; } function modalbox(e, css, defhref, defcb, defclosecb) { diff --git a/static/pics/active.png b/static/pics/active.png deleted file mode 100644 index 7dc15ea96..000000000 Binary files a/static/pics/active.png and /dev/null differ diff --git a/static/pics/add.png b/static/pics/add.png deleted file mode 100644 index 1aa7f095c..000000000 Binary files a/static/pics/add.png and /dev/null differ diff --git a/static/pics/admin.png b/static/pics/admin.png deleted file mode 100644 index 9460dfc74..000000000 Binary files a/static/pics/admin.png and /dev/null differ diff --git a/static/pics/administrators.png b/static/pics/administrators.png deleted file mode 100644 index dbf04e27c..000000000 Binary files a/static/pics/administrators.png and /dev/null differ diff --git a/static/pics/alias.png b/static/pics/alias.png deleted file mode 100644 index de0199b46..000000000 Binary files a/static/pics/alias.png and /dev/null differ diff --git a/static/pics/auto-reply.png b/static/pics/auto-reply.png deleted file mode 100644 index a61974159..000000000 Binary files a/static/pics/auto-reply.png and /dev/null differ diff --git a/static/pics/back.png b/static/pics/back.png deleted file mode 100644 index 659cd90d7..000000000 Binary files a/static/pics/back.png and /dev/null differ diff --git a/static/pics/calendar.gif b/static/pics/calendar.gif deleted file mode 100644 index ca17b26db..000000000 Binary files a/static/pics/calendar.gif and /dev/null differ diff --git a/static/pics/clear.png b/static/pics/clear.png deleted file mode 100644 index e6c8e8b9f..000000000 Binary files a/static/pics/clear.png and /dev/null differ diff --git a/static/pics/compress.png b/static/pics/compress.png deleted file mode 100644 index 901542615..000000000 Binary files a/static/pics/compress.png and /dev/null differ diff --git a/static/pics/demo.png b/static/pics/demo.png deleted file mode 100644 index 2f66cdebb..000000000 Binary files a/static/pics/demo.png and /dev/null differ diff --git a/static/pics/dialog-warning.png b/static/pics/dialog-warning.png deleted file mode 100644 index 7233d45d8..000000000 Binary files a/static/pics/dialog-warning.png and /dev/null differ diff --git a/static/pics/domains.png b/static/pics/domains.png deleted file mode 100644 index aca82fbbb..000000000 Binary files a/static/pics/domains.png and /dev/null differ diff --git a/static/pics/down_arrow.png b/static/pics/down_arrow.png deleted file mode 100644 index f5f128b26..000000000 Binary files a/static/pics/down_arrow.png and /dev/null differ diff --git a/static/pics/download.png b/static/pics/download.png deleted file mode 100644 index 2c5a80385..000000000 Binary files a/static/pics/download.png and /dev/null differ diff --git a/static/pics/draft.png b/static/pics/draft.png deleted file mode 100644 index 663cbaddd..000000000 Binary files a/static/pics/draft.png and /dev/null differ diff --git a/static/pics/edit.png b/static/pics/edit.png deleted file mode 100644 index 188e1c12b..000000000 Binary files a/static/pics/edit.png and /dev/null differ diff --git a/static/pics/export.png b/static/pics/export.png deleted file mode 100644 index 227a91e51..000000000 Binary files a/static/pics/export.png and /dev/null differ diff --git a/static/pics/extensions.png b/static/pics/extensions.png deleted file mode 100644 index c8d899cff..000000000 Binary files a/static/pics/extensions.png and /dev/null differ diff --git a/static/pics/filters.png b/static/pics/filters.png deleted file mode 100644 index 6edbef614..000000000 Binary files a/static/pics/filters.png and /dev/null differ diff --git a/static/pics/first.png b/static/pics/first.png deleted file mode 100644 index 9c15c09e9..000000000 Binary files a/static/pics/first.png and /dev/null differ diff --git a/static/pics/folder-open.png b/static/pics/folder-open.png deleted file mode 100644 index b67403d9f..000000000 Binary files a/static/pics/folder-open.png and /dev/null differ diff --git a/static/pics/folder.png b/static/pics/folder.png deleted file mode 100644 index 901edc962..000000000 Binary files a/static/pics/folder.png and /dev/null differ diff --git a/static/pics/forwarded.png b/static/pics/forwarded.png new file mode 100644 index 000000000..56d7d48ba Binary files /dev/null and b/static/pics/forwarded.png differ diff --git a/static/pics/go-down.png b/static/pics/go-down.png deleted file mode 100644 index adb59b0af..000000000 Binary files a/static/pics/go-down.png and /dev/null differ diff --git a/static/pics/graph.png b/static/pics/graph.png deleted file mode 100644 index 8734e777a..000000000 Binary files a/static/pics/graph.png and /dev/null differ diff --git a/static/pics/import.png b/static/pics/import.png deleted file mode 100644 index e431385d9..000000000 Binary files a/static/pics/import.png and /dev/null differ diff --git a/static/pics/info.png b/static/pics/info.png deleted file mode 100644 index 8851b99ba..000000000 Binary files a/static/pics/info.png and /dev/null differ diff --git a/static/pics/last.png b/static/pics/last.png deleted file mode 100644 index 6e904efd0..000000000 Binary files a/static/pics/last.png and /dev/null differ diff --git a/static/pics/logout.png b/static/pics/logout.png deleted file mode 100644 index 0010931e2..000000000 Binary files a/static/pics/logout.png and /dev/null differ diff --git a/static/pics/mailbox.png b/static/pics/mailbox.png deleted file mode 100644 index 7c68cb8d3..000000000 Binary files a/static/pics/mailbox.png and /dev/null differ diff --git a/static/pics/movedown.png b/static/pics/movedown.png deleted file mode 100644 index 3dd7fccdf..000000000 Binary files a/static/pics/movedown.png and /dev/null differ diff --git a/static/pics/moveup.png b/static/pics/moveup.png deleted file mode 100644 index fa9a7d71b..000000000 Binary files a/static/pics/moveup.png and /dev/null differ diff --git a/static/pics/next.png b/static/pics/next.png deleted file mode 100644 index 6ef8de76e..000000000 Binary files a/static/pics/next.png and /dev/null differ diff --git a/static/pics/overview.png b/static/pics/overview.png deleted file mode 100644 index 13d2c00d0..000000000 Binary files a/static/pics/overview.png and /dev/null differ diff --git a/static/pics/permissions.png b/static/pics/permissions.png deleted file mode 100644 index 04666196e..000000000 Binary files a/static/pics/permissions.png and /dev/null differ diff --git a/static/pics/progressbar.gif b/static/pics/progressbar.gif deleted file mode 100644 index 66f7f57b7..000000000 Binary files a/static/pics/progressbar.gif and /dev/null differ diff --git a/static/pics/progressbar_bg.gif b/static/pics/progressbar_bg.gif deleted file mode 100644 index d84f65378..000000000 Binary files a/static/pics/progressbar_bg.gif and /dev/null differ diff --git a/static/pics/quarantine.png b/static/pics/quarantine.png deleted file mode 100644 index 433945d70..000000000 Binary files a/static/pics/quarantine.png and /dev/null differ diff --git a/static/pics/release.png b/static/pics/release.png deleted file mode 100644 index 8b0fef9a8..000000000 Binary files a/static/pics/release.png and /dev/null differ diff --git a/static/pics/remove.png b/static/pics/remove.png deleted file mode 100644 index 93edaf03f..000000000 Binary files a/static/pics/remove.png and /dev/null differ diff --git a/static/pics/reply-all.png b/static/pics/reply-all.png deleted file mode 100644 index 2017b0af0..000000000 Binary files a/static/pics/reply-all.png and /dev/null differ diff --git a/static/pics/reply.png b/static/pics/reply.png deleted file mode 100644 index a61974159..000000000 Binary files a/static/pics/reply.png and /dev/null differ diff --git a/static/pics/save.png b/static/pics/save.png deleted file mode 100644 index 22ff49571..000000000 Binary files a/static/pics/save.png and /dev/null differ diff --git a/static/pics/search.png b/static/pics/search.png deleted file mode 100644 index fd7f0b07a..000000000 Binary files a/static/pics/search.png and /dev/null differ diff --git a/static/pics/send-receive.png b/static/pics/send-receive.png deleted file mode 100644 index 3eb6a9ce3..000000000 Binary files a/static/pics/send-receive.png and /dev/null differ diff --git a/static/pics/settings.png b/static/pics/settings.png deleted file mode 100644 index 259ed26dd..000000000 Binary files a/static/pics/settings.png and /dev/null differ diff --git a/static/pics/simplemail.png b/static/pics/simplemail.png deleted file mode 100644 index e3b2303f3..000000000 Binary files a/static/pics/simplemail.png and /dev/null differ diff --git a/static/pics/subfolders.png b/static/pics/subfolders.png deleted file mode 100644 index 628f4d50f..000000000 Binary files a/static/pics/subfolders.png and /dev/null differ diff --git a/static/pics/tools.png b/static/pics/tools.png deleted file mode 100644 index 94527c184..000000000 Binary files a/static/pics/tools.png and /dev/null differ diff --git a/static/pics/trash.png b/static/pics/trash.png deleted file mode 100644 index 0e0953c73..000000000 Binary files a/static/pics/trash.png and /dev/null differ diff --git a/static/pics/undo.png b/static/pics/undo.png deleted file mode 100644 index 8b0fef9a8..000000000 Binary files a/static/pics/undo.png and /dev/null differ diff --git a/static/pics/up_arrow.png b/static/pics/up_arrow.png deleted file mode 100644 index 524fb5ebd..000000000 Binary files a/static/pics/up_arrow.png and /dev/null differ diff --git a/static/pics/user.png b/static/pics/user.png deleted file mode 100644 index 46573fff6..000000000 Binary files a/static/pics/user.png and /dev/null differ diff --git a/static/pics/webmail.png b/static/pics/webmail.png deleted file mode 100644 index 859251fe0..000000000 Binary files a/static/pics/webmail.png and /dev/null differ diff --git a/templates/common/buttons_list.html b/templates/common/buttons_list.html index c987f62c0..cf74dc79c 100644 --- a/templates/common/buttons_list.html +++ b/templates/common/buttons_list.html @@ -1,7 +1,7 @@ {% load libextras %}
{% for entry in entries %}
{% if entry.menu %} - {{ entry.label }} + {% if entry.img %}{% endif %}{{ entry.label }}