[Zope-CVS] CVS: Products/CompositePage - slot.py:1.12 transformers.py:1.9

[Shane Hathaway]

Update of /cvs-repository/Products/CompositePage
In directory cvs.zope.org:/tmp/cvs-serv29221

Modified Files:
	slot.py transformers.py 
Log Message:
Used the object icon as the element gripper


=== Products/CompositePage/slot.py 1.11 => 1.12 ===
--- Products/CompositePage/slot.py:1.11	Sat Dec 27 17:56:43 2003
+++ Products/CompositePage/slot.py	Mon Dec 29 11:47:46 2003
@@ -141,6 +141,10 @@
         if editing:
             mypath = escape('/'.join(self.getPhysicalPath()))
             myid = self.getId()
+            if hasattr(self, 'portal_url'):
+                icon_base_url = self.portal_url()
+            else:
+                icon_base_url = self.REQUEST['BASEPATH1']
         for index in range(len(items)):
             name, obj = items[index]
 
@@ -181,6 +185,10 @@
                     icon = str(obj.icon)
                 else:
                     icon = ""
+                if icon and '://' not in icon:
+                    if not icon.startswith('/'):
+                        icon = '/' + icon
+                    icon = icon_base_url + icon
 
                 title = obj.title_and_id()
                 path = escape('/'.join(obj.getPhysicalPath()))


=== Products/CompositePage/transformers.py 1.8 => 1.9 ===
--- Products/CompositePage/transformers.py:1.8	Sat Dec 27 23:32:47 2003
+++ Products/CompositePage/transformers.py	Mon Dec 29 11:47:46 2003
@@ -75,7 +75,6 @@
     target_image_hover = RawFile("target_hover.gif", "image/gif", _common)
     target_image_active = RawFile("target_active.gif", "image/gif", _common)
     element_image = RawFile("element.gif", "image/gif", _common)
-    element_image_active = RawFile("element_active.gif", "image/gif", _common)
 
     header_templates = (PageTemplateFile("header.pt", _common),)
     top_templates = ()