Author: jmorliaguet
Date: Mon Jun 19 23:52:32 2006
New Revision: 3466

Modified:
   cpsskins/branches/paris-sprint-2006/browser/configure.zcml
   cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt
   cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
   cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
   cpsskins/branches/paris-sprint-2006/browser/skin/template.pt

Log:

- removed the getPageViewer() mathod from the negotiation view.

  registered a named view instead



Modified: cpsskins/branches/paris-sprint-2006/browser/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/configure.zcml  (original)
+++ cpsskins/branches/paris-sprint-2006/browser/configure.zcml  Mon Jun 19 
23:52:32 2006
@@ -61,4 +61,6 @@
 
   <include package=".negotiation" />
 
+  <include package=".rendering" />
+
 </configure>

Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt  
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt  Mon Jun 
19 23:52:32 2006
@@ -12,8 +12,6 @@
 
 In particular, the renderer needs to know:
 
-- what *theme* to use
-
 - what *page* to render
 
 - which rendering *engine* to use
@@ -21,15 +19,13 @@
 - from which *perspective* to render the page
 
 
-Hence the entire negotiation process is split into 4 phases:
-
-1) the 'theme negotiation' phase
+Hence the entire negotiation process is split into 3 phases:
 
-2) the 'page negotiation' phase
+1) the 'page negotiation' phase
 
-3) the 'engine negotiation' phase
+2) the 'engine negotiation' phase
 
-4) the 'perspective negotiation' phase
+3) the 'perspective negotiation' phase
 
 
 By design, the phases are independent of one another. To each phase

Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py    
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py    Mon Jun 
19 23:52:32 2006
@@ -69,11 +69,3 @@
     def getEngine(self):
         return self.negotiate('engine')
 
-    ###################################################################
-    # Rendering
-    ###################################################################
-
-    def getPageViewer(self):
-        page = self.getPage()
-        return getMultiAdapter((page, self.request), IViewer)
-

Modified: cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py     
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py     Mon Jun 
19 23:52:32 2006
@@ -41,7 +41,7 @@
     def __init__(self, object):
         self.object = object
 
-class Viewer:
+class Viewer(object):
     """An element viewer provides a view of an element which is displayed
     in two phases:
 

Modified: cpsskins/branches/paris-sprint-2006/browser/skin/template.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/skin/template.pt        
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/skin/template.pt        Mon Jun 
19 23:52:32 2006
@@ -5,8 +5,9 @@
   </metal:block>
   <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
   tal:define="negotiation nocall:context/@@negotiation;
-              pageviewer negotiation/getPageViewer;
-              engine negotiation/getEngine">
+              engine negotiation/getEngine;
+              page negotiation/getPage;
+              pageviewer nocall:page/@@viewer">
     <head>
       <title metal:define-slot="title">CPSSkins for Zope3</title>
       <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to