Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	27 Oct 2014 16:39:56 -0000	1.28
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	9 Jun 2015 07:10:32 -0000	1.29
@@ -42,7 +42,7 @@
     set javascript ""
 }
 
-set parent_link ".?[export_vars -url {expand:multiple {root_id $parent_id}}]"
+set parent_link [export_vars -base . {expand:multiple {root_id $parent_id}}]
 
 set doc(title) [_ acs-subsite.Site_Map]
 set context [list $doc(title)]
@@ -65,7 +65,7 @@
 
 db_foreach path_select {} {
     if {$node_id != $root_id && $admin_p == "t"} {
-        append head [subst {<a href=".?[export_vars -url {expand:multiple {root_id $node_id}}]">}]
+        append head [subst {<a href="[export_vars -base . {expand:multiple {root_id $node_id}}]">}]
     }
     if {$name eq ""} {
 	append head "$obj_name:"
@@ -116,12 +116,11 @@
 		@nodes.name;noquote@
 		</else>
 		<if @nodes.action_type@ eq "new_folder">
-		<a name="add" />
-		<form name=new_parent action=new>
-		@nodes.tree_indent;noquote@
+		<form name="new_parent" action="new">
+		<div>@nodes.tree_indent;noquote@
 		@nodes.action_form_part;noquote@
 		<input name="name" type="text" size="8" value="Untitled">
-		<input type="submit" value="New">
+		<input type="submit" value="New"></div>
 		</form>
 		</if>
 		</if>
@@ -134,19 +133,17 @@
             html "align left"
 	    display_template {
 		<if @nodes.action_type@ eq "new_app">
-		<a name="new" />
 		<form name="new_application" action="package-new">
-		<input name="instance_name" type="text" size="8" value="">
+		<div><input name="instance_name" type="text" size="8" value="">
 		@nodes.action_form_part;noquote@
-		<input type="submit" value="New">
+		<input type="submit" value="New"></div>
 		</form>
 		</if>
 		<if @nodes.action_type@ eq "rename_app">
-		<a name="rename" />
 		<form name="rename_application" action="rename">
-		<input name="instance_name" type="text" value="@nodes.instance@">
+		<div><input name="instance_name" type="text" value="@nodes.instance@">
 		@nodes.action_form_part;noquote@
-		<input type="submit" value="Rename">
+		<input type="submit" value="Rename"></div>
 		</form>
 		</if>
 		<else>
@@ -211,33 +208,33 @@
     if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue } 
         
     if {$directory_p == "t"} {
-	set add_folder_url "?[export_vars -url {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
+	set add_folder_url [export_vars -base . {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]
 	if {$object_id eq ""} {
-	    set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
-	    set new_app_url "?[export_vars -url {expand:multiple root_id {new_application $node_id}}]"
+	    set mount_url [export_vars -base mount {expand:multiple root_id node_id}]
+	    set new_app_url [export_vars -base . {expand:multiple root_id {new_application $node_id}}]
 	} else {
 	    # This makes sure you can't unmount the thing that is serving the page you're looking at.
 	    if {[ad_conn node_id] != $node_id} {
-		set unmount_url "unmount?[export_vars -url {expand:multiple root_id node_id}]"
+		set unmount_url [export_vars -base {expand:multiple root_id node_id}]
 	    }
 	    
 	    # Add a link to control permissioning
 	    if {$object_admin_p} {
-		set permissions_url "../../permissions/one?[export_vars -url {object_id}]"
-		set rename_url "?[export_vars -url {expand:multiple root_id {rename_application $node_id}}]"
-		set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
+		set permissions_url [export_vars -base "../../permissions/one" {object_id}]
+		set rename_url [export_vars -base . {expand:multiple root_id {rename_application $node_id}}]
+		set delete_url [export_vars -base instance-delete {{package_id $object_id} root_id}]
 	    }
 	    # Is the object a package?
 	    if {$package_id ne ""} {
 		if {$object_admin_p && ($parameter_count > 0)} {
-		    set parameters_url "[export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]"
+		    set parameters_url [export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]
 		}
 	    }
 	}
     }
     
     if {[ad_conn node_id] != $node_id && $n_children == 0 && $object_id eq ""} {
-	set delete_url "delete?[export_vars -url {expand:multiple root_id node_id}]"
+	set delete_url [export_vars -base delete {expand:multiple root_id node_id}]
     }
     
     # use the indent variable to hold current indent level we'll use it later to indent stuff at the end by the amount of the last node
@@ -270,7 +267,7 @@
 	set expand_url ""
     }
     
-    set name_url [export_vars -url {expand:multiple {root_id $node_id}}]
+    set name_url [export_vars {expand:multiple {root_id $node_id}}]
         
     set action_type 0
     set action_form_part ""
@@ -288,32 +285,32 @@
 	}
     } elseif {$rename_application == $node_id} {
 	set action_type "rename_app"
-	set action_form_part "[export_vars -form {expand:multiple root_id node_id rename_package_id}]"
+	set action_form_part [export_vars -form {expand:multiple root_id node_id rename_package_id}]
 	
     } else {}
     
     if {$node_id == $new_parent} {
 	set parent_id $new_parent
 	set node_type $new_type	
 	set action_type "new_folder"
-	set action_form_part "[export_vars -form {expand:multiple parent_id node_type root_id}]"
+	set action_form_part [export_vars -form {expand:multiple parent_id node_type root_id}]
     }
 
     multirow append nodes $node_id $expand_mode $expand_url $indent $name $name_url $object_name $url $package_pretty_name $action_type $action_form_part $add_folder_url $new_app_url $unmount_url $mount_url $rename_url $delete_url $parameters_url $permissions_url ""
 
 }
 
-set new_app_form_part_1 [subst {<form name="new_application" action="package-new"><input type="hidden" name="node_id" value="$node(node_id)"><input type="hidden" name="root_id" value="$node(node_id)"><input type="hidden" name="new_node_p" value="t">[export_vars -form {expand:multiple}]<input name="node_name" type="text" size="8">}]
+set new_app_form_part_1 [subst {<form name="new_application" action="package-new"><div><input type="hidden" name="node_id" value="$node(node_id)"><input type="hidden" name="root_id" value="$node(node_id)"><input type="hidden" name="new_node_p" value="t">[export_vars -form {expand:multiple}]<input name="node_name" type="text" size="8">}]
 
 set new_app_form_part_2 "[apm_application_new_checkbox]"
-set new_app_form_part_3 "<input type=\"submit\" value=\"Mount Package\"></form>"
+set new_app_form_part_3 "<input type=\"submit\" value=\"Mount Package\"></div></form>"
     multirow append nodes -99999 "" "" "" $new_app_form_part_1 "" "" "" $new_app_form_part_2 "" "" "" "" "" "" "" "" "" "" $new_app_form_part_3
 
 set services ""
 
 db_foreach services_select {} {
     if {$parameter_count > 0} {
-        append services "<li><a href=\"[export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]\">$instance_name</a>"
+        append services "<li><a href=\"[export_vars -base /shared/parameters { package_id { return_url {[ad_return_url]} } }]\">$instance_name</a>"
     }
 } if_no_rows {
     append services "  <li>(none)\n"