From 60f74bf90ae5caf69efbce72b68e7af306b33b65 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Thu, 25 Mar 2010 08:05:09 +0200
Subject: [PATCH] Restructured the menu.

---
 scribeengine/model/classes.py       |  6 ++++++
 scribeengine/templates/sidebar.mako | 29 +++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/scribeengine/model/classes.py b/scribeengine/model/classes.py
index 69c75d5..3c2bef0 100644
--- a/scribeengine/model/classes.py
+++ b/scribeengine/model/classes.py
@@ -108,6 +108,12 @@ class User(BaseModel):
                     if perm == permission:
                         return True
             return False
+        elif isinstance(permission, list):
+            for role in self.roles:
+                for perm in role.permissions:
+                    if perm.name in permission:
+                        return True
+            return False
         else:
             return False
 
diff --git a/scribeengine/templates/sidebar.mako b/scribeengine/templates/sidebar.mako
index 04283a2..81fd3f7 100644
--- a/scribeengine/templates/sidebar.mako
+++ b/scribeengine/templates/sidebar.mako
@@ -26,18 +26,31 @@
             </li>
 % endif
             <li>
-                <h2>Account</h2>
+                <h2>Meta</h2>
                 <ul>
 % if c.current_user:
-                    <li><a href="${h.url_for(controller=u'account')}">My Account</a></li>
-% if c.current_user.has_permission('Add Posts'):
-                    <li><a href="${h.url_for(controller=u'post', action=u'new')}">New Post</a></li>
+                    <li>
+                        Account
+                        <ul>
+                            <li><a href="${h.url_for(controller=u'account')}">My Details</a></li>
+                            <li><a href="${h.url_for(controller=u'account', action=u'password')}">My Password</a></li>
+                        </ul>
+                    </li>
+% if c.current_user.has_permission([u'Add Posts', u'Add Pages', u'Edit My Posts', u'Edit My Pages']):
+                    <li>
+                        Content
+                        <ul>
+% if c.current_user.has_permission(u'Add Posts'):
+                            <li><a href="${h.url_for(controller=u'post', action=u'new')}">New Post</a></li>
 % endif
-% if c.current_user.has_permission('Add Pages'):
-                    <li><a href="${h.url_for(controller=u'page', action=u'new')}">New Page</a></li>
+% if c.current_user.has_permission(u'Add Pages'):
+                            <li><a href="${h.url_for(controller=u'page', action=u'new')}">New Page</a></li>
 % endif
-% if c.current_user.has_permission('Edit My Posts'):
-                    <li><a href="${h.url_for(controller=u'post', action=u'draft')}">Draft Posts</a></li>
+% if c.current_user.has_permission(u'Edit My Posts'):
+                            <li><a href="${h.url_for(controller=u'post', action=u'draft')}">Draft Posts</a></li>
+% endif
+                        </ul>
+                    </li>
 % endif
                     <li><a href="${h.url_for(controller=u'account', action=u'logout')}">Logout</a></li>
 % else: