From acf7c3e50450477a4cf799653bb8492be07c95af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 22 Apr 2015 11:08:17 +0200
Subject: [PATCH 04/11] backoffice: limit menu to main items, add more items
 with small blocks (#6726)

Main items are determined as having an attributed icon, it's not that good as a
reference but will do for now.
---
 wcs/backoffice/root.py              | 54 ++++++++++++++++++++++++++++++++++---
 wcs/qommon/backoffice/root.py       | 24 -----------------
 wcs/qommon/static/css/dc2/admin.css |  5 ++++
 3 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/wcs/backoffice/root.py b/wcs/backoffice/root.py
index ef0f8ab..2924798 100644
--- a/wcs/backoffice/root.py
+++ b/wcs/backoffice/root.py
@@ -270,27 +270,73 @@ class RootDirectory(BackofficeRootDirectory):
     def get_intro_text(self):
         return _('''Welcome.''')
 
+    def generate_header_menu(self, selected=None):
+        s = ['<ul id="menu">\n']
+        base_url = get_publisher().get_root_url() + 'backoffice'
+        for item in self.get_menu_items():
+            if len(item) == 2:
+                k, v = item
+                display_function = None
+            elif len(item) == 3:
+                k, v, display_function = item
+            if k is None: # heading
+                s.append('<li><strong>%s</strong></li>' % v)
+                continue
+            if k.strip('/') not in ('home', 'forms', 'workflows', 'users', 'roles',
+                    'categories', 'settings', 'management'):
+                # skip items that do not have icons, they will have to be
+                # accessed via the backoffice main page
+                continue
+            if k == '/':
+                continue # skip root
+            if display_function and not display_function(k):
+                continue
+            if k.rstrip('/') == selected:
+                s.append('<li class="active">')
+            else:
+                s.append('<li>')
+            s.append('<a href="%s/%s">%s</a></li>\n' % (base_url, k, _(v)))
+        s.append('</ul>\n')
+        return ''.join(s)
+
     def _q_index(self):
         html_top('/')
         r = TemplateIO(html=True)
         r += htmltext('<div class="bo-block"><p>%s</p></div>') % self.get_intro_text()
-        r += htmltext('<ul class="apps">')
+
+        main_items = []
+        more_items = []
         for item in self.get_menu_items():
             if len(item) == 2:
                 item = list(item) + [None]
             k, v, display_function = item
-            if k.strip('/') not in ('home', 'forms', 'workflows', 'users', 'roles',
-                    'categories', 'settings', 'management'):
-                # limit this space to menu entries that have icons.
+            if not k.strip('/'):
                 continue
+            if k.strip('/') in ('home', 'forms', 'workflows', 'users', 'roles',
+                    'categories', 'settings', 'management'):
+                # menu entries that have icons.
+                main_items.append((k, v))
+            else:
+                more_items.append((k, v))
+
+        r += htmltext('<ul class="apps">')
+        for k, v in main_items:
             r += htmltext('<li class="zone-%s"><a href="%s">') % (k.strip('/'), k)
             if callable(v):
                 r += v()
             else:
                 r += _(v)
             r += htmltext('</a></li>')
+        for k, v in more_items:
+            r += htmltext('<li class="zone-no-icon"><a href="%s">') % k
+            if callable(v):
+                r += v()
+            else:
+                r += _(v)
+            r += htmltext('</a></li>')
         r += htmltext('</ul>')
         r += htmltext('<br class="clear">')
+
         r += htmltext('<p id="for-more-info"></p>')
 
         get_response().filter['sidebar'] = str(self.get_sidebar())
diff --git a/wcs/qommon/backoffice/root.py b/wcs/qommon/backoffice/root.py
index 2091459..e4d8d9b 100644
--- a/wcs/qommon/backoffice/root.py
+++ b/wcs/qommon/backoffice/root.py
@@ -137,27 +137,3 @@ class BackofficeRootDirectory(AccessControlled, Directory):
 
     def get_menu_items(self):
         return self.menu_items
-
-    def generate_header_menu(self, selected=None):
-        s = ['<ul id="menu">\n']
-        base_url = get_publisher().get_root_url() + 'backoffice'
-        for item in self.get_menu_items():
-            if len(item) == 2:
-                k, v = item
-                display_function = None
-            elif len(item) == 3:
-                k, v, display_function = item
-            if k is None: # heading
-                s.append('<li><strong>%s</strong></li>' % v)
-                continue
-            if k == '/':
-                continue # skip root
-            if display_function and not display_function(k):
-                continue
-            if k.rstrip('/') == selected:
-                s.append('<li class="active">')
-            else:
-                s.append('<li>')
-            s.append('<a href="%s/%s">%s</a></li>\n' % (base_url, k, _(v)))
-        s.append('</ul>\n')
-        return ''.join(s)
diff --git a/wcs/qommon/static/css/dc2/admin.css b/wcs/qommon/static/css/dc2/admin.css
index 51413db..c4eaae0 100644
--- a/wcs/qommon/static/css/dc2/admin.css
+++ b/wcs/qommon/static/css/dc2/admin.css
@@ -768,6 +768,11 @@ li.zone-management a:hover { background-image: url(icon-management-hover.png); }
 li.zone-home a { background-image: url(icon-home.png); }
 li.zone-home a:hover { background-image: url(icon-home-hover.png); }
 
+ul.apps li.zone-no-icon a {
+	height: 29px;
+	padding-top: 24px;
+}
+
 .ui-dialog div.SubmitWidget input {
   margin-top: 0;
   border: 1px solid #ccc;
-- 
2.1.4