Various fixes.

fixes #430

modoboa/core/templatetags/core_tags.py

@@ -31,36 +31,6 @@ def core_menu(selection, user):
     )
 
 
-@register.simple_tag
-def settings_menu(selection, user):
-    entries = [
-        {"name": "extensions",
-         "class": "ajaxlink",
-         "url": "extensions/",
-         "label": _("Extensions"),
-         "img": ""},
-        {"name": "info",
-         "class": "ajaxlink",
-         "url": "info/",
-         "label": _("Information")},
-        {"name": "logs",
-         "class": "ajaxlink",
-         "url": "logs/&sort_order=-date_created",
-         "label": _("Logs")},
-        {"name": "parameters",
-         "class": "ajaxlink",
-         "url": "parameters/",
-         "img": "",
-         "label": _("Parameters")},
-    ]
-    return render_to_string('common/menu.html', {
-        "entries": entries,
-        "css": "nav nav-list",
-        "selection": selection,
-        "user": user
-    })
-
-
 @register.simple_tag
 def extensions_menu(selection, user):
     menu = events.raiseQueryEvent("UserMenuDisplay", "top_menu", user)
@@ -83,7 +53,7 @@ def admin_menu(selection, user):
          "label": _("Information")},
         {"name": "logs",
          "class": "ajaxlink",
-         "url": "logs/",
+         "url": "logs/?sort_order=-date_created",
          "label": _("Logs")},
         {"name": "parameters",
          "class": "ajaxlink",

modoboa/extensions/admin/forms/account.py

@@ -15,7 +15,12 @@ from modoboa.extensions.admin.models import (
 
 
 class AccountFormGeneral(forms.ModelForm):
-    username = forms.CharField(label=ugettext_lazy("Username"))
+    username = forms.CharField(
+        label=ugettext_lazy("Username"),
+        help_text=ugettext_lazy(
+            "The user's name. Must be a valid e-mail address for simple users."
+        )
+    )
     role = forms.ChoiceField(
         label=ugettext_lazy("Role"),
         choices=[('', ugettext_lazy("Choose"))],

modoboa/extensions/postfix_relay_domains/general_callbacks.py

@@ -67,7 +67,7 @@ def rdomain_modify_link(domain):
             'modoboa.extensions.postfix_relay_domains.views.edit',
             args=[domain.id]
         ),
-        'modalcb': 'rdomain.domainform_cb'
+        'modalcb': 'rdomain.editdomain_form_cb'
     }
 
 

modoboa/extensions/postfix_relay_domains/static/postfix_relay_domains/js/relay_domains.js

@@ -67,6 +67,10 @@ RelayDomains.prototype = {
                 success_cb: $.proxy(admin.reload_listing, admin)
             });
         }, this));
+    },
+
+    editdomain_form_cb: function() {
+        this.domainform_cb();
         $(document).trigger('domform_init');
     },
 

modoboa/static/js/twocols_nav.js

@@ -119,7 +119,7 @@ TwocolsNav.prototype = {
     load_section: function(e) {
         var $link = get_target(e);
         e.preventDefault();
-        this.navobj.baseurl($link.attr("href")).update();
+        this.navobj.parse_string($link.attr("href"), true).update();
     },