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 -N -r1.16 -r1.16.2.1
--- openacs-4/packages/acs-developer-support/lib/toolbar.adp	6 Oct 2006 13:37:07 -0000	1.16
+++ openacs-4/packages/acs-developer-support/lib/toolbar.adp	24 Jun 2007 12:51:51 -0000	1.16.2.1
@@ -19,23 +19,23 @@
           <span>|</span></li>
           <li><a href="@oacs_shell_url@" title="Execute commands and see the result">Shell</a>
           <span>|</span></li>
-          <li><a href="/acs-admin/apm/" title="Modify/reload packages">APM</a>
+          <li><a href="@base_url@/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="@base_url@/admin/site-map/" title="Manage your package instances">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>
+          <li><a href="@base_url@/acs-admin/apm/?reload_links_p=1" title="Scan for changed library files">Changed</a>
           <span>|</span></li>
           <li><a href="@flush_url@" title="Flush entire util_memoize cache">Flush</a>
           <span>|</span></li>
           <li><a href="@auto_test_url@" title="Automated Testing Home">Test</a>
           <span>|</span></li>
-          <li><a href="/acs-admin/users/" title="Add/edit/become users">Users</a>
+          <li><a href="@base_url@/acs-admin/users/" title="Add/edit/become users">Users</a>
           <span>|</span></li>
-          <li><a href="/acs-lang/admin/" title="Add/edit message keys">I18n</a>
+          <li><a href="@base_url@/acs-lang/admin/" title="Add/edit message keys">I18n</a>
           <span>|</span></li>
-          <li><a href="/doc/" title="View system documentation">Docs</a>
+          <li><a href="@base_url@/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>
+          <li><a href="@base_url@/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>
 	  </if><else>
@@ -45,7 +45,7 @@
       </td>
 
       <td align="right" id="developer-search">
-        <form action="/api-doc/proc-search">
+        <form action="@base_url@/api-doc/proc-search">
           <input type="hidden" name="search_type" value="All+matches"/>
           <input type="hidden" name="name_weight" value="5"/>
           <input type="hidden" name="param_weight" value="3"/>