[Plone-cvs] r30977 - in plone.app.layout/trunk: docs plone/app/layout/icons

[Hanno S. <svn...@pl...>]

Author: hannosch
Date: Sat Oct 31 09:12:40 2009
New Revision: 30977

Modified:
   plone.app.layout/trunk/docs/HISTORY.txt
   plone.app.layout/trunk/plone/app/layout/icons/icons.py
Log:
Micro-optimize the icons views.


Modified: plone.app.layout/trunk/docs/HISTORY.txt
==============================================================================
--- plone.app.layout/trunk/docs/HISTORY.txt	(original)
+++ plone.app.layout/trunk/docs/HISTORY.txt	Sat Oct 31 09:12:40 2009
@@ -4,6 +4,9 @@
 2.0 - unreleased
 ----------------
 
+- Micro-optimize the icons views.
+  [hannosch]
+
 - Merged the ``selectedTabs`` Python script into the GlobalSectionsViewlet.
   [hannosch]
 

Modified: plone.app.layout/trunk/plone/app/layout/icons/icons.py
==============================================================================
--- plone.app.layout/trunk/plone/app/layout/icons/icons.py	(original)
+++ plone.app.layout/trunk/plone/app/layout/icons/icons.py	Sat Oct 31 09:12:40 2009
@@ -1,10 +1,10 @@
-from Acquisition import aq_inner
-from zope.interface import implements
-from zope.component import getMultiAdapter
-
 from plone.memoize.instance import memoize
+from zope.component import getMultiAdapter
+from zope.interface import implements
 
+from Acquisition import aq_inner
 from Products.CMFCore.utils import getToolByName
+
 from plone.app.layout.icons.interfaces import IContentIcon
 
 
@@ -39,10 +39,13 @@
 
     width = 16
     height = 16
+    title = None
 
     @property
     def url(self):
-        portal_url = getToolByName(self.context, 'portal_url')()
+        portal_state_view = getMultiAdapter(
+            (self.context, self.request), name=u'plone_portal_state')
+        portal_url = portal_state_view.portal_url()
         path = self.brain.getIcon
         return "%s/%s" % (portal_url, path)
 
@@ -52,10 +55,6 @@
         tt = getToolByName(context, 'portal_types')
         return tt.get(self.brain['portal_type']).Title()
 
-    @property
-    def title(self):
-        return None
-
 
 class CMFContentIcon(BaseIcon):
     implements(IContentIcon)
@@ -67,6 +66,7 @@
 
     width = 16
     height = 16
+    title = None
 
     @property
     def url(self):
@@ -80,10 +80,6 @@
         tt = getToolByName(context, 'portal_types')
         return tt.get(self.obj.portal_type).Title()
 
-    @property
-    def title(self):
-        return None
-
 
 class FTIContentIcon(BaseIcon):
     implements(IContentIcon)
@@ -95,6 +91,7 @@
 
     width = 16
     height = 16
+    title = None
 
     @property
     def url(self):
@@ -106,10 +103,6 @@
     def description(self):
         return self.obj.Title()
 
-    @property
-    def title(self):
-        return None
-
 
 class PloneSiteContentIcon(BaseIcon):
     implements(IContentIcon)
@@ -121,6 +114,7 @@
 
     width = 16
     height = 16
+    title = None
 
     @property
     def url(self):
@@ -136,10 +130,6 @@
     def description(self):
         return self.obj.Title()
 
-    @property
-    def title(self):
-        return None
-
 
 class DefaultContentIcon(BaseIcon):
     implements(IContentIcon)
@@ -151,6 +141,7 @@
 
     width = 16
     height = 16
+    title = None
 
     @property
     def url(self):
@@ -164,7 +155,3 @@
         if self.obj is None:
             return None
         return self.obj.Title()
-
-    @property
-    def title(self):
-        return None