Author: jmorliaguet
Date: Tue Mar 21 14:22:41 2006
New Revision: 2677
Modified:
cpsskins/branches/jmo-perspectives/ui/authoring/definitions.py
cpsskins/branches/jmo-perspectives/ui/panels/theme_tabs.pt
cpsskins/branches/jmo-perspectives/ui/panels/views.py
cpsskins/branches/jmo-perspectives/ui/screens/editor.pt
Log:
- function theme switch implementation
Modified: cpsskins/branches/jmo-perspectives/ui/authoring/definitions.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/authoring/definitions.py
(original)
+++ cpsskins/branches/jmo-perspectives/ui/authoring/definitions.py Tue Mar
21 14:22:41 2006
@@ -191,7 +191,7 @@
},
'model': 'page-designer',
'perspectives': ['page-designer'],
- 'controllers': ['main-editor-perspectives'],
+ 'controllers': ['main-editor-perspectives', 'theme-switcher'],
},
'layout-designer': {
@@ -201,7 +201,7 @@
},
'model': 'layout-designer',
'perspectives': ['layout-designer'],
- 'controllers': ['main-editor-perspectives'],
+ 'controllers': ['main-editor-perspectives', 'theme-switcher'],
},
'interaction-designer': {
@@ -347,6 +347,10 @@
'type': 'perspective selector',
'initial': 'site-manager',
},
+ 'theme-switcher': {
+ 'id': 'theme-switcher',
+ 'type': 'remote scripting',
+ },
'site-manager-perspectives': {
'id': 'site-manager-perspectives',
'type': 'perspective selector',
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 Tue Mar 21
14:22:41 2006
@@ -11,7 +11,6 @@
src="/++skin++cpsskins/@@/++resource++ltab.png" />
</td>
<td tal:attributes="class python: selected and 'tabselected' or 'tab'">
- <span tal:content="selected" />
<a tal:content="theme/title"
tal:attributes="href string:@@setWorkTheme?name=${theme/name}" />
</td>
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 Tue Mar 21
14:22:41 2006
@@ -30,9 +30,12 @@
def renderPage(self, engine=u''):
"""Render the page
"""
+ print 'renderPage'
+ print engine
negociation = getMultiAdapter((self.context, self.request),
INegociation, 'negociation')
theme_obj = negociation.getTheme()
- viewer = getMultiAdapter((theme_obj, self.request), IViewer)
+ page = theme_obj.getDefaultPage()
+ viewer = getMultiAdapter((page, self.request), IViewer)
return viewer(engine=engine)
Modified: cpsskins/branches/jmo-perspectives/ui/screens/editor.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/screens/editor.pt (original)
+++ cpsskins/branches/jmo-perspectives/ui/screens/editor.pt Tue Mar 21
14:22:41 2006
@@ -63,6 +63,8 @@
<ins class="view" cite="@@getView?id=interaction-designer"></ins>
</div>
+ <ins class="controller" cite="@@getController?id=theme-switcher"></ins>
+
<!-- Bottom area -->
<div class="floatingFooter">
<ins class="model" cite="@@getModel?id=portlet-factory"></ins>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
