Author: jmorliaguet
Date: Sat Jul  1 18:43:07 2006
New Revision: 3581

Modified:
   cpsskins/branches/paris-sprint-2006/elements/interfaces.py
   cpsskins/branches/paris-sprint-2006/locations/location.py
   cpsskins/branches/paris-sprint-2006/locations/sources.py
   cpsskins/branches/paris-sprint-2006/setup/io/adapters.py
   cpsskins/branches/paris-sprint-2006/standard/fields/color.zcml
   cpsskins/branches/paris-sprint-2006/standard/fields/image.zcml
   cpsskins/branches/paris-sprint-2006/standard/io/configure.zcml
   cpsskins/branches/paris-sprint-2006/standard/io/relation.py
   cpsskins/branches/paris-sprint-2006/thememanager.py
   cpsskins/branches/paris-sprint-2006/ui/screens/common/perspective_selector.pt
   
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css
   
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/negotiation_section.pt

Log:

- saving work



Modified: cpsskins/branches/paris-sprint-2006/elements/interfaces.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/interfaces.py  (original)
+++ cpsskins/branches/paris-sprint-2006/elements/interfaces.py  Sat Jul  1 
18:43:07 2006
@@ -52,7 +52,7 @@
 class ICanvas(IElement):
     """A canvas element"""
 
-class IField(IElement):
+class IField(Interface):
     """A field element"""
 
 class IFormat(IElement):

Modified: cpsskins/branches/paris-sprint-2006/locations/location.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/locations/location.py   (original)
+++ cpsskins/branches/paris-sprint-2006/locations/location.py   Sat Jul  1 
18:43:07 2006
@@ -17,12 +17,13 @@
 """
 __docformat__ = "reStructuredText"
 
+from persistent import Persistent
 from zope.component.factory import Factory
 from zope.interface import implements
 
 from cpsskins.locations.interfaces import ILocation
 
-class Location(object):
+class Location(Persistent):
     """A location
     """
     implements(ILocation)

Modified: cpsskins/branches/paris-sprint-2006/locations/sources.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/locations/sources.py    (original)
+++ cpsskins/branches/paris-sprint-2006/locations/sources.py    Sat Jul  1 
18:43:07 2006
@@ -69,7 +69,7 @@
                 theme_name = theme.name
                 for page in theme.getPages():
                     page_id = u'%s:%s' % (theme_name, page.name)
-                    choices[page_id] = u'%s / %s' % (theme.title, page.title)
+                    choices[page_id] = u'%s > %s' % (theme.title, page.title)
 
         elif root == u'perspectives':
             for perspective in tmutil.listPerspectives():

Modified: cpsskins/branches/paris-sprint-2006/setup/io/adapters.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/io/adapters.py    (original)
+++ cpsskins/branches/paris-sprint-2006/setup/io/adapters.py    Sat Jul  1 
18:43:07 2006
@@ -134,7 +134,7 @@
             # the value stored in the DOM is the name of the attachment in
             # the archive.
             if IBinaryFieldIO.providedBy(field_io):
-                value = u'%s_%s%s' % (element_id, attr, value)
+                value = u'%s_%s%s' % (type.contentname, attr, value)
                 archive[value] = obj
 
             # set the property as an attribute,
@@ -211,11 +211,9 @@
                 continue
 
             type = child_el.getAttribute(u'type')
-
             contentname = type or child_el.tagName
             factory_name = u'cpsskins.%s.%s' % (self.object_type,
                                                 contentname)
-
             # create the object
             element = createObject(factory_name)
 

Modified: cpsskins/branches/paris-sprint-2006/standard/fields/color.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/fields/color.zcml      
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/fields/color.zcml      Sat Jul 
 1 18:43:07 2006
@@ -9,10 +9,4 @@
     class=".color.WebColor"
   />
 
-  <cpsskins:preset
-    name="color"
-    schema=".color.IWebColor"
-    class=".color.WebColor"
-  />
-
 </configure>

Modified: cpsskins/branches/paris-sprint-2006/standard/fields/image.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/fields/image.zcml      
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/fields/image.zcml      Sat Jul 
 1 18:43:07 2006
@@ -9,10 +9,4 @@
     class=".image.WebImage"
   />
 
-  <cpsskins:preset
-    name="image"
-    schema=".image.IWebImage"
-    class=".image.WebImage"
-  />
-
 </configure>

Modified: cpsskins/branches/paris-sprint-2006/standard/io/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/io/configure.zcml      
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/io/configure.zcml      Sat Jul 
 1 18:43:07 2006
@@ -65,4 +65,12 @@
       provides="cpsskins.setup.io.interfaces.IDOMAdapter"
   />
 
+  <!-- fields -->
+  <adapter
+      for="cpsskins.elements.interfaces.IField *"
+      factory="cpsskins.setup.io.DOMAdapter"
+      permission="zope.ManageContent"
+      provides="cpsskins.setup.io.interfaces.IDOMAdapter"
+  />
+
 </configure>

Modified: cpsskins/branches/paris-sprint-2006/standard/io/relation.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/io/relation.py (original)
+++ cpsskins/branches/paris-sprint-2006/standard/io/relation.py Sat Jul  1 
18:43:07 2006
@@ -39,7 +39,11 @@
 
         for relate in context:
             relate_el = document.createElement(u'relate')
-            relate_el.setAttribute(u'uri', IIdentifiable(relate).getURI())
+            if isinstance(relate, basestring):
+                uri = relate
+            else:
+                uri = IIdentifiable(relate).getURI()
+            relate_el.setAttribute(u'uri', uri)
             relation_el.appendChild(relate_el)
 
         node.appendChild(relation_el)

Modified: cpsskins/branches/paris-sprint-2006/thememanager.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/thememanager.py (original)
+++ cpsskins/branches/paris-sprint-2006/thememanager.py Sat Jul  1 18:43:07 2006
@@ -314,9 +314,9 @@
     def removeFormats(self, object):
 
         # Physically remove the formats
-        for format in IFormattable(object).getFormats():
-            container = getParent(format)
-            del container[getName(format)]
+        formats = self.getFormatStorage()
+        formats.remove([getName(f) for f 
+                        in IFormattable(object).getFormats(resolve=False)])
 
         # Remove the relation
         relations = self.getRelationStorage()

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/common/perspective_selector.pt
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/common/perspective_selector.pt   
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/common/perspective_selector.pt   
    Sat Jul  1 18:43:07 2006
@@ -3,7 +3,8 @@
       action="@@setPerspective" method="post"
       tal:define="tmutil context/@@getThemeManager;
                   perspectives tmutil/listPerspectives;
-                  current context/@@negotiation/getPerspective">
+                  current context/@@negotiation/getPerspective"
+      tal:condition="perspectives">
   <select name="perspective">
     <option value="_" i18n:translate="">(no perspective)</option>
     <tal:block repeat="perspective perspectives">

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css
  (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/layout_mode.css
  Sat Jul  1 18:43:07 2006
@@ -53,7 +53,6 @@
   margin-top: 5px;
   margin-bottom: 5px;
   font-size: 0.9em;
-  font-style: italic;
 }
 
 .pageBlockAddButton img {

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/negotiation_section.pt
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/negotiation_section.pt
   (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/negotiation_section.pt
   Sat Jul  1 18:43:07 2006
@@ -33,7 +33,7 @@
         </tal:block>
 
         <td>
-          <a class="button" style="float: right" tal:condition="edited"
+          <a class="button" style="float: right"
              tal:attributes="href 
string:@@submitLocation?root=$section&location_path=$location_path&action=delete">
           [delete]
           </a>
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to