Changeset 2657 in products

Timestamp:

Jul 9, 2010 2:49:17 PM (14 years ago)

Author:

fenix

Message:

fixed "show icons" functionality for plone4

Location:

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser

Files:

• templates/sections_recurse.pt (modified) (2 diffs)
• viewlets.py (modified) (2 diffs)

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

@@ -1 +1 @@
 <tal:master define="level options/level|python:0;
-                    children options/children | nothing"
+                    children options/children | nothing;
+                    plonefour view/is_plone_four"
             i18n:domain="plone">
 
@@ -15 +16 @@
                 li_extr_class   python:(is_in_path and not is_current) and li_extr_class + ' selected' or li_extr_class;
                 li_extr_class   python:(not (is_in_path or is_current)) and li_extr_class + ' plain' or li_extr_class;
-                li_folder_class python:show_children and ' globalSectionsFolderish' or '';"
+                li_folder_class python:show_children and ' globalSectionsFolderish' or '';
+                item_type       node/normalized_portal_type | nothing"
     tal:attributes="class string:globalSectionsItem visualNoMarker${li_class}${li_extr_class}${li_folder_class}">
 
-    <tal:level define="item_class string:state-${node/normalized_review_state}">
+    <tal:level define="show_icons view/conf/show_icons;
+                       item_class string:state-${node/normalized_review_state}">
+
     <a tal:attributes="href python:item_url;
                        title node/Description;
                        class string:$item_class${li_class}${li_extr_class}${li_folder_class}">
-        <img tal:condition="view/conf/show_icons"
-             tal:replace="structure item_icon/html_tag" />
-        <span tal:content="node/Title">Selected Item Title</span>
+        <img tal:condition="python: show_icons and not plonefour"
+             tal:replace="structure item_icon/html_tag | nothing" />
+        <span tal:content="node/Title"
+              tal:attributes="class python: plonefour and show_icons and item_type and 'contenttype-'+ item_type or nothing">Selected Item Title</span>
     </a>
 

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

@@ -8 +8 @@
 from Products.CMFCore.interfaces import IAction, IActionCategory
 from Products.CMFCore.ActionInformation import ActionInfo
+from Products.CMFPlone.utils import versionTupleFromString
 
 from plone.memoize.instance import memoize
@@ -181 +182 @@
                                           self.portal_tabs)
         self.selected_portal_tab = self.selected_tabs['portal']
+
+    @property
+    def is_plone_four(self):
+        """Indicates if we are in plone 4.
+        
+        """
+        pm = getToolByName(aq_inner(self.context), 'portal_migration') 
+        version = versionTupleFromString(pm.getSoftwareVersion())
+        if version:
+            return version[0] == 4
+