Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.107 -r1.108
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 11 Apr 2009 12:37:17 -0000 1.107
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 11 Apr 2009 16:14:08 -0000 1.108
@@ -1724,13 +1724,13 @@
set css_class [expr {$l1 >= $min_level ? "page_order_region" : "page_order_region_no_target"}]
return "
\n"
}
- PageReorderSupport instproc page_reorder_open_li {-ID -prefix_js -page_order js_} {
+ PageReorderSupport instproc page_reorder_item_id {-ID -prefix_js -page_order js_} {
my upvar $js_ js
set key __count($prefix_js)
if {[my exists $key]} {set p [my incr $key]} {set p [my set $key 0]}
set id ${ID}_${prefix_js}_$p
append js "YAHOO.xo_page_order_region.DDApp.cd\['$id'\] = '$page_order';\n"
- return "- "
+ return $id
}
#
@@ -2156,8 +2156,9 @@
}
set href [my href $package_id $book_mode $name]
set highlight [if {$open_page eq $name} {set _ "style = 'font-weight:bold;'"} {}]
+ set item_id [my page_reorder_item_id -ID $ID -prefix_js $prefix_js -page_order $page_order js]
append html \
- [my page_reorder_open_li -ID $ID -prefix_js $prefix_js -page_order $page_order js] \
+ "
- " \
"$page_number $title\n"
}
}
@@ -2438,7 +2439,8 @@
}
# Pass the page_order for the element to javascript and add
# the li element for the section.
- append output [my page_reorder_open_li -ID $ID -prefix_js $prefix_js -page_order $page_order js]
+ set item_id [my page_reorder_item_id -ID $ID -prefix_js $prefix_js -page_order $page_order js]
+ append output "
- "
}
set p [::xo::db::CrClass get_instance_from_db -item_id 0 -revision_id $page_id]
Index: openacs-4/packages/xowiki/www/resources/yui-page-order-region.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/yui-page-order-region.js,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/resources/yui-page-order-region.js 9 Apr 2009 10:37:50 -0000 1.3
+++ openacs-4/packages/xowiki/www/resources/yui-page-order-region.js 11 Apr 2009 16:14:08 -0000 1.4
@@ -57,14 +57,13 @@
for (var j = 0; j < items.length; j++) {
if (items[j].nodeName != 'LI') {continue;}
-
+ var iid = items[j].id;
// add the DDList only for list items in UL with class
// "page_order_region"
if (YAHOO.util.Dom.hasClass(regions[i],"page_order_region")) {
new YAHOO.xo_page_order_region.DDList(iid);
}
- var iid = items[j].id;
// console.log(iid + " => " + this.cd[iid] );
order += this.cd[iid] + " ";
// Keep as well the source regions
@@ -89,7 +88,8 @@
finish: function(e) {
- //console.log("finish " + this.highest_region);
+ //console.log("finish " + this.highest_region);
+
// if we have no highest_region, the drop was not on a drop target
if (this.highest_region == 0) {
// get the ul via the provided element. This might not be the
@@ -102,7 +102,7 @@
var ul = document.getElementById(this.highest_region);
}
- //console.log(this.cd[e.id] + " landed in region "+ ul.id + " => " + this.cd[ul.id]);
+ // console.log(this.cd[e.id] + " landed in region "+ ul.id + " => " + this.cd[ul.id]);
// Process childNodes of the ul simply to avoid to include
// nested items
@@ -116,7 +116,7 @@
//console.log(iid + " => " + this.cd[iid]);
}
- //console.log(this.cd[ul.id] + " => " + order + " => " + this.cd[this.source_region[e.id].id]);
+ // console.log(this.cd[ul.id] + " => " + order + " => " + this.cd[this.source_region[e.id].id]);
if (this.package_url != '' && order != '') {
this.callback = {
@@ -139,6 +139,7 @@
},
scope: this
}
+ //return;
YAHOO.util.Connect.asyncRequest('POST', this.package_url, this.callback,
'change-page-order=1' +
'&from=' + escape(this.cd[ul.id]) +
@@ -171,8 +172,8 @@
// make the proxy look like the source element
var dragEl = this.getDragEl();
var clickEl = this.getEl();
- Dom.setStyle(clickEl, "visibility", "hidden");
+ Dom.setStyle(clickEl, "visibility", "hidden");
dragEl.innerHTML = clickEl.innerHTML;
Dom.setStyle(dragEl, "color", Dom.getStyle(clickEl, "color"));
@@ -260,14 +261,12 @@
var destEl = Dom.get(id);
var p = destEl.parentNode;
Dom.setStyle(p, "border", "1px dotted green");
- Dom.setStyle(p, "margin", "10px");
},
onDragOut: function(e, id) {
var destEl = Dom.get(id);
var p = destEl.parentNode;
Dom.setStyle(p, "border", "0px");
- Dom.setStyle(p, "margin", "0px");
},
onDragOver: function(e, id) {