Author: jmorliaguet
Date: Sat Feb 25 21:07:42 2006
New Revision: 2465
Modified:
cpsskins/branches/jmo-perspectives/ui/authoring/configure.zcml
cpsskins/branches/jmo-perspectives/ui/authoring/definitions.py
cpsskins/branches/jmo-perspectives/ui/authoring/views.py
cpsskins/branches/jmo-perspectives/ui/screens/editor.pt
Log:
- the panels' url and css information is now stored in the model
Modified: cpsskins/branches/jmo-perspectives/ui/authoring/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/authoring/configure.zcml
(original)
+++ cpsskins/branches/jmo-perspectives/ui/authoring/configure.zcml Sat Feb
25 21:07:42 2006
@@ -115,10 +115,14 @@
/>
<browser:page
+ name="getModel"
+ attribute="getModel"
+ />
+
+ <browser:page
name="getView"
attribute="getView"
/>
-
</browser:pages>
</configure>
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 Sat Feb
25 21:07:42 2006
@@ -3,14 +3,91 @@
_ = MessageFactory("cpsskins")
+MODELS = {
+ 'action-pad': {
+ 'id': 'action-pad',
+ 'data': {
+ 'url': '@@actionPad.html',
+ }
+ },
+
+ 'perspective-selector': {
+ 'id': 'perspective-selector',
+ 'data': {
+ 'url': '@@perspectiveSelector.html',
+ }
+ },
+
+ 'theme-tabs': {
+ 'id': 'theme-tabs',
+ 'data': {
+ 'url': '@@themeTabs.html',
+ }
+ },
+
+ 'page-tabs': {
+ 'id': 'page-tabs',
+ 'data': {
+ 'url': '@@pageTabs.html',
+ }
+ },
+
+ 'location-selector': {
+ 'id': 'location-selector',
+ 'data': {
+ 'url': '@@locationSelector.html',
+ }
+ },
+
+ 'page-designer': {
+ 'id': 'page-designer',
+ 'data': {
+ 'url': '@@renderPage.html?engine=page-designer',
+ 'css': '/++skin++cpsskins/@@/++resource++page-designer.css',
+ }
+ },
+
+ 'layout-designer': {
+ 'id': 'layout-designer',
+ 'data': {
+ 'url': '@@renderPage.html?engine=layout-designer',
+ 'css': '/++skin++cpsskins/@@/++resource++layout-designer.css',
+ }
+ },
+
+ 'content-author': {
+ 'id': 'content-author',
+ 'data': {
+ 'url': '@@renderPage.html?engine=content-author',
+ 'css': '/++skin++cpsskins/@@/++resource++content-author.css',
+ }
+ },
+
+ 'site-designer': {
+ 'id': 'site-designer',
+ 'data': {
+ 'url': '@@site-designer.html',
+ 'css': '/++skin++cpsskins/@@/++resource++site-designer.css',
+ }
+ },
+
+ 'portlet-factory': {
+ 'id': 'portlet-factory',
+ 'data': {
+ 'url': '@@portletFactory.html',
+ }
+ },
+
+}
+
VIEWS = {
# Top area
'action-pad': {
'widget': {
'type': 'panel',
- 'url': '@@actionPad.html',
},
+ 'model': 'action-pad',
'perspectives': ['site-designer', 'page-designer', 'layout-designer',
'content-author'],
},
@@ -28,8 +105,8 @@
'perspective-selector': {
'widget': {
'type': 'panel',
- 'url': '@@perspectiveSelector.html',
},
+ 'model': 'perspective-selector',
'perspectives': ['page-designer', 'layout-designer', 'content-author'],
},
@@ -37,24 +114,24 @@
'theme-tabs': {
'widget': {
'type': 'panel',
- 'url': '@@themeTabs.html',
},
+ 'model': 'theme-tabs',
'perspectives': ['page-designer', 'layout-designer'],
},
'page-tabs': {
'widget': {
'type': 'panel',
- 'url': '@@pageTabs.html',
},
+ 'model': 'page-tabs',
'perspectives': ['page-designer', 'layout-designer'],
},
'location-selector': {
'widget': {
'type': 'panel',
- 'url': '@@locationSelector.html',
},
+ 'model': 'location-selector',
'perspectives': ['content-author'],
'show_effect': {
'transition': 'fadein',
@@ -65,27 +142,24 @@
'page-designer': {
'widget': {
'type': 'panel',
- 'url': '@@renderPage.html?engine=page-designer',
- 'css': '/++skin++cpsskins/@@/++resource++page-designer.css',
},
+ 'model': 'page-designer',
'perspectives': ['page-designer'],
},
'layout-designer': {
'widget': {
'type': 'panel',
- 'url': '@@renderPage.html?engine=layout-designer',
- 'css': '/++skin++cpsskins/@@/++resource++layout-designer.css',
},
+ 'model': 'layout-designer',
'perspectives': ['layout-designer'],
},
'content-author': {
'widget': {
'type': 'panel',
- 'url': '@@renderPage.html?engine=content-author',
- 'css': '/++skin++cpsskins/@@/++resource++content-author.css',
},
+ 'model': 'content-author',
'perspectives': ['content-author'],
},
@@ -93,9 +167,8 @@
'site-designer': {
'widget': {
'type': 'panel',
- 'url': '@@site-designer.html',
- 'css': '/++skin++cpsskins/@@/++resource++site-designer.css',
},
+ 'model': 'site-designer',
'perspectives': ['site-designer'],
},
@@ -104,8 +177,8 @@
'portlet-factory': {
'widget': {
'type': 'panel',
- 'url': '@@portletFactory.html',
},
+ 'model': 'portlet-factory',
'perspectives': ['page-designer', 'layout-designer', 'content-author'],
},
Modified: cpsskins/branches/jmo-perspectives/ui/authoring/views.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/authoring/views.py (original)
+++ cpsskins/branches/jmo-perspectives/ui/authoring/views.py Sat Feb 25
21:07:42 2006
@@ -35,7 +35,7 @@
from cpsskins.elements.interfaces import IDisplayable
from cpsskins.browser.rendering.interfaces import IViewer
from cpsskins.setup.interfaces import IResourceManager
-from cpsskins.ui.authoring.definitions import VIEWS
+from cpsskins.ui.authoring.definitions import MODELS, VIEWS
from cpsskins.utils import getThemeManager
_ = MessageFactory("cpsskins")
@@ -235,6 +235,9 @@
def getHint(self, msgid):
return self._encode({'hint': _(msgid)})
+ def getModel(self, id):
+ return json.write(MODELS[id])
+
def getView(self, id):
return json.write(VIEWS[id])
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 Sat Feb 25
21:07:42 2006
@@ -17,12 +17,16 @@
<script type="text/javascript"
src="/++skin++cpsskins/@@/++resource++json.js"></script>
<script type="text/javascript"
+ src="/++skin++cpsskins/@@/++resource++ctal.js"></script>
+ <script type="text/javascript"
src="/++skin++cpsskins/@@/++resource++cpsskins.js"></script>
</head>
<body>
<div class="floatingHeader">
+ <ins class="model" cite="@@getModel?id=action-pad"></ins>
<ins class="view" cite="@@getView?id=action-pad"></ins>
+ <ins class="model" cite="@@getModel?id=perspective-selector"></ins>
<ins class="view" cite="@@getView?id=perspective-selector"></ins>
<a href="#" onclick="javascript:
CPSSkins.switchPerspective('content-author')">Content author</a>
</div>
@@ -31,13 +35,19 @@
<div id="editArea">
<!-- top tabs -->
+ <ins class="model" cite="@@getModel?id=theme-tabs"></ins>
<ins class="view" cite="@@getView?id=theme-tabs"></ins>
+ <ins class="model" cite="@@getModel?id=page-tabs"></ins>
<ins class="view" cite="@@getView?id=page-tabs"></ins>
+ <ins class="model" cite="@@getModel?id=location-selector"></ins>
<ins class="view" cite="@@getView?id=location-selector"></ins>
<!-- rendered pages -->
+ <ins class="model" cite="@@getModel?id=page-designer"></ins>
<ins class="view" cite="@@getView?id=page-designer"></ins>
+ <ins class="model" cite="@@getModel?id=layout-designer"></ins>
<ins class="view" cite="@@getView?id=layout-designer"></ins>
+ <ins class="model" cite="@@getModel?id=content-author"></ins>
<ins class="view" cite="@@getView?id=content-author"></ins>
<!-- Contextual menu -->
@@ -50,11 +60,13 @@
<!-- Main area for other screens -->
<div id="mainArea">
+ <ins class="model" cite="@@getModel?id=site-designer"></ins>
<ins class="view" cite="@@getView?id=site-designer"></ins>
</div>
<!-- Bottom area -->
<div class="floatingFooter">
+ <ins class="model" cite="@@getModel?id=portlet-factory"></ins>
<ins class="view" cite="@@getView?id=portlet-factory"></ins>
</div>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
