Index: openacs-4/packages/acs-developer-support/lib/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.adp,v
diff -u -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/acs-developer-support/lib/toolbar.adp	16 Sep 2015 09:18:55 -0000	1.20.2.1
+++ openacs-4/packages/acs-developer-support/lib/toolbar.adp	16 Sep 2015 09:35:25 -0000	1.20.2.2
@@ -21,7 +21,7 @@
           <span>|</span></li>
           <li><a href="/acs-admin/apm/" title="Modify/reload packages">APM</a>
           <span>|</span></li>
-          <li><a href="/admin/site-map/" title="Manage your package instances">Site&nbsp;Map</a>
+          <li><a href="/admin/site-map/?root_id=@this_side_node@" title="Configure current package via Site Map">Site&nbsp;Map</a>
           <span>|</span></li>
           <li><a href="/acs-admin/apm/?reload_links_p=1" title="Scan for changed library files">Changed</a>
           <span>|</span></li>
@@ -35,9 +35,12 @@
           <span>|</span></li>
           <li><a href="/doc/" title="View system documentation">Docs</a>
           <span>|</span></li>
-          <li><a href="/api-doc/" title="View/search OpenACS Tcl API documentation">API&nbsp;doc</a>
-          <if @rm_url@ ne ""><span>|</span></li>
-	  <li><a href="@rm_url@" title="View requests in the request monitor">Requests</a></li>
+          <li><a href="/api-doc/" title="View/search OpenACS Tcl API documentation">API&nbsp;doc</a></li>
+          <if @xocore_url@ ne ""><span>|</span>
+           <li><a href="@xocore_url@" title="XoTcl Documentation Browser">XoTcl</a></li>
+          </if>
+          <if @rm_url@ ne ""><span>|</span>
+           <li><a href="@rm_url@" title="View requests in the request monitor">Requests</a></li>
 	  </if><else>
            </li>
           </else>
Index: openacs-4/packages/acs-developer-support/lib/toolbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.tcl,v
diff -u -r1.14.2.2 -r1.14.2.3
--- openacs-4/packages/acs-developer-support/lib/toolbar.tcl	16 Sep 2015 09:18:55 -0000	1.14.2.2
+++ openacs-4/packages/acs-developer-support/lib/toolbar.tcl	16 Sep 2015 09:35:25 -0000	1.14.2.3
@@ -101,13 +101,18 @@
         off
 }
 
-set rm_package_id [apm_package_id_from_key xotcl-request-monitor]
-if {$rm_package_id > 0} {
-    set rm_url [apm_package_url_from_id $rm_package_id]
-} else {
-    set rm_url ""
+#get url for xotcl-core and xotcl-request-monitor
+foreach {package_name package_url} {xotcl-core xocore_url xotcl-request-monitor rm_url} {
+    set package_id [apm_package_id_from_key $package_name]
+    if {$package_id > 0} {
+        set $package_url [apm_package_url_from_id $package_id]
+    } else {
+        set $package_url ""
+    }
 }
 
+set this_side_node [site_node_id [ad_conn url]]
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4