[kupu-checkins] r32842 - in kupu/trunk/kupu: common plone

[duncan at codespeak.net]

Author: duncan
Date: Tue Oct  3 15:14:11 2006
New Revision: 32842

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/plone/plonedrawers.py
Log:
Anchor drawer: don't include 'remove style' as a style.
plonedrawers.py: fix icon path (same bug as topics used to have http://dev.plone.org/plone/ticket/3015)


Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Tue Oct  3 15:14:11 2006
@@ -2779,7 +2779,7 @@
     var ui = this.editor.getTool('ui');
     var options = ui.getStyles()[0];
 
-    for (var i = 1; i < options.length; i++) {
+    for (var i = 1; i < options.length-1; i++) {
         var t = options[i][0];
         var v =options[i][1];
         

Modified: kupu/trunk/kupu/plone/plonedrawers.py
==============================================================================
--- kupu/trunk/kupu/plone/plonedrawers.py	(original)
+++ kupu/trunk/kupu/plone/plonedrawers.py	Tue Oct  3 15:14:11 2006
@@ -161,6 +161,7 @@
         self.portal_base = self.url_tool.getPortalPath()
         self.prefix_length = len(self.portal_base)+1
         self.resource_type = resource_type
+        self.ttool = getToolByName(portal, 'portal_types')
         
         instance = tool.REQUEST.get('instance', '')
         if instance:
@@ -195,8 +196,9 @@
 
         return dict([(id,title) for (title,id) in states])
 
-    def icon(self, icon):
-        return "%s/%s" % (self.base, icon)
+    def icon(self, portal_type):
+        type = self.ttool.getTypeInfo(portal_type)
+        return "%s/%s" % (self.base, type.getIcon())
 
     def sizes(self, obj):
         """Returns size, width, height"""
@@ -298,7 +300,7 @@
 
             sizes = self.get_image_sizes(obj, portal_type, url)
 
-            icon = self.icon(obj.getIcon(1))
+            icon = self.icon(portal_type)
             size, width, height = self.sizes(obj)
 
             title = obj.Title() or obj.getId()
@@ -375,7 +377,7 @@
 
         sizes = self.get_image_sizes(brain, portal_type, url)
 
-        icon = self.icon(brain.getIcon)
+        icon = self.icon(portal_type)
         size, width, height = self.sizes(brain)
 
         title = brain.Title or brain.getId