\ No newline at end of file
Index: openacs-4/packages/cms/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/master.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/master.tcl 20 Apr 2001 20:51:09 -0000 1.1
+++ openacs-4/packages/cms/www/master.tcl 16 Nov 2004 22:32:47 -0000 1.2
@@ -1 +1,26 @@
+set url [ad_conn url]
+set package_url [ad_conn package_url]
+
+#default (needed?)
+set section sitemap
+
+if {[string match *sitemap* $url]} {
+ set section sitemap
+} elseif {[string match *templates* $url]} {
+ set section templates
+} elseif {[string match *types* $url]} {
+ set section types
+} elseif {[string match *search* $url]} {
+ set section search
+} elseif {[string match *workflow* $url]} {
+ set section workflow
+} elseif {[string match *workspace* $url]} {
+ set section workspace
+} elseif {[string match *clipboard* $url]} {
+ set section clipboard
+} elseif {[string match *users* $url]} {
+ set section users
+}
+
+
set clipboard_js "[ad_conn package_url]modules/clipboard/clipboard.js"
\ No newline at end of file
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/register-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/register-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/register.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/register.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/signin.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/signin.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/signin.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cms/www/signout.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/cms/www/table-footer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/table-footer.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/table-footer.adp 25 Feb 2004 17:48:40 -0000 1.2
+++ openacs-4/packages/cms/www/table-footer.adp 16 Nov 2004 22:32:47 -0000 1.3
@@ -7,4 +7,4 @@
@footer;noquote@
-
+
\ No newline at end of file
Index: openacs-4/packages/cms/www/table-header.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/table-header.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/table-header.adp 25 Feb 2004 17:48:40 -0000 1.3
+++ openacs-4/packages/cms/www/table-header.adp 16 Nov 2004 22:32:47 -0000 1.4
@@ -3,7 +3,7 @@
-
@title@
+
@title;noquote@
@header;noquote@
Index: openacs-4/packages/cms/www/tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/tree.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/tree.tcl 20 Apr 2001 20:51:09 -0000 1.1
+++ openacs-4/packages/cms/www/tree.tcl 16 Nov 2004 22:32:47 -0000 1.2
@@ -108,6 +108,8 @@
set state [initFolderTree $user_id]
}
+ns_log Notice "**** state is $state"
+
# Extract the current folder (it may be overwritten by user_action)
set current_folder [ns_queryget current_folder]
@@ -181,8 +183,11 @@
set mount_point ""
set control_count 0
+
+ns_log Notice "**** fetchStateFolders = [fetchStateFolders $user_id state]"
foreach folder [fetchStateFolders $user_id state] {
-
+
+ ns_log Notice "**** folder is $folder"
set mount_point [folderAccess mount_point $folder]
set name [folderAccess name $folder]
set folder_id [folderAccess id $folder]
Index: openacs-4/packages/cms/www/modules/clipboard/clear-clipboard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/clipboard/clear-clipboard.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/clipboard/clear-clipboard.adp 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/clipboard/clear-clipboard.adp 16 Nov 2004 22:32:48 -0000 1.2
@@ -1,5 +1,14 @@
+
+
+
+
+
\ No newline at end of file
+
+
\ No newline at end of file
Index: openacs-4/packages/cms/www/modules/clipboard/clear-clipboard.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/clipboard/clear-clipboard.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/clipboard/clear-clipboard.tcl 20 Apr 2001 20:51:10 -0000 1.1
+++ openacs-4/packages/cms/www/modules/clipboard/clear-clipboard.tcl 16 Nov 2004 22:32:48 -0000 1.2
@@ -1,2 +1,10 @@
+ad_page_contract {
+
+ @author Michael Steigman (michael@steigman.net)
+ @creation-date October 2004
+} {
+ {float_p "1"}
+}
+
#clipboard::clear_cookie
#ns_returnredirect "index"
\ No newline at end of file
Index: openacs-4/packages/cms/www/modules/clipboard/clipboard.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/clipboard/clipboard.js,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/clipboard/clipboard.js 12 Jun 2001 04:13:46 -0000 1.2
+++ openacs-4/packages/cms/www/modules/clipboard/clipboard.js 16 Nov 2004 22:32:48 -0000 1.3
@@ -113,11 +113,11 @@
}
}
- if (floatclipboard_p) {
+// if (floatclipboard_p != 1) {
// this last call open or refresh the floating clipboard
- var clipboardWin=window.open(root_url + 'modules/clipboard/index?id=' + mnt + '&mount_point=clipboard','clipboardFrame', 'toolbar=no,dependent=yes,innerWidth=500,innerHeight=300,scrollbars=yes');
+// var clipboardWin=window.open(root_url + 'modules/clipboard/floating?id=' + mnt + '&mount_point=clipboard','clipboardFrame', 'toolbar=no,dependent=yes,innerWidth=500,innerHeight=300,scrollbars=yes');
- }
+// }
}
Index: openacs-4/packages/cms/www/modules/clipboard/floating.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/clipboard/floating.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cms/www/modules/clipboard/floating.adp 16 Nov 2004 22:32:48 -0000 1.1
@@ -0,0 +1,147 @@
+
+
+
+
+
+Clipboard(close window)
+
There are a total of @total_items@ items on the clipboard. Select one of
+ the mount points on the left to view a list of clipped items for the
+ mount point.
+