Index: openacs-4/packages/dotlrn/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/dotlrn/www/admin/index.adp	15 Dec 2006 22:45:22 -0000	1.29
+++ openacs-4/packages/dotlrn/www/admin/index.adp	15 May 2007 20:14:25 -0000	1.30
@@ -42,12 +42,13 @@
   <li><a href="edit-preapproved-emails" title="#dotlrn.edit_approved_email_servers#">#dotlrn.edit_approved_email_servers#</a></li>
   <li><a href="@parameters_url@" title="#dotlrn.edit_parameters#">#dotlrn.edit_parameters#</a></li>
   <li><a href="@parameters_d_url@" title="#dotlrn.edit_community_parameters#">#dotlrn.edit_community_parameters#</a></li>
-  <li><a href="toolbar-actions?action=@action@&return_url=@return_url@" title="@dotlrn_toolbar_action@">@dotlrn_toolbar_action@</a></li>
-  <p>
+  <li><a href="@toolbar_actions_url@" title="@dotlrn_toolbar_action@">@dotlrn_toolbar_action@</a></li>
+    </ul>
+
   <if @oacs_site_wide_admin_p@ true>
-    <li><a href="/acs-admin/" title="#dotlrn.goto_oacs_swa#">OpenACS Site-Wide Administration</a></li>
+      <ul>
+        <li><a href="/acs-admin/" title="#dotlrn.goto_oacs_swa#">OpenACS Site-Wide Administration</a></li>
+      </ul>
   </if>
-  </p>
-</ul>