Author: jmorliaguet Date: Wed Jun 21 16:09:50 2006 New Revision: 3484 Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py cpsskins/branches/paris-sprint-2006/standard/negotiation/engine.zcml cpsskins/branches/paris-sprint-2006/standard/negotiation/page.py cpsskins/branches/paris-sprint-2006/standard/negotiation/page.zcml cpsskins/branches/paris-sprint-2006/standard/negotiation/perspective.zcml 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/definitions.py cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
Log: - using 3 different negotiation strategies: - default (view mode) - content-author (content author mode) - page-designer (page designer mode) 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 Wed Jun 21 16:09:50 2006 @@ -52,7 +52,7 @@ self.request.annotations['cpsskins.strategy'] = name def getStrategy(self): - return self.request.annotations.get('cpsskins.strategy', u'editor') + return self.request.annotations.get('cpsskins.strategy', u'default') strategy = property(getStrategy, setStrategy) Modified: cpsskins/branches/paris-sprint-2006/standard/negotiation/engine.zcml ============================================================================== --- cpsskins/branches/paris-sprint-2006/standard/negotiation/engine.zcml (original) +++ cpsskins/branches/paris-sprint-2006/standard/negotiation/engine.zcml Wed Jun 21 16:09:50 2006 @@ -3,7 +3,7 @@ <!-- view mode --> - <negotiationchain name="engine"> + <negotiationchain name="engine" strategy="default"> <scheme class=".engine.Request" @@ -13,14 +13,16 @@ </negotiationchain> - <!-- editor mode --> + <!-- content author --> - <negotiationchain name="engine" strategy="editor"> + <negotiationchain name="engine" strategy="content-author"> - <scheme - class=".engine.Request" - interface=".interfaces.IRequestNegotiationScheme" - /> + </negotiationchain> + + + <!-- page designer --> + + <negotiationchain name="engine" strategy="page-designer"> </negotiationchain> Modified: cpsskins/branches/paris-sprint-2006/standard/negotiation/page.py ============================================================================== --- cpsskins/branches/paris-sprint-2006/standard/negotiation/page.py (original) +++ cpsskins/branches/paris-sprint-2006/standard/negotiation/page.py Wed Jun 21 16:09:50 2006 @@ -112,8 +112,6 @@ location = self.manager.getLocationStorage().find(path, u'pages') if location is not None: page_name = location() - print page_name - print self.manager.getPageByName(page_name) return self.manager.getPageByName(page_name) return None Modified: cpsskins/branches/paris-sprint-2006/standard/negotiation/page.zcml ============================================================================== --- cpsskins/branches/paris-sprint-2006/standard/negotiation/page.zcml (original) +++ cpsskins/branches/paris-sprint-2006/standard/negotiation/page.zcml Wed Jun 21 16:09:50 2006 @@ -3,7 +3,7 @@ <!-- view mode --> - <negotiationchain name="page"> + <negotiationchain name="page" strategy="default"> <scheme class=".page.QueryParameter" @@ -11,13 +11,13 @@ /> <scheme - class=".page.Location" - interface=".interfaces.ILocationNegotiationScheme" + class=".page.Cookie" + interface=".interfaces.ICookieNegotiationScheme" /> <scheme - class=".page.Cookie" - interface=".interfaces.ICookieNegotiationScheme" + class=".page.Location" + interface=".interfaces.ILocationNegotiationScheme" /> <scheme @@ -28,9 +28,9 @@ </negotiationchain> - <!-- editor mode --> + <!-- content author mode --> - <negotiationchain name="page" strategy="editor"> + <negotiationchain name="page" strategy="content-author"> <scheme class=".page.CookieLocation" @@ -38,19 +38,22 @@ /> <scheme - class=".page.Cookie" - interface=".interfaces.ICookieNegotiationScheme" + class=".page.Default" + interface=".interfaces.IDefaultNegotiationScheme" /> - <scheme - class=".page.Local" - interface=".interfaces.ILocalNegotiationScheme" - /> + </negotiationchain> + + + <!-- page designer --> + + <negotiationchain name="page" strategy="page-designer"> <scheme - class=".page.Context" - interface=".interfaces.IContextNegotiationScheme" + class=".page.Cookie" + interface=".interfaces.ICookieNegotiationScheme" /> + <scheme class=".page.Default" interface=".interfaces.IDefaultNegotiationScheme" Modified: cpsskins/branches/paris-sprint-2006/standard/negotiation/perspective.zcml ============================================================================== --- cpsskins/branches/paris-sprint-2006/standard/negotiation/perspective.zcml (original) +++ cpsskins/branches/paris-sprint-2006/standard/negotiation/perspective.zcml Wed Jun 21 16:09:50 2006 @@ -3,7 +3,7 @@ <!-- view mode --> - <negotiationchain name="perspective"> + <negotiationchain name="perspective" strategy="default"> <scheme class=".perspective.Session" @@ -18,18 +18,25 @@ </negotiationchain> - <!-- editor mode --> + <!-- content author mode --> - <negotiationchain name="perspective" strategy="editor"> + <negotiationchain name="perspective" strategy="content-author"> <scheme - class=".perspective.Session" - interface=".interfaces.ISessionNegotiationScheme" + class=".perspective.CookieLocation" + interface=".interfaces.ICookieLocationNegotiationScheme" /> + </negotiationchain> + + + <!-- page designer --> + + <negotiationchain name="perspective" strategy="page-designer"> + <scheme - class=".perspective.CookieLocation" - interface=".interfaces.ICookieLocationNegotiationScheme" + class=".perspective.Session" + interface=".interfaces.ISessionNegotiationScheme" /> </negotiationchain> 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 Wed Jun 21 16:09:50 2006 @@ -45,11 +45,6 @@ attribute="getController" /> - <page - name="setEditorMode" - attribute="setEditorMode" - /> - </pages> <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 Wed Jun 21 16:09:50 2006 @@ -1,6 +1,7 @@ <ul class="tabs pageTabs" tal:define="tmutil context/@@getThemeManager; negotiation nocall:context/@@negotiation; + dummy python: negotiation.setStrategy('page-designer'); effective_page negotiation/getPage; theme effective_page/theme; pages theme/getPages"> 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 Wed Jun 21 16:09:50 2006 @@ -1,6 +1,7 @@ <table class="topTabs" cellpadding="0" cellspacing="0" border="0" summary="" tal:define="tmutil context/@@getThemeManager; negotiation nocall:context/@@negotiation; + dummy python: negotiation.setStrategy('page-designer'); effective_page negotiation/getPage; effective_theme effective_page/theme; themes tmutil/getThemes"> @@ -30,3 +31,4 @@ </td> </tr> </table> + 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 Wed Jun 21 16:09:50 2006 @@ -66,9 +66,6 @@ def getModel(): """Return the model information for this element.""" - def setEditorMode(): - """Set the negotiation strategy to 'editor'""" - class Editing(object): implements(IEditing) @@ -125,11 +122,12 @@ self.context = context self.request = request - def renderPage(self, engine=u''): + def renderPage(self, engine=u'', strategy=u'default'): """Render the page """ negotiation = getMultiAdapter((self.context, self.request), INegotiation, 'negotiation') + negotiation.strategy = strategy page = negotiation.getPage() viewer = getMultiAdapter((page, self.request), IViewer) return viewer(engine=engine) @@ -474,9 +472,4 @@ def getController(self, id): return json.write(CONTROLLERS[id]) - def setEditorMode(self): - negotiation = getMultiAdapter((self.context, self.request), - INegotiation, 'negotiation') - negotiation.strategy = u'editor' - Modified: cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py Wed Jun 21 16:09:50 2006 @@ -188,6 +188,7 @@ 'url': '@@renderPage.html', 'form': { 'engine': 'wysiwyg', + 'strategy': 'page-designer', }, 'css': '++resource++wysiwyg-mode.css', } @@ -200,6 +201,7 @@ 'url': '@@renderPage.html', 'form': { 'engine': 'layout', + 'strategy': 'page-designer', }, 'css': '++resource++layout-mode.css', } @@ -212,6 +214,7 @@ 'url': '@@renderPage.html', 'form': { 'engine': 'content-author', + 'strategy': 'content-author', }, 'css': '++resource++content-author.css', } Modified: cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt ============================================================================== --- cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt (original) +++ cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt Wed Jun 21 16:09:50 2006 @@ -3,8 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" tal:define="model nocall:context/@@getModel; view nocall:context/@@getView; - controller nocall:context/@@getController; - dummy view/setEditorMode"> + controller nocall:context/@@getController"> <head> <link rel="Stylesheet" type="text/css" href="++resource++authoring.css" /> <link rel="Stylesheet" type="text/css" href="++resource++cpsskins.css" /> -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins