Author: jmorliaguet
Date: Wed Mar 29 23:47:28 2006
New Revision: 2743

Modified:
   cpsskins/branches/jmo-perspectives/browser/README.txt
   cpsskins/branches/jmo-perspectives/browser/negotiation/configure.zcml
   cpsskins/branches/jmo-perspectives/browser/negotiation/interfaces.py
   cpsskins/branches/jmo-perspectives/browser/negotiation/views.py
   cpsskins/branches/jmo-perspectives/browser/rendering/viewer.py
   cpsskins/branches/jmo-perspectives/browser/skin/template.pt
   cpsskins/branches/jmo-perspectives/browser/tree/slot.py
   cpsskins/branches/jmo-perspectives/ui/editing/edit_menu.pt
   cpsskins/branches/jmo-perspectives/ui/editing/portlet_editor.pt
   cpsskins/branches/jmo-perspectives/ui/editing/presentation_editor.pt
   cpsskins/branches/jmo-perspectives/ui/editing/views.py
   cpsskins/branches/jmo-perspectives/ui/manager/views.py
   cpsskins/branches/jmo-perspectives/ui/panels/page_tabs.pt
   cpsskins/branches/jmo-perspectives/ui/panels/perspective_selector.pt
   cpsskins/branches/jmo-perspectives/ui/panels/theme_tabs.pt
   cpsskins/branches/jmo-perspectives/ui/panels/views.py
Log:

- fixed spelling



Modified: cpsskins/branches/jmo-perspectives/browser/README.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/README.txt       (original)
+++ cpsskins/branches/jmo-perspectives/browser/README.txt       Wed Mar 29 
23:47:28 2006
@@ -7,10 +7,10 @@
 -------
 a series of screens for managing themes inside the ZMI
 
-negociation
+negotiation
 -----------
 pages used for obtaining information on features that require some kind of
-negociation between the client/user (request) and the server -- such as
+negotiation between the client/user (request) and the server -- such as
 the effective theme, the current perspective ...
 
 rendering

Modified: cpsskins/branches/jmo-perspectives/browser/negotiation/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/negotiation/configure.zcml       
(original)
+++ cpsskins/branches/jmo-perspectives/browser/negotiation/configure.zcml       
Wed Mar 29 23:47:28 2006
@@ -1,15 +1,15 @@
 <configure
     xmlns="http://namespaces.zope.org/browser";>
 
-  <!-- Negociation view -->
+  <!-- Negotiation view -->
 
   <view
     for="*"
-    name="negociation"
-    provides=".interfaces.INegociation"
-    class=".views.NegociationView"
+    name="negotiation"
+    provides=".interfaces.INegotiation"
+    class=".views.NegotiationView"
     permission="zope.Public"
-    allowed_interface=".interfaces.INegociation"
+    allowed_interface=".interfaces.INegotiation"
     layer="cpsskins.browser.skin.cpsskins"
   />
 
@@ -17,7 +17,7 @@
     layer="cpsskins.browser.skin.cpsskins"
     for="*"
     permission="zope.ManageContent"
-    class=".views.NegociationView">
+    class=".views.NegotiationView">
 
       <page
         name="setWorkTheme"

Modified: cpsskins/branches/jmo-perspectives/browser/negotiation/interfaces.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/negotiation/interfaces.py        
(original)
+++ cpsskins/branches/jmo-perspectives/browser/negotiation/interfaces.py        
Wed Mar 29 23:47:28 2006
@@ -19,7 +19,7 @@
 
 from zope.interface import Interface
 
-class INegociation(Interface):
+class INegotiation(Interface):
 
     def getTheme():
         """Return the effective theme

Modified: cpsskins/branches/jmo-perspectives/browser/negotiation/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/negotiation/views.py     
(original)
+++ cpsskins/branches/jmo-perspectives/browser/negotiation/views.py     Wed Mar 
29 23:47:28 2006
@@ -25,13 +25,13 @@
 
 from cpsskins.elements.interfaces import ITheme, IThemePage
 from cpsskins.browser.rendering.interfaces import IViewer
-from cpsskins.browser.negociation.interfaces import INegociation
+from cpsskins.browser.negotiation.interfaces import INegotiation
 from cpsskins.utils import getThemeManager
 
-class NegociationView(BrowserView):
-    """A view for the negociation of the effective theme, perspective, ...
+class NegotiationView(BrowserView):
+    """A view for the negotiation of the effective theme, perspective, ...
     """
-    implements(INegociation)
+    implements(INegotiation)
 
     ###################################################################
     # Themes and pages

Modified: cpsskins/branches/jmo-perspectives/browser/rendering/viewer.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/rendering/viewer.py      
(original)
+++ cpsskins/branches/jmo-perspectives/browser/rendering/viewer.py      Wed Mar 
29 23:47:28 2006
@@ -28,7 +28,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 
-from cpsskins.browser.negociation.interfaces import INegociation
+from cpsskins.browser.negotiation.interfaces import INegotiation
 from cpsskins.browser.rendering.context import ContextInfo
 from cpsskins.browser.rendering.interfaces import (
     IUpdateData, IViewer, IRendererView, IViewNodeEvent)
@@ -71,9 +71,9 @@
         tree = contexts['tree'] = {}
 
         relations = getUtility(IRelationStorage, context=element)
-        negociation = getMultiAdapter((element, request),
-                                      INegociation, 'negociation')
-        perspective = negociation.getPerspective()
+        negotiation = getMultiAdapter((element, request),
+                                      INegotiation, 'negotiation')
+        perspective = negotiation.getPerspective()
 
         # update global context info variables passed as keyword parameters
         globals = ContextInfo(kw)

Modified: cpsskins/branches/jmo-perspectives/browser/skin/template.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/skin/template.pt (original)
+++ cpsskins/branches/jmo-perspectives/browser/skin/template.pt Wed Mar 29 
23:47:28 2006
@@ -4,9 +4,9 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
   </metal:block>
   <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
-  tal:define="negociation nocall:context/@@negociation;
-              pageviewer negociation/getPageViewer;
-              engine negociation/getEngine">
+  tal:define="negotiation nocall:context/@@negotiation;
+              pageviewer negotiation/getPageViewer;
+              engine negotiation/getEngine">
     <head>
       <title metal:define-slot="title">CPSSkins for Zope3</title>
       <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />

Modified: cpsskins/branches/jmo-perspectives/browser/tree/slot.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/tree/slot.py     (original)
+++ cpsskins/branches/jmo-perspectives/browser/tree/slot.py     Wed Mar 29 
23:47:28 2006
@@ -24,7 +24,7 @@
 from zope.app.traversing.api import getParent
 from zope.interface import implements
 
-from cpsskins.browser.negociation.interfaces import INegociation
+from cpsskins.browser.negotiation.interfaces import INegotiation
 from cpsskins.elements.interfaces import IPortlet, IDisplayable
 from cpsskins.ontology import hasPortlet, hasPortletFromPerspective
 from cpsskins.relations import DyadicRelation, TriadicRelation
@@ -49,8 +49,8 @@
 
         perspective = zapi.getMultiAdapter(
             objects=(container, request),
-            interface=INegociation,
-            name='negociation',
+            interface=INegotiation,
+            name='negotiation',
             ).getPerspective()
 
         # a slot is not a container, it is a collection of references to
@@ -154,8 +154,8 @@
 
         perspective = getMultiAdapter(
             objects=(container, request),
-            interface=INegociation,
-            name='negociation',
+            interface=INegotiation,
+            name='negotiation',
             ).getPerspective()
 
         portlets = getUtility(IPortletStorage, context=container)
@@ -198,7 +198,7 @@
             raise TypeError("Only portlets can be reordered inside slots")
 
         perspective = getMultiAdapter(objects=(container, request),
-                         interface=INegociation, name='negociation'
+                         interface=INegotiation, name='negotiation'
                          ).getPerspective()
 
         display = IDisplayable(container).getEffectiveDisplay(perspective)
@@ -216,7 +216,7 @@
             raise TypeError("Only portlets can be contained in slots")
 
         perspective = getMultiAdapter(objects=(container, request),
-                         interface=INegociation, name='negociation'
+                         interface=INegotiation, name='negotiation'
                          ).getPerspective()
 
         display = IDisplayable(container).getEffectiveDisplay(perspective)

Modified: cpsskins/branches/jmo-perspectives/ui/editing/edit_menu.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/editing/edit_menu.pt  (original)
+++ cpsskins/branches/jmo-perspectives/ui/editing/edit_menu.pt  Wed Mar 29 
23:47:28 2006
@@ -4,7 +4,7 @@
     tal:define="tmutil context/@@getThemeManager;
                 info context/@@editpanel/getInfo;
                 perspective nocall:info/perspective;
-                negociation nocall:info/negociation;
+                negotiation nocall:info/negotiation;
                 format_name info/format_name;
                 display nocall:info/display;
                 main_url info/main_url"

Modified: cpsskins/branches/jmo-perspectives/ui/editing/portlet_editor.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/editing/portlet_editor.pt     
(original)
+++ cpsskins/branches/jmo-perspectives/ui/editing/portlet_editor.pt     Wed Mar 
29 23:47:28 2006
@@ -1,6 +1,6 @@
 <tal:block define="tmutil context/@@getThemeManager;
-                   negociation nocall:context/@@negociation;
-                   effective_theme negociation/getTheme">
+                   negotiation nocall:context/@@negotiation;
+                   effective_theme negotiation/getTheme">
 <html metal:use-macro="context/@@popup_macros/page">
   <head>
     <tal:style metal:fill-slot="style">

Modified: cpsskins/branches/jmo-perspectives/ui/editing/presentation_editor.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/editing/presentation_editor.pt        
(original)
+++ cpsskins/branches/jmo-perspectives/ui/editing/presentation_editor.pt        
Wed Mar 29 23:47:28 2006
@@ -1,10 +1,10 @@
 <html metal:use-macro="context/@@popup_macros/page">
   <body metal:fill-slot="body" i18n:domain="cpsskins">
     <div class="editArea"
-         tal:define="negociation nocall:context/@@negociation;
+         tal:define="negotiation nocall:context/@@negotiation;
                      info context/presentable:getPresentationInfo;
                      presentations info/presentations;
-                     current_perspective negociation/getPerspective;
+                     current_perspective negotiation/getPerspective;
                      default_presentation presentations/default|nothing;
                      format_names info/format_names">
 

Modified: cpsskins/branches/jmo-perspectives/ui/editing/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/editing/views.py      (original)
+++ cpsskins/branches/jmo-perspectives/ui/editing/views.py      Wed Mar 29 
23:47:28 2006
@@ -25,7 +25,7 @@
 from zope.interface import implements, Interface
 from zope.security.proxy import removeSecurityProxy
 
-from cpsskins.browser.negociation.interfaces import INegociation
+from cpsskins.browser.negotiation.interfaces import INegotiation
 from cpsskins.elements.interfaces import IDisplayable, IFormattable
 from cpsskins.elements.interfaces import IType, IDisplay, IFormat
 from cpsskins.relations.interfaces import IRelationTool
@@ -96,9 +96,9 @@
         format_name = form.get('format')
         main_url = form.get('main_url')
 
-        negociation = getMultiAdapter((context, request),
-                                      INegociation, 'negociation')
-        perspective = negociation.getPerspective()
+        negotiation = getMultiAdapter((context, request),
+                                      INegotiation, 'negotiation')
+        perspective = negotiation.getPerspective()
         displayable = IDisplayable(context)
         display = displayable.getEffectiveDisplay(perspective)
         formattable = IFormattable(display)
@@ -160,7 +160,7 @@
         main_url = main_url or self.getAbsoluteURL(main) + '/@@edit.html'
 
         return {
-            'negociation': negociation,
+            'negotiation': negotiation,
             'perspective': perspective,
             'display': display,
             'format_name': format_name,

Modified: cpsskins/branches/jmo-perspectives/ui/manager/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/manager/views.py      (original)
+++ cpsskins/branches/jmo-perspectives/ui/manager/views.py      Wed Mar 29 
23:47:28 2006
@@ -23,7 +23,7 @@
 from zope.app.publisher.browser import BrowserView
 from zope.interface import implements
 
-from cpsskins.browser.negociation.interfaces import INegociation
+from cpsskins.browser.negotiation.interfaces import INegotiation
 from cpsskins.elements.interfaces import IDisplayable, IFormattable
 from cpsskins.elements.theme import Theme
 from cpsskins.elements.themepage import ThemePage
@@ -62,9 +62,9 @@
         """
         context = self.context
         request = self.request
-        negociation = zapi.getMultiAdapter((context, request), INegociation,
-                                            'negociation')
-        negociation.setWorkTheme(name)
+        negotiation = zapi.getMultiAdapter((context, request), INegotiation,
+                                            'negotiation')
+        negotiation.setWorkTheme(name)
         request.response.redirect('./@@editor.html')
 
     def addTheme(self):

Modified: cpsskins/branches/jmo-perspectives/ui/panels/page_tabs.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/panels/page_tabs.pt   (original)
+++ cpsskins/branches/jmo-perspectives/ui/panels/page_tabs.pt   Wed Mar 29 
23:47:28 2006
@@ -1,8 +1,8 @@
 <ul class="pageTabs"
   tal:define="tmutil context/@@getThemeManager;
-              negociation nocall:context/@@negociation;
-              effective_theme negociation/getTheme;
-              effective_page negociation/getPage;
+              negotiation nocall:context/@@negotiation;
+              effective_theme negotiation/getTheme;
+              effective_page negotiation/getPage;
               pages effective_theme/getPages">
   <tal:block repeat="page pages">
     <li tal:define="selected python: page == effective_page"

Modified: cpsskins/branches/jmo-perspectives/ui/panels/perspective_selector.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/panels/perspective_selector.pt        
(original)
+++ cpsskins/branches/jmo-perspectives/ui/panels/perspective_selector.pt        
Wed Mar 29 23:47:28 2006
@@ -2,7 +2,7 @@
       action="@@setPerspective" method="post"
       tal:define="tmutil context/@@getThemeManager;
                   perspectives tmutil/listPerspectives;
-                  current context/@@negociation/getPerspective">
+                  current context/@@negotiation/getPerspective">
   <select onchange="submit()" name="perspective">
     <option value="" i18n:translate="">default</option>
     <option tal:repeat="perspective perspectives"

Modified: cpsskins/branches/jmo-perspectives/ui/panels/theme_tabs.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/panels/theme_tabs.pt  (original)
+++ cpsskins/branches/jmo-perspectives/ui/panels/theme_tabs.pt  Wed Mar 29 
23:47:28 2006
@@ -1,7 +1,7 @@
 <table class="topTabs" cellpadding="0" cellspacing="0" border="0" summary=""
   tal:define="tmutil context/@@getThemeManager;
-              negociation nocall:context/@@negociation;
-              effective_theme negociation/getTheme;
+              negotiation nocall:context/@@negotiation;
+              effective_theme negotiation/getTheme;
               themes tmutil/getThemes">
   <tr>
     <tal:block repeat="theme themes">

Modified: cpsskins/branches/jmo-perspectives/ui/panels/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/panels/views.py       (original)
+++ cpsskins/branches/jmo-perspectives/ui/panels/views.py       Wed Mar 29 
23:47:28 2006
@@ -21,7 +21,7 @@
 from zope.app.zapi import getMultiAdapter
 from zope.interface import implements, Interface
 
-from cpsskins.browser.negociation.interfaces import INegociation
+from cpsskins.browser.negotiation.interfaces import INegotiation
 from cpsskins.browser.rendering.interfaces import IViewer
 from cpsskins.utils import getThemeManager
 
@@ -30,9 +30,9 @@
     def renderPage(self, engine=u''):
         """Render the page
         """
-        negociation = getMultiAdapter((self.context, self.request),
-                                       INegociation, 'negociation')
-        theme_obj = negociation.getTheme()
+        negotiation = getMultiAdapter((self.context, self.request),
+                                       INegotiation, 'negotiation')
+        theme_obj = negotiation.getTheme()
         page = theme_obj.getDefaultPage()
         viewer = getMultiAdapter((page, self.request), IViewer)
         return viewer(engine=engine)
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to