[Zope-CVS] CVS: Products/CompositePage/common - bottom.pt:1.5 edit.js:1.8 header.pt:1.3 pdlib.js:1.5

[Shane Hathaway]

Update of /cvs-repository/Products/CompositePage/common
In directory cvs.zope.org:/tmp/cvs-serv1031/common

Modified Files:
	bottom.pt edit.js header.pt pdlib.js 
Log Message:
Merged composite-flat-ui-branch.

This adds a manual slotting interface (non-WYSIWYG).  The manual
UI still supports drag and drop, but has many links and no
context menus.


=== Products/CompositePage/common/bottom.pt 1.4 => 1.5 ===
--- Products/CompositePage/common/bottom.pt:1.4	Mon Dec 29 11:47:46 2003
+++ Products/CompositePage/common/bottom.pt	Thu Feb 26 16:38:12 2004
@@ -2,7 +2,7 @@
 <div id="drag-feedback-box"></div>
 <img id="slot-element-grip" class="slot-element-grip"
    width="16" height="16" tal:define="url
-   string:${options/transformer/absolute_url}/element_image"
+   string:${options/ui/absolute_url}/element_image"
    tal:attributes="src url" />
 
 <form action="moveAndDelete" name="modify_composites" method="POST"


=== Products/CompositePage/common/edit.js 1.7 => 1.8 ===
--- Products/CompositePage/common/edit.js:1.7	Mon Dec 29 11:47:46 2003
+++ Products/CompositePage/common/edit.js	Thu Feb 26 16:38:12 2004
@@ -66,7 +66,7 @@
 function composite_change_view(elems) {
   var url, sources;
   sources = composite_getsources(elems);
-  url = transformer_url + "/changeViewForm?paths=" + sources;
+  url = ui_url + "/changeViewForm?paths=" + sources;
   window.open(url, '', 'width=320, height=400, resizable, scrollbars, status');
 }
 


=== Products/CompositePage/common/header.pt 1.2 => 1.3 ===
--- Products/CompositePage/common/header.pt:1.2	Thu Oct  9 17:29:16 2003
+++ Products/CompositePage/common/header.pt	Thu Feb 26 16:38:12 2004
@@ -1,5 +1,5 @@
 <!-- common/header.pt -->
-<tal:block tal:define="url options/transformer/absolute_url">
+<tal:block tal:define="url options/ui/absolute_url">
 <link rel="stylesheet" type="text/css"
   tal:attributes="href string:${url}/pdstyles_css" />
 <link rel="stylesheet" type="text/css"
@@ -9,6 +9,6 @@
 <script type="text/javascript" 
   tal:attributes="src string:${url}/edit_js"></script>
 <script type="text/javascript" tal:content="structure string:
-var transformer_url = '${url}';
+var ui_url = '${url}';
 "></script>
 </tal:block>


=== Products/CompositePage/common/pdlib.js 1.4 => 1.5 ===
--- Products/CompositePage/common/pdlib.js:1.4	Sat Dec 27 13:40:20 2003
+++ Products/CompositePage/common/pdlib.js	Thu Feb 26 16:38:12 2004
@@ -387,6 +387,14 @@
 function pd_itemOnMousedown(mo, e, move_func, checkmove_func, box) {
   if (!e)
     e = event;
+  var target = e.target || e.srcElement;
+  if (target.nodeName) {
+    var name = target.nodeName.toLowerCase();
+    if (name == "input" || name == "select" || name == "a") {
+      // Allow interaction with the widget or link.
+      return true;
+    }
+  }
   if (e.button == 0 || e.button == 1) {
     pd_hideContextMenu();
     if (!box)