* Added a simple box to display the current resource usage (see #105)

* Cleanup (see #204)
* Fixed javascript issues

admin/forms.py

@@ -246,7 +246,7 @@ class AccountFormGeneral(forms.ModelForm):
             role = None
             if self.cleaned_data.has_key("role"):
                 role = self.cleaned_data["role"]
-            elif self.user.group == "DomainAdmins":
+            elif self.user.group == "DomainAdmins" and self.user != account:
                 role = "SimpleUsers"
             if role is not None:
                 account.groups.clear()

admin/templatetags/admin_extras.py

@@ -203,6 +203,6 @@ def gender(value, target):
     return value
 
 @register.simple_tag
-def get_footer_content(user, objtype):
-    res = events.raiseQueryEvent("AdminFooterDisplay", user, objtype)
+def get_extra_admin_content(user, target, currentpage):
+    res = events.raiseQueryEvent("ExtraAdminContent", user, target, currentpage)
     return "".join(res)

admin/views.py

@@ -355,6 +355,7 @@ def editaccount(request, accountid, tplname="common/tabforms.html"):
 
     ctx = dict(
         title=account.username,
+        formid="accountform",
         action=reverse(editaccount, args=[accountid]),
         action_label=_("Update"),
         action_classes="submit"