Author: jmorliaguet
Date: Wed Mar 22 00:01:12 2006
New Revision: 2680

Modified:
   cpsskins/branches/jmo-perspectives/ui/authoring/definitions.py
   cpsskins/branches/jmo-perspectives/ui/panels/views.py
   cpsskins/branches/jmo-perspectives/ui/screens/editor.pt
Log:

- tooltips and context menus use CSS selectors

- removed debug line



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      Wed Mar 
22 00:01:12 2006
@@ -124,6 +124,7 @@
 
     'tooltip': {
         'id': 'tooltip',
+        'selectors': ['#actionPad a'],
         'widget': {
             'type': 'tooltip',
             'follow': True,
@@ -280,20 +281,22 @@
     # Contextual menu
     'context-menu': {
         'id': 'context-menu',
+        'selectors': ['#canvasArea div'],
         'perspectives': ['page-designer', 'layout-designer', 'content-author'],
-        'controllers': ['menuactions', 'main-editor-perspectives'],
+        'controllers': ['menu-actions', 'main-editor-perspectives',
+                        'show-hide-menu'],
         'widget': {
          'type': 'contextmenu',
          'items': [
            {'type': 'item',
             'label': _('Edit'),
-            'icon': 'edit.png',
+            'icon': '/++skin++cpsskins/@@/++resource++edit-16.png',
             'action': 'edit',
             'visible': 'editable',
            },
            {'type': 'item',
             'label': _('Duplicate'),
-            'icon': 'duplicate.png',
+            'icon': '/++skin++cpsskins/@@/++resource++duplicate-16.png',
             'action': 'duplicate',
             'visible': 'editable',
            },
@@ -301,12 +304,12 @@
            },
            {'type': 'item',
             'label': _('Copy'),
-            'icon': 'copy.png',
+            'icon': '/++skin++cpsskins/@@/++resource++copy-16.png',
             'action': 'copy',
            },
            {'type': 'item',
             'label': _('Paste'),
-            'icon': 'paste.png',
+            'icon': '/++skin++cpsskins/@@/++resource++paste-16.png',
             'action': 'paste',
             'visible': 'editable',
            },
@@ -326,7 +329,7 @@
            },
            {'type': 'item',
             'label': _('Delete'),
-            'icon': 'delete.png',
+            'icon': '/++skin++cpsskins/@@/++resource++delete-16.png',
             'action': 'delete',
             'confirm': _('Deleting, are you sure?'),
            }
@@ -360,7 +363,7 @@
         'id': 'show-hide-tooltip',
         'type': 'focus observer',
     },
-    'portlet-factory':{
+    'portlet-factory': {
         'id': 'portlet-factory',
         'type': 'drag-and-drop',
         'dragging': {
@@ -380,4 +383,15 @@
             }
         },
     },
+    'menu-actions': {
+        'id': 'menu-actions',
+        'type': 'command',
+        'handlers': {
+            'edit': 'displayChoice',
+        }
+    },
+    'show-hide-menu': {
+        'id': 'show-hide-menu',
+        'type': 'focus observer',
+    },
 }

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       Wed Mar 22 
00:01:12 2006
@@ -30,8 +30,6 @@
     def renderPage(self, engine=u''):
         """Render the page
         """
-        print 'renderPage'
-        print engine
         negociation = getMultiAdapter((self.context, self.request),
                                        INegociation, 'negociation')
         theme_obj = negociation.getTheme()

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     Wed Mar 22 
00:01:12 2006
@@ -40,17 +40,19 @@
       <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>
+      <div id="canvasArea">
+        <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>
+      </div>
 
       <!-- Contextual menu -->
-      <!--
       <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>
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to