Author: jmorliaguet
Date: Sat Jun  3 14:18:39 2006
New Revision: 3293

Modified:
   cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt
   
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/portlet.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt
   
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/portlet.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt

Log:

- optimizations: we use the data from the renderer's info structure.



Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py      
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py      Sat Jun 
 3 14:18:39 2006
@@ -86,33 +86,28 @@
             icon_url = icon.url()
         return icon_url
 
-    def getModel(self):
+    def getModel(self, info):
         context = self.context
         request = self.request
         id = context.identifier
 
-        authoring = getMultiAdapter((context, request), IAuthoring,
-                                         name='authoring')
-        negotiation = getMultiAdapter((context, request),
-                                           INegotiation, 'negotiation')
-        perspective = negotiation.getPerspective()
-        display = IDisplayable(context).getEffectiveDisplay(perspective)
-        formats = IFormattable(display).getFormats(resolve=False)
+        display = info.display
+        formats = IFormattable(display).getFormats()
 
         return json.write({
             'id': u'm%s' % id,
             'data': {
                 'id': id,
                 'editable': True,
-                'order': authoring.getElementOrder(id),
+                'order': info.order,
                 'container': IInnerNode.providedBy(context),
-                'display': str(display),
+                'display': display.identifier,
                 'uri': IIdentifiable(context).getURI(),
                 'formattable': True,
                 'formats': [
-                    {'choice': IType(f).getTypeName(),
-                     'label': _(IType(f).getTypeName()),
-                     'format': str(f),
+                    {'choice': IType(f).name,
+                     'label': _(IType(f).name),
+                     'format': f.identifier,
                     } for f in formats
                 ],
             },

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt  
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/cell.pt  
Sat Jun  3 14:18:39 2006
@@ -32,7 +32,9 @@
        tal:content="structure options/markup" />
 
   <div style="text-align: center">
-    <ins class="model" tal:content="context/@@getModel" />
+    <ins class="model"
+         tal:define="model nocall:context/@@getModel"
+         tal:content="python: model(info)" />
     <img class="hover"
          tal:attributes="id string:c$cell_id" width="12" height="12"
          title="edit this cell" style="padding: 3px"

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt 
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/pageblock.pt 
    Sat Jun  3 14:18:39 2006
@@ -31,7 +31,9 @@
         </form>
 
         <div style="text-align: center">
-          <ins class="model" tal:content="context/@@getModel" />
+          <ins class="model"
+               tal:define="model nocall:context/@@getModel"
+               tal:content="python: model(info)" />
           <img class="hover"
                tal:attributes="id string:c$pageblock_id" width="12" height="12"
                title="edit this page block" style="padding: 3px"

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/portlet.pt
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/portlet.pt   
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/portlet.pt   
    Sat Jun  3 14:18:39 2006
@@ -1,4 +1,6 @@
-<ins class="model" tal:content="context/@@getModel" />
+<ins class="model"
+     tal:define="info options/info; model nocall:context/@@getModel"
+     tal:content="python: model(info)" />
 
 <div class="elementMovable elementShiftable portletTarget"
   tal:define="

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt  
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/layout/slot.pt  
Sat Jun  3 14:18:39 2006
@@ -1,4 +1,6 @@
-<ins class="model" tal:content="context/@@getModel" />
+<ins class="model"
+     tal:define="info options/info; model nocall:context/@@getModel"
+     tal:content="python: model(info)" />
 
 <tal:block define="
   info options/info;

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/cell.pt 
Sat Jun  3 14:18:39 2006
@@ -14,7 +14,9 @@
        tal:content="structure options/markup" />
 
   <div style="text-align: center">
-    <ins class="model" tal:content="context/@@getModel" />
+    <ins class="model"
+         tal:define="model nocall:context/@@getModel"
+         tal:content="python: model(info)" />
     <img class="hover" tal:attributes="id string:c$id" width="12" height="12"
          title="edit this cell" style="padding: 3px"
          src="/++skin++cpsskins/@@/edit-12.png" />

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/portlet.pt
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/portlet.pt  
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/portlet.pt  
    Sat Jun  3 14:18:39 2006
@@ -1,4 +1,6 @@
-<ins class="model" tal:content="context/@@getModel" />
+<ins class="model"
+     tal:define="info options/info; model nocall:context/@@getModel"
+     tal:content="python: model(info)" />
 
 <div class="editable elementMovable elementShiftable portletTarget"
   tal:attributes="id context/identifier"

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt 
Sat Jun  3 14:18:39 2006
@@ -1,4 +1,6 @@
-<ins class="model" tal:content="context/@@getModel" />
+<ins class="model"
+     tal:define="info options/info; model nocall:context/@@getModel"
+     tal:content="python: model(info)" />
 
 <tal:block define="
   slot_title context/title;
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to