see #92

I've started to separate permissions from the settings panel. It will be availab
le inside the Admin menu for users who are granted the "view_permissions" permis
sion.

admin/migrations/0004_add_permissions.py

@@ -0,0 +1,96 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        perm_ct = ContentType.objects.get(app_label="auth", model="permission")
+        view_perms = Permission(name="View permissions", codename="view_permissions",
+                                content_type=perm_ct)
+        view_perms.save()
+
+    def backwards(self, orm):
+        p = orm.Permission.objects.get(codename="view_permissions")
+        p.delete()
+
+
+    models = {
+        'admin.alias': {
+            'Meta': {'object_name': 'Alias'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'full_address': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mboxes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['admin.Mailbox']", 'symmetrical': 'False'})
+        },
+        'admin.domain': {
+            'Meta': {'object_name': 'Domain'},
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'quota': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'admin.extension': {
+            'Meta': {'object_name': 'Extension'},
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
+        'admin.mailbox': {
+            'Meta': {'object_name': 'Mailbox'},
+            'address': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}),
+            'full_address': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'gid': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'quota': ('django.db.models.fields.IntegerField', [], {}),
+            'uid': ('django.db.models.fields.IntegerField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['admin']

admin/templatetags/admin_extras.py

@@ -11,6 +11,44 @@ genders = {
     "Enabled" : (_("enabled_m"), _("enabled_f"))
 }
 
+@register.simple_tag
+def admin_menu(user):
+    entries = [
+        {"name" : "admin",
+         "img" : static_url('pics/admin.png'),
+         "label" : _("Admin"),
+         "class" : "topdropdown",
+         "menu" : []
+         }
+        ]
+    if user.has_perm("admin.view_domains"):
+        entries[0]["menu"] += [
+            {"name" : "domains",
+             "url" : reverse(admin.views.domains),
+             "label" : _("Domains"),
+             "img" : static_url("pics/domains.png")}
+            ]
+    if user.has_perm("auth.view_permissions"):
+        entries[0]["menu"] += [
+            {"name" : "permissions",
+             "url" : "",
+             "label" : _("Permissions"),
+             "img" : static_url("pics/permissions.png")}
+            ]
+    if user.is_superuser:
+        entries[0]["menu"] += [
+            {"name" : "settings",
+             "img" : static_url("pics/settings.png"),
+             "label" : _("Settings"),
+             "url" : reverse(admin.views.settings)}
+            ]
+
+    if not len(entries[0]["menu"]):
+        return ""
+    return render_to_string("common/menulist.html",
+                            {"entries" : entries, "user" : user})
+        
+
 @register.simple_tag
 def domain_menu(domain_id, selection, user):
     entries = [

templates/nlayout.html

@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load admin_extras %}
 {% load uprefs_extras %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -26,28 +27,7 @@
         <ul>
           {% loadextmenu user %}
           {% options_menu user %}
-
-          {% if user.is_superuser or perms.admin.view_domain %}
-          <li class="dropdown topdropdown">
-            <img src="{{ MEDIA_URL }}pics/admin.png" border="0" />
-            <label>{% trans "Admin" %}</label>
-            <ul class="links">
-              <li>
-                <a href="{% url admin.views.domains  %}">
-                  <img src="{{ MEDIA_URL }}pics/domains.png" />{% trans "Domains" %}
-                </a>
-              </li>
-              {% if user.is_superuser %}
-              <li>
-                <a href="{% url admin.views.settings %}">
-                  <img src="{{ MEDIA_URL }}pics/settings.png" border="0"/>
-                  {% trans "Settings" %}
-                </a>
-              </li>
-              {% endif %}
-            </ul>
-          </li>
-          {% endif %}
+          {% admin_menu user %}
         </ul>
       </div>
       <div class="right">
@@ -60,7 +40,6 @@
             {% endif %}
             / 
           </li>
-          
           <li>
             {% url modoboa.auth.views.dologout as logout_url %}
             <a href="{{ logout_url }}">

userprefs/templatetags/uprefs_extras.py

@@ -3,7 +3,7 @@ from django.template.loader import render_to_string
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from modoboa import userprefs
-from modoboa.lib import events
+from modoboa.lib import events, static_url
 
 register = template.Library()
 
@@ -11,18 +11,18 @@ register = template.Library()
 def options_menu(user):
     entries = [
         {"name"  : "userprefs",
-         "img"   : "/static/pics/user.png",
+         "img"   : static_url("pics/user.png"),
          "label" : _("Options"),
          "class" : "topdropdown",
          "menu"  : [
                 {"name" : "changepwd",
                  "url" : reverse(userprefs.views.changepassword),
-                 "img" : "/static/pics/edit.png",
+                 "img" : static_url("pics/edit.png"),
                  "label" : _("Change password"),
                  "class" : "boxed",
                  "rel" : "{handler:'iframe',size:{x:350,y:220}}"},
                 {"name" : "preferences",
-                 "img" : "/static/pics/user.png",
+                 "img" : static_url("pics/user.png"),
                  "label" : _("Preferences"),
                  "url" : reverse(userprefs.views.preferences),
                  }