Changeset 1197 in products

Timestamp:

Jul 31, 2009 11:38:15 AM (15 years ago)

Author:

piv

Message:

basically implement content tabs functionality, add show_icons setting

Location:

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu

Files:

• browser/configure.zcml (modified) (1 diff)
• browser/menu.py (added)
• browser/templates/sections_recurse.pt (modified) (1 diff)
• browser/viewlets.py (modified) (5 diffs)
• controlpanel.txt (deleted)
• interfaces.py (modified) (2 diffs)
• tests/test_controlpanel.py (modified) (1 diff)

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/configure.zcml

@@ -22 +22 @@
       />
 
+  <class class=".menu.DropDownMenuQueryBuilder">
+    <allow interface="plone.app.layout.navigation.interfaces.INavigationQueryBuilder" />
+  </class>
+
+  <class class=".menu.DropDownMenuStrategy">
+        <allow interface="plone.app.layout.navigation.interfaces.INavtreeStrategy" />
+  </class>
+
+  <adapter
+      for="* *"
+      factory=".menu.DropDownMenuStrategy"
+      provides="plone.app.layout.navigation.interfaces.INavtreeStrategy" />
+
   <!-- Returns javascript which makes IE<7 understand hover for all html elements -->
   <browser:view

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/templates/sections_recurse.pt

@@ -22 +22 @@
                        title node/Description;
                        class string:$item_class${li_class}${li_extr_class}${li_folder_class}">
-        <img tal:replace="structure item_icon/html_tag" />
+        <img tal:condition="view/conf/show_icons"
+             tal:replace="structure item_icon/html_tag" />
         <span tal:content="node/Title">Selected Item Title</span>
     </a>

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/viewlets.py

@@ -2 +2 @@
 from Acquisition import aq_inner
 
-from zope.component import getMultiAdapter, queryUtility
+from zope.component import getMultiAdapter, getUtility
 
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
@@ -11 +11 @@
 from plone.memoize.instance import memoize
 from plone.app.layout.viewlets import common
+from plone.app.layout.navigation.navtree import buildFolderTree
+from plone.app.layout.navigation.interfaces import INavtreeStrategy
+from plone.app.layout.navigation.interfaces import INavigationQueryBuilder
 from plone.registry.interfaces import IRegistry
 
 from quintagroup.dropdownmenu.interfaces import IDropDownMenuSettings
+from quintagroup.dropdownmenu.browser.menu import DropDownMenuQueryBuilder
 
 
@@ -29 +33 @@
         self.conf = conf = self._settings()
         self.tool = getToolByName(context, 'portal_actions')
+
+        #import pdb;pdb.set_trace()
 
         # fetch actions-based tabs?
@@ -79 +85 @@
             if level <= self.conf.actions_tabs_level:
                 # try to find out appropriate subcategory
-                subcat_id = self.conf.nested_category_prefix + info['id'] + \
-                         self.conf.nested_category_sufix
+                subcat_id = info['id'] + self.conf.nested_category_sufix
+                if self.conf.nested_category_prefix is not None:
+                    subcat_id = self.conf.nested_category_prefix + subcat_id
                 if subcat_id in category.objectIds():
                     subcat = category._getOb(subcat_id)
@@ -122 +129 @@
     def _content_tabs(self):
         """Return tree of tabs based on content structure"""
-        return []
+        # TODO: check currentItem functionality
+        context = aq_inner(self.context)
+
+        queryBuilder = DropDownMenuQueryBuilder(context)
+        strategy = getMultiAdapter((context, None), INavtreeStrategy)
+        # XXX This works around a bug in plone.app.portlets which was
+        # fixed in http://dev.plone.org/svn/plone/changeset/18836
+        # When a release with that fix is made this workaround can be
+        # removed and the plone.app.portlets requirement in setup.py
+        # be updated.
+        if strategy.rootPath is not None and strategy.rootPath.endswith("/"):
+            strategy.rootPath = strategy.rootPath[:-1]
+
+        return buildFolderTree(context, obj=context, query=queryBuilder(),
+                               strategy=strategy).get('children', [])
 
     @memoize
     def _settings(self):
         """Fetch dropdown menu settings registry"""
-        registry = queryUtility(IRegistry)
+        registry = getUtility(IRegistry)
         return registry.forInterface(IDropDownMenuSettings)
 

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/interfaces.py

@@ -17 +17 @@
     configuration registry and obtainable via plone.registry.
     """
-    
+
+    show_icons = schema.Bool(
+        title=_(u"Show tabs icons"),
+        description=_(u"Use this setting to enable or disable icons for menu "
+                      u"items."),
+        default=False)
+
     show_content_tabs = schema.Bool(
         title=_(u"Show content tabs"),
@@ -57 +63 @@
                       u"nested menu stops. 0 means no limit. 1 only includes "
                       u"the root folder."),
-        default=0,
-        required=False)
+        default=0)
 
     actions_category = schema.TextLine(

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/tests/test_controlpanel.py

@@ -27 +27 @@
         self.failUnless('dropdownmenu' in [a.getAction(self)['id']
                             for a in self.controlpanel.listActions()])
+
+    def test_show_icons(self):
+        # Check show_icons record
+        show_icons = self.registry.records[IPREFIX+'show_icons']
+
+        self.failUnless('show_icons' in IDropDownMenuSettings)
+        self.assertEquals(self.registry[IPREFIX+'show_icons'], False)
 
     def test_show_content_tabs(self):