Author: jmorliaguet
Date: Sun Jan  8 01:09:55 2006
New Revision: 2187

Modified:
   cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
   cpsskins/branches/jmo-perspectives/ui/screens/editor.pt
   cpsskins/branches/jmo-perspectives/ui/screens/sitedesigner/site_designer.pt
Log:

- updates / fixes



Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js (original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js Sun Jan  8 
01:09:55 2006
@@ -17,7 +17,7 @@
 */
 
 var CPSSkins = {
-  Version: "0.2",
+  Version: "0.3",
 
   Controllers: $H({}),
 
@@ -47,6 +47,7 @@
 
         var perspectives = (e.getAttribute("perspectives") || "").split(",");
         $A(perspectives).each(function(p) {
+          if (!p) return;
           if (!(p in CPSSkins.Perspectives)) {
             CPSSkins.Perspectives[p] = $A([]);
           }
@@ -623,6 +624,10 @@
     Event.observe(document, "mousedown", this.hideEvent);
   },
 
+  inspect: function() {
+    return '[CPSSkins Contextual Menu]';
+  },
+
   showEvent: function(e) {
     var element = Event.element(e);
     var selected = Identifiable.getIdentifiable(element);
@@ -864,6 +869,10 @@
     Event.observe(this.area || document, "mouseout", this.hideEvent);
   },
 
+  inspect: function() {
+    return '[CPSSkins Tooltip]';
+  },
+
   render: function(data) {
     if (!data) return;
     this.widget.innerHTML = data.hint;

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     Sun Jan  8 
01:09:55 2006
@@ -29,37 +29,38 @@
 
       <div id="actionPad">
 
-        <!-- json-data:
+        <!-- model:
         {"hint":"Site designers are in charge of the overall site's design.
-                 They manage resources and settings.."
+                 They manage resources and settings."}
         -->
         <a href="#" onclick="javascript: new 
CPSSkins.switchPerspective('site-designer')">Site designer</a>
 
-        <!-- json-data:
-        {"hint":"Layout designers define the layout structure of pages."
+        <!-- model:
+        {"hint":"Layout designers define the layout structure of pages."}
         -->
         <a href="#" onclick="javascript: new 
CPSSkins.switchPerspective('layout-designer')">Layout designer</a>
 
-        <!-- json-data:
+        <!-- model:
         {"hint":"Page designers are in charge of the site's graphic design.
                  They also define the areas in which content authors will add
-                 the site's content"}
+                 the site's content."}
         -->
         <a href="#" onclick="javascript: new 
CPSSkins.switchPerspective('page-designer')">Page designer</a>
 
-        <!-- json-data:
+        <!-- model:
         {"hint":"Content authors add content to pages in different contexts."}
         -->
         <a href="#" onclick="javascript: new 
CPSSkins.switchPerspective('content-author')">Content author</a>
 
-        <cpsskins:tooltip showdelay="1500"></cpsskins:tooltip>
+        <cpsskins:view widget="tooltip" showdelay="1500"></cpsskins:view>
 
       </div>
 
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           perspectives="page-designer,layout-designer,content-author"
           url="@@perspectiveSelector.html">
-      </cpsskins:panel>
+      </cpsskins:view>
 
     </div>
 
@@ -67,43 +68,49 @@
     <div id="editArea">
 
       <!-- top tabs -->
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           perspectives="page-designer,layout-designer"
           url="@@themeTabs.html">
-      </cpsskins:panel>
+      </cpsskins:view>
 
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           perspectives="page-designer,layout-designer"
           url="@@pageTabs.html">
-      </cpsskins:panel>
+      </cpsskins:view>
 
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           fadein="true"
           perspectives="content-author"
           url="@@locationSelector.html">
-      </cpsskins:panel>
+      </cpsskins:view>
 
       <!-- rendered pages -->
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           perspectives="page-designer"
           url="@@renderPage.html?engine=page-designer"
           css="/++skin++cpsskins/@@/++resource++page-designer.css">
-      </cpsskins:panel>
+      </cpsskins:view>
 
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           perspectives="layout-designer"
           url="@@renderPage.html?engine=layout-designer"
           css="/++skin++cpsskins/@@/++resource++layout-designer.css">
-      </cpsskins:panel>
+      </cpsskins:view>
 
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           perspectives="content-author"
           url="@@renderPage.html?engine=content-author"
           css="/++skin++cpsskins/@@/++resource++content-author.css">
-      </cpsskins:panel>
+      </cpsskins:view>
 
       <!-- Contextual menu -->
-      <cpsskins:contextmenu controller="menuactions">
+      <cpsskins:view widget="contextmenu" controller="menuactions">
 
         <item
             action="edit"
@@ -140,7 +147,7 @@
             confirm="Deleting, are you sure?"
             icon="/++skin++cpsskins/@@/delete-16.png"></item>
 
-      </cpsskins:contextmenu>
+      </cpsskins:view>
 
       <div id="drag-feedback-box"></div>
       <div id="factory-box"></div>
@@ -150,22 +157,24 @@
     <!-- Main area for other screens -->
     <div id="mainArea">
 
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           perspectives="site-designer"
           url="@@site-designer.html"
           css="/++skin++cpsskins/@@/++resource++site-designer.css">
-      </cpsskins:panel>
+      </cpsskins:view>
 
     </div>
 
     <!-- Bottom area -->
     <div class="floatingFooter">
 
-      <cpsskins:panel
+      <cpsskins:view
+          widget="panel"
           fadein="true"
           perspectives="page-designer,layout-designer,content-author"
           url="@@portletFactory.html">
-      </cpsskins:panel>
+      </cpsskins:view>
 
     </div>
 

Modified: 
cpsskins/branches/jmo-perspectives/ui/screens/sitedesigner/site_designer.pt
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/screens/sitedesigner/site_designer.pt 
(original)
+++ cpsskins/branches/jmo-perspectives/ui/screens/sitedesigner/site_designer.pt 
Sun Jan  8 01:09:55 2006
@@ -17,7 +17,7 @@
           <ul>
             <li tal:repeat="subsection info">
               <a class="section"
-                 tal:attributes="href 
string:@@setSelection?subsection=$subsection"
+                 tal:attributes="href 
string:javascript:CPSSkins.switchPerspective('$subsection')"
                  tal:content="subsection" i18n:translate="" />
             </li>
           </ul>
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to