diff --git a/admin/templatetags/admin_extras.py b/admin/templatetags/admin_extras.py index f473ca811..b228f0089 100644 --- a/admin/templatetags/admin_extras.py +++ b/admin/templatetags/admin_extras.py @@ -179,7 +179,7 @@ def param(app, definition): selected = "" if value == v[0]: selected = " selected='selected'" - result += "\n" % (v[0], selected, v[1]) + result += "\n" % (v[0], selected, v[1].decode("utf-8")) result += """ """ diff --git a/extensions/amavis_quarantine/static/js/quarantine.js b/extensions/amavis_quarantine/static/js/quarantine.js index d07b7f274..f19ca9132 100644 --- a/extensions/amavis_quarantine/static/js/quarantine.js +++ b/extensions/amavis_quarantine/static/js/quarantine.js @@ -56,7 +56,7 @@ Quarantine.prototype = { e.preventDefault(); var $link = $(e.target).parent(); - this.navobj.deleteParam("rcpt"); + this.navobj.delparam("rcpt"); this.navobj.from_string($link.attr("href")).update(); }, diff --git a/extensions/amavis_quarantine/templates/amavis_quarantine/index.html b/extensions/amavis_quarantine/templates/amavis_quarantine/index.html index 8244b47e9..8cb7f90eb 100644 --- a/extensions/amavis_quarantine/templates/amavis_quarantine/index.html +++ b/extensions/amavis_quarantine/templates/amavis_quarantine/index.html @@ -1,4 +1,5 @@ -{% extends "fixed.html" %} +{% extends "fixed.html" %}{% load i18n %} +{% block pagetitle %}{% trans "Quarantine management" %}{% endblock %} {% block html_head %} diff --git a/extensions/sievefilters/templates/sievefilters/index.html b/extensions/sievefilters/templates/sievefilters/index.html index 783b74be8..15e8dde2f 100644 --- a/extensions/sievefilters/templates/sievefilters/index.html +++ b/extensions/sievefilters/templates/sievefilters/index.html @@ -1,5 +1,5 @@ -{% extends "twocols.html" %} -{% load i18n sfilters_tags %} +{% extends "twocols.html" %}{% load i18n sfilters_tags %} +{% block pagetitle %}{% trans "Message filters" %}{% endblock %} {% block html_head %} diff --git a/extensions/stats/__init__.py b/extensions/stats/__init__.py index 664818af7..a00881fcd 100644 --- a/extensions/stats/__init__.py +++ b/extensions/stats/__init__.py @@ -40,10 +40,10 @@ def destroy(): @events.observe("UserMenuDisplay") def menu(target, user): - if target == "top_menu": - return [ - {"name" : "stats", - "label" : ugettext("Statistics"), - "url" : reverse('fullindex')} - ] - return [] + if target != "top_menu" or user.group == "SimpleUsers": + return [] + return [ + {"name" : "stats", + "label" : ugettext("Statistics"), + "url" : reverse('fullindex')} + ] diff --git a/extensions/stats/templates/stats/index.html b/extensions/stats/templates/stats/index.html index 17f2e10f1..c17f6ec12 100644 --- a/extensions/stats/templates/stats/index.html +++ b/extensions/stats/templates/stats/index.html @@ -1,5 +1,5 @@ -{% extends "fixed.html" %} -{% load i18n %} +{% extends "fixed.html" %}{% load i18n %} +{% block pagetitle %}{% trans "Graphical statistics" %}{% endblock %} {% block html_head %} diff --git a/extensions/webmail/templates/webmail/index.html b/extensions/webmail/templates/webmail/index.html index 5eb8af0d6..27330b615 100644 --- a/extensions/webmail/templates/webmail/index.html +++ b/extensions/webmail/templates/webmail/index.html @@ -1,5 +1,5 @@ -{% extends "fixed.html" %} -{% load i18n libextras %} +{% extends "fixed.html" %}{% load i18n libextras %} +{% block pagetitle %}Webmail{% endblock %} {% block html_head %} diff --git a/lib/tables.py b/lib/tables.py index 81ccbfd06..662564c47 100644 --- a/lib/tables.py +++ b/lib/tables.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# coding: utf-8 """ :mod:`tables` --- simple tabular renderer ----------------------------------------- @@ -206,7 +206,7 @@ class Table(object): except AttributeError: return value - def __str__(self): + def __unicode__(self): return self.render() def render(self, withheader=True): diff --git a/templates/admin/domains.html b/templates/admin/domains.html index f9cd9616c..812078c91 100644 --- a/templates/admin/domains.html +++ b/templates/admin/domains.html @@ -1,5 +1,5 @@ -{% extends "admin/listing.html" %} -{% load i18n admin_extras libextras %} +{% extends "admin/listing.html" %}{% load i18n admin_extras libextras %} +{% block pagetitle %}{% trans "Domains" %}{% endblock %} {% block html_head %} {{ block.super }} diff --git a/templates/admin/parameters.html b/templates/admin/parameters.html index 19dd5486f..a18a21282 100644 --- a/templates/admin/parameters.html +++ b/templates/admin/parameters.html @@ -1,5 +1,5 @@ -{% extends "admin/settings_header.html" %} -{% load i18n %} +{% extends "admin/settings_header.html" %}{% load i18n %} +{% block pagetitle %}{% trans "Parameters" %}{% endblock %} {% block apparea %} {% url admin.views.saveparameters as action %}
diff --git a/templates/nlayout.html b/templates/nlayout.html index be4aecb3e..d141af954 100644 --- a/templates/nlayout.html +++ b/templates/nlayout.html @@ -1,9 +1,8 @@ - -{% load i18n admin_extras uprefs_extras libextras %} - +{% load i18n admin_extras uprefs_extras libextras %} + - Modoboa - {% block pagetitle %}{% endblock %} + {% block pagetitle %}{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html index 08d573c00..058c08516 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,5 +1,5 @@ {% load i18n libextras %} - + {% trans "Welcome to Modoboa" %} diff --git a/templates/userprefs/preferences.html b/templates/userprefs/preferences.html index fd9f0bf74..cc3106266 100644 --- a/templates/userprefs/preferences.html +++ b/templates/userprefs/preferences.html @@ -1,5 +1,5 @@ -{% extends "twocols.html" %} -{% load i18n uprefs_extras libextras %} +{% extends "twocols.html" %}{% load i18n uprefs_extras libextras %} +{% block pagetitle %}{% trans "Settings" %}{% endblock %} {% block html_head %}