Author: jmorliaguet
Date: Sat Jun 24 23:27:57 2006
New Revision: 3515
Added:
cpsskins/branches/paris-sprint-2006/ui/screens/common/add_portlet_pad.pt
(contents, props changed)
Modified:
cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml
cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
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 separate button that opens the portlet factory box
Added: cpsskins/branches/paris-sprint-2006/ui/screens/common/add_portlet_pad.pt
==============================================================================
--- (empty file)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/add_portlet_pad.pt
Sat Jun 24 23:27:57 2006
@@ -0,0 +1,3 @@
+<div style="padding: 1px 8px">
+ <a
href="javascript:CPSSkins.getControllerById('panel-perspectives').switchTo('content-factory')">Add
a portlet</a>
+</div>
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
Sat Jun 24 23:27:57 2006
@@ -79,6 +79,11 @@
/>
<page
+ name="addPortletPad.html"
+ template="add_portlet_pad.pt"
+ />
+
+ <page
name="selectPortletProvider"
attribute="selectPortletProvider"
/>
Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/page_modes.pt Sat Jun
24 23:27:57 2006
@@ -4,6 +4,4 @@
<a
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('layout')">Layout</a>
<a
href="javascript:CPSSkins.getControllerById('page-mode-perspectives').switchTo('wysiwyg')">WYSIWYG</a>
</div>
-
- <a
href="javascript:CPSSkins.getControllerById('panel-perspectives').switchTo('content-factory')">Add
a portlet</a>
</div>
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 Sat Jun
24 23:27:57 2006
@@ -98,6 +98,14 @@
}
},
+ # the portlet factory button at the bottom of the screen
+ 'add-portlet-pad': {
+ 'id': 'add-portlet-pad',
+ 'data': {
+ 'url': '@@addPortletPad.html',
+ }
+ },
+
# the location selection widget at the top of the canvas editing area
'location-selector': {
'id': 'location-selector',
@@ -355,6 +363,17 @@
'controllers': ['main-editor-perspectives'],
},
+ # the page mode selection widget
+ 'add-portlet-pad': {
+ 'id': 'add-portlet-pad',
+ 'widget': {
+ 'type': 'panel',
+ },
+ 'model': 'add-portlet-pad',
+ 'perspectives': ['page-designer', 'content-author'],
+ '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 Sat Jun 24
23:27:57 2006
@@ -97,6 +97,8 @@
<div class="floatingFooter">
<ins class="model" tal:content="python: model('page-mode-selector')" />
<ins class="view" tal:content="python: view('page-mode-selector')" />
+ <ins class="model" tal:content="python: model('add-portlet-pad')" />
+ <ins class="view" tal:content="python: view('add-portlet-pad')" />
<ins class="controller"
tal:content="python: controller('page-mode-perspectives')" />
</div>
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
Sat Jun 24 23:27:57 2006
@@ -1,8 +1,8 @@
<tal:block define="model nocall:context/@@getModel;
view nocall:context/@@getView;">
-
<ins class="model" tal:content="python: model('layout-mode')" />
<ins class="view" tal:content="python: view('layout-mode')" />
<ins class="model" tal:content="python: model('wysiwyg-mode')" />
<ins class="view" tal:content="python: view('wysiwyg-mode')" />
</tal:block>
+
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
