Author: jmorliaguet
Date: Fri May 26 23:39:05 2006
New Revision: 3231
Added:
cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
(contents, props changed)
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/common/images/rl-tab.png
cpsskins/branches/paris-sprint-2006/ui/screens/common/images/rr-tab.png
cpsskins/branches/paris-sprint-2006/ui/screens/definitions.py
cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt
Log:
- added a panel for the page mode selector
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
Fri May 26 23:39:05 2006
@@ -45,6 +45,11 @@
/>
<page
+ name="pageModes.html"
+ template="page_modes.pt"
+ />
+
+ <page
name="portletFactory.html"
template="portlet_factory.pt"
/>
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/images/rl-tab.png
==============================================================================
Binary files. No diff available.
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/images/rr-tab.png
==============================================================================
Binary files. No diff available.
Added: cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
==============================================================================
--- (empty file)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt Fri May
26 23:39:05 2006
@@ -0,0 +1,9 @@
+<ul class="inlineTabs" style="float:right">
+ <span>Page mode:</span>
+ <li>
+ <a
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('layout')">Layout</a></li>
+ <li>
+ <a
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('wysiwyg')">WYSIWYG</a></li>
+</ul>
+<br style="clear:right" />
+
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 Fri May
26 23:39:05 2006
@@ -73,6 +73,13 @@
}
},
+ # the location selection widget at the top of the canvas editing area
+ 'page-mode-selector': {
+ 'id': 'page-mode-selector',
+ 'data': {
+ 'url': '@@pageModes.html',
+ }
+ },
# the location selection widget at the top of the canvas editing area
'location-selector': {
@@ -299,6 +306,17 @@
'controllers': ['main-editor-perspectives'],
},
+ # the page mode selection widget
+ 'page-mode-selector': {
+ 'id': 'page-mode-selector',
+ 'widget': {
+ 'type': 'panel',
+ },
+ 'model': 'page-mode-selector',
+ 'perspectives': ['page-designer'],
+ 'controllers': ['main-editor-perspectives'],
+ },
+
# the location selection widget
'location-selector': {
'id': 'location-selector',
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 Fri May 26
23:39:05 2006
@@ -42,6 +42,10 @@
<ins class="model" cite="@@getModel?id=location-selector"></ins>
<ins class="view" cite="@@getView?id=location-selector"></ins>
+ <ins class="model" cite="@@getModel?id=page-mode-selector"></ins>
+ <ins class="view" cite="@@getView?id=page-mode-selector"></ins>
+ <ins class="controller"
cite="@@getController?id=page-mode-perspectives"></ins>
+
<!-- rendered pages -->
<div id="canvasArea">
<ins class="model" cite="@@getModel?id=page-designer"></ins>
@@ -55,7 +59,6 @@
<ins class="view" cite="@@getView?id=context-menu"></ins>
<ins class="controller" cite="@@getController?id=menu-actions"></ins>
<ins class="controller" cite="@@getController?id=show-hide-menu"></ins>
-
</div>
<!-- Main area for other screens -->
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt
==============================================================================
---
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt
(original)
+++
cpsskins/branches/paris-sprint-2006/ui/screens/pagedesigner/page_designer.pt
Fri May 26 23:39:05 2006
@@ -1,13 +1,3 @@
-<ul class="inlineTabs" style="float:right">
- <span>Page mode:</span>
- <li>
- <a
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('layout')">Layout</a></li>
- <li>
- <a
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('wysiwyg')">WYSIWYG</a></li>
-</ul>
-<br style="clear:right" />
-
-<ins class="controller" cite="@@getController?id=page-mode-perspectives"></ins>
<ins class="model" cite="@@getModel?id=layout-mode"></ins>
<ins class="view" cite="@@getView?id=layout-mode"></ins>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
