Author: jmorliaguet
Date: Sat Jun 24 14:56:13 2006
New Revision: 3512

Modified:
   cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
   cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml
   cpsskins/branches/paris-sprint-2006/ui/screens/common/page_tabs.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/common/theme_tabs.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/common/views.py
   cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/filters/slot.pt
   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/portlet.pt
   cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/wysiwyg/slot.pt
   cpsskins/branches/paris-sprint-2006/utils.py

Log:

- renamed getModel as getModelInfo to avoid name conflicts



Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/authoring.css Sat Jun 
24 14:56:13 2006
@@ -302,6 +302,10 @@
   padding-right: 10px;
 }
 
+.pageTabs img {
+  border: none
+}
+
 .pageTabs li.selected a {
   background: url(++resource++r-tab-sel.png) top right no-repeat;
 }

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml        
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml        
Sat Jun 24 14:56:13 2006
@@ -145,8 +145,8 @@
     />
 
     <page
-        name="getModel"
-        attribute="getModel"
+      name="getModelInfo"
+      attribute="getModelInfo"
     />
 
   </pages>

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/page_tabs.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/page_tabs.pt  
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/page_tabs.pt  Sat Jun 
24 14:56:13 2006
@@ -8,8 +8,10 @@
   <tal:block repeat="page pages">
     <li tal:define="selected python: page == effective_page"
         tal:attributes="class python: selected and 'selected' or None">
-      <a tal:content="python: page.title or 'No title'"
-         tal:attributes="href 
string:@@setPage?name=${theme/name}:${page/name}" /></li>
+        <ins class="model" tal:content="page/@@getModelInfo" />
+        <img alt="" width="12" height="12" src="++resource++edit-12.png" />
+      <a tal:attributes="href string:@@setPage?name=${theme/name}:${page/name}"
+         tal:content="python: page.title or 'No title'" /></li>
   </tal:block>
   <li><a tal:attributes="href 
string:./@@addPage?theme_name=${theme/name}">+</a></li>
 </ul>

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/theme_tabs.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/theme_tabs.pt 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/theme_tabs.pt Sat Jun 
24 14:56:13 2006
@@ -12,9 +12,10 @@
           <img alt="" width="5" height="5" src="++resource++ltab.png" />
         </td>
         <td tal:attributes="class python: selected and 'tabselected' or 'tab'">
+          <ins class="model" tal:content="theme/@@getModelInfo" />
+          <img alt="" width="12" height="12" src="++resource++edit-12.png" />
           <a tal:content="python: theme.title or 'No title'"
              tal:attributes="href string:@@setPage?name=${theme/name}" />
-          <img alt="" width="12" height="12" src="++resource++edit-12.png" />
         </td>
         <td tal:attributes="class python: selected and 'rtabselected' or 
'rtab'">
           <img alt="" width="5" height="5" src="++resource++rtab.png" />

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 
24 14:56:13 2006
@@ -90,7 +90,7 @@
             icon_url = icon.url()
         return icon_url
 
-    def getModel(self, info):
+    def getModelInfo(self, info=None):
         context = self.context
         request = self.request
         id = context.identifier
@@ -102,7 +102,7 @@
             'data': {
                 'id': id,
                 'editable': True,
-                'order': info.order,
+                'order': info is not None and info.order or 0,
                 'container': IInnerNode.providedBy(context),
                 'uri': IIdentifiable(context).getURI(),
                 'formattable': True,

Modified: 
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/filters/slot.pt
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/filters/slot.pt    
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/ui/screens/contentauthor/filters/slot.pt    
    Sat Jun 24 14:56:13 2006
@@ -6,7 +6,7 @@
   icon context/@@getIcon">
 
   <ins class="model"
-       tal:define="info options/info; model nocall:context/@@getModel"
+       tal:define="info options/info; model nocall:context/@@getModelInfo"
        tal:content="python: model(info)" />
 
   <div class="slotFrame container portletTarget"

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 24 14:56:13 2006
@@ -10,7 +10,7 @@
 
   <div class="cellEditHeader">
     <ins class="model"
-         tal:define="model nocall:context/@@getModel"
+         tal:define="model nocall:context/@@getModelInfo"
          tal:content="python: model(info)" />
     <form action="@@editElement" tal:attributes="id string:c$cell_id">
       <input type="hidden" name="id" tal:attributes="value cell_id" />

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 24 14:56:13 2006
@@ -11,7 +11,7 @@
     <tr>
       <td>
         <ins class="model"
-             tal:define="model nocall:context/@@getModel"
+             tal:define="model nocall:context/@@getModelInfo"
              tal:content="python: model(info)" />
         <form class="pageBlockEditHeader" action="@@editElement"
               tal:attributes="id string: c$pageblock_id">

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 24 14:56:13 2006
@@ -1,5 +1,5 @@
 <ins class="model"
-     tal:define="info options/info; model nocall:context/@@getModel"
+     tal:define="info options/info; model nocall:context/@@getModelInfo"
      tal:content="python: model(info)" />
 
 <div i18n:domain="cpsskins" class="elementEditable elementMovable 
elementShiftable portletTarget"

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 24 14:56:13 2006
@@ -1,5 +1,5 @@
 <ins class="model"
-     tal:define="info options/info; model nocall:context/@@getModel"
+     tal:define="info options/info; model nocall:context/@@getModelInfo"
      tal:content="python: model(info)" />
 
 <tal:block define="

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 24 14:56:13 2006
@@ -1,5 +1,5 @@
 <ins class="model"
-     tal:define="info options/info; model nocall:context/@@getModel"
+     tal:define="info options/info; model nocall:context/@@getModelInfo"
      tal:content="python: model(info)" />
 
 <div class="elementEditable elementMovable elementShiftable portletTarget"

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 24 14:56:13 2006
@@ -1,5 +1,5 @@
 <ins class="model"
-     tal:define="info options/info; model nocall:context/@@getModel"
+     tal:define="info options/info; model nocall:context/@@getModelInfo"
      tal:content="python: model(info)" />
 
 <tal:block define="

Modified: cpsskins/branches/paris-sprint-2006/utils.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/utils.py        (original)
+++ cpsskins/branches/paris-sprint-2006/utils.py        Sat Jun 24 14:56:13 2006
@@ -109,8 +109,8 @@
     page[u'main'][u'right'] = Cell(u'Right')
     page[u'bottom'][u'bottom'] = Cell(u'Bottom')
     # Add the slots
-    page[u'main'][u'left'][u'left'] = Slot(u'Left slot', u'', u'left')
-    page[u'main'][u'right'][u'right'] = Slot(u'Right slot', u'', u'right')
+    page[u'main'][u'left'][u'left'] = Slot(u'Left slot', u'left')
+    page[u'main'][u'right'][u'right'] = Slot(u'Right slot', u'right')
 
     # Some basic layout formatting
     def set_width(element, width):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to