Author: jmorliaguet
Date: Wed May 10 21:21:44 2006
New Revision: 3098

Modified:
   cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py
   cpsskins/branches/paris-sprint-2006/ui/screens/editor.pt

Log:

- fix: some user actions where called several times



Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py     
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/definitions.py     Wed May 
10 21:21:44 2006
@@ -217,7 +217,7 @@
         'model': 'perspective-selector',
         'perspectives': ['page-designer', 'layout-designer', 'content-author',
                          'element-editor'],
-        'controllers': ['main-editor-perspectives', 'perspective-selector'],
+        'controllers': ['main-editor-perspectives', 'main-editor-actions'],
     },
 
     # Main area
@@ -228,7 +228,7 @@
         },
         'model': 'theme-tabs',
         'perspectives': ['page-designer', 'layout-designer'],
-        'controllers': ['main-editor-perspectives', 'theme-switcher'],
+        'controllers': ['main-editor-perspectives', 'main-editor-actions'],
     },
 
     'page-tabs': {
@@ -238,7 +238,7 @@
         },
         'model': 'page-tabs',
         'perspectives': ['page-designer', 'layout-designer'],
-        'controllers': ['main-editor-perspectives', 'theme-switcher'],
+        'controllers': ['main-editor-perspectives', 'main-editor-actions'],
     },
 
     'location-selector': {
@@ -262,9 +262,8 @@
         },
         'model': 'page-designer',
         'perspectives': ['page-designer'],
-        'controllers': ['main-editor-perspectives', 'theme-switcher',
-                        'element-mover', 'portlet-factory',
-                        'perspective-selector'],
+        'controllers': ['main-editor-perspectives', 'element-mover',
+                        'portlet-factory', 'main-editor-actions'],
     },
 
     'layout-designer': {
@@ -274,9 +273,8 @@
         },
         'model': 'layout-designer',
         'perspectives': ['layout-designer'],
-        'controllers': ['main-editor-perspectives', 'theme-switcher',
-                        'element-mover', 'portlet-factory',
-                        'perspective-selector'],
+        'controllers': ['main-editor-perspectives', 'element-mover',
+                        'portlet-factory', 'main-editor-actions'],
     },
 
     'interaction-designer': {
@@ -297,7 +295,7 @@
         'model': 'content-author',
         'perspectives': ['content-author'],
         'controllers': ['main-editor-perspectives', 'element-mover', 
-                        'portlet-factory', 'perspective-selector'],
+                        'portlet-factory', 'main-editor-actions'],
     },
 
     # screen
@@ -458,8 +456,8 @@
         'initial': 'site-manager',
     },
 
-    'theme-switcher': {
-        'id': 'theme-switcher',
+    'main-editor-actions': {
+        'id': 'main-editor-actions',
         'type': 'remote scripting',
     },
 
@@ -541,11 +539,6 @@
         'type': 'remote scripting',
     },
 
-    'perspective-selector': {
-        'id': 'perspective-selector',
-        'type': 'remote scripting',
-    },
-
     'io-actions': {
         'id': 'io-actions',
         'type': 'remote scripting',

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 May 10 
21:21:44 2006
@@ -25,13 +25,13 @@
 
       <ins class="model" cite="@@getModel?id=perspective-selector"></ins>
       <ins class="view" cite="@@getView?id=perspective-selector"></ins>
-      <ins class="controller" 
cite="@@getController?id=perspective-selector"></ins>
     </div>
 
     <!-- Edit area for rendered content -->
     <div id="editArea">
 
       <ins class="controller" 
cite="@@getController?id=main-editor-perspectives"></ins>
+      <ins class="controller" 
cite="@@getController?id=main-editor-actions"></ins>
 
       <!-- top tabs -->
       <ins class="model" cite="@@getModel?id=theme-tabs"></ins>
@@ -74,7 +74,6 @@
 
     </div>
 
-    <ins class="controller" cite="@@getController?id=theme-switcher"></ins>
 
     <!-- Bottom area -->
     <div class="floatingFooter">
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to