[Zope-CVS] CVS: Products/CompositePage/cmf - cmf_edit.js:1.2 header.pt:1.2

[Shane Hathaway]

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

Modified Files:
	cmf_edit.js header.pt 
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/cmf/cmf_edit.js 1.1 => 1.2 ===
--- Products/CompositePage/cmf/cmf_edit.js:1.1	Thu Oct  9 17:29:15 2003
+++ Products/CompositePage/cmf/cmf_edit.js	Thu Feb 26 16:38:12 2004
@@ -1,15 +1,14 @@
 
 // CMF-specific editing scripts.  Referenced by cmf/bottom.pt.
-// The variable "transformer_url" is provided by common/header.pt.
+// The variable "ui_url" is provided by common/header.pt.
 
 function cmf_edit(element) {
   var path = escape(element.getAttribute("source_path"));
-  window.top.document.location = transformer_url + "/showElement?path=" + path;
+  window.top.document.location = ui_url + "/showElement?path=" + path;
 }
 
 function cmf_add(target) {
   // Note that target_index is also available.
   var path = escape(target.getAttribute("target_path"));
-  window.top.document.location = transformer_url + "/showSlot?path=" + path;
+  window.top.document.location = ui_url + "/showSlot?path=" + path;
 }
-


=== Products/CompositePage/cmf/header.pt 1.1 => 1.2 ===
--- Products/CompositePage/cmf/header.pt:1.1	Thu Oct  9 17:29:15 2003
+++ Products/CompositePage/cmf/header.pt	Thu Feb 26 16:38:12 2004
@@ -1,5 +1,5 @@
 <!-- cmf/header.pt -->
-<tal:block tal:define="url options/transformer/absolute_url">
+<tal:block tal:define="url options/ui/absolute_url">
 <script type="text/javascript" 
   tal:attributes="src string:${url}/cmf_edit_js"></script>
 </tal:block>