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.24.6.1 -r1.24.6.2
--- openacs-4/packages/dotlrn/www/admin/index.adp	19 Jul 2004 18:39:39 -0000	1.24.6.1
+++ openacs-4/packages/dotlrn/www/admin/index.adp	23 Nov 2004 00:29:20 -0000	1.24.6.2
@@ -41,6 +41,7 @@
   <li><a href="edit-preapproved-emails">#dotlrn.edit_approved_email_servers#</a></li>
   <li><a href="@parameters_url@">#dotlrn.edit_parameters#</a></li>
   <li><a href="@parameters_d_url@">#dotlrn.edit_community_parameters#</a></li>
+  <li><a href="toolbar-actions?action=@action@&return_url=@return_url@">@dotlrn_toolbar_action@</a></li>
   <p>
   <if @oacs_site_wide_admin_p@ true>
     <li><a href="/acs-admin/">OpenACS Site-Wide Administration</a></li>
Index: openacs-4/packages/dotlrn/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.tcl,v
diff -u -r1.15.6.2 -r1.15.6.3
--- openacs-4/packages/dotlrn/www/admin/index.tcl	25 Aug 2004 15:50:58 -0000	1.15.6.2
+++ openacs-4/packages/dotlrn/www/admin/index.tcl	23 Nov 2004 00:29:20 -0000	1.15.6.3
@@ -37,4 +37,14 @@
 
 set parameters_d_url [export_vars -base /shared/parameters { { package_id {[apm_package_id_from_key dotlrn-portlet]} } { return_url [ad_return_url] } }]
 
+if { ![parameter::get -localize -package_id [dotlrn::get_package_id] -parameter dotlrn_toolbar_enabled_p -default 1] } {
+    set dotlrn_toolbar_action "Show .LRN toolbar"
+    set action "show"
+} else {
+    set dotlrn_toolbar_action "Hide .LRN toolbar"
+    set action "hide"
+}
+
+set return_url [ad_conn url]
+
 ad_return_template
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.12.2.4 -r1.12.2.5
--- openacs-4/www/blank-master.tcl	22 Nov 2004 22:14:32 -0000	1.12.2.4
+++ openacs-4/www/blank-master.tcl	23 Nov 2004 00:29:18 -0000	1.12.2.5
@@ -77,7 +77,7 @@
 
 # dotlrn toolbar : We include that here, so that master template authors don't have to worry about it
 
-if { [apm_package_installed_p dotlrn ] } {
+if { [llength [namespace eval :: info procs dotlrn_toolbar::show_p]] == 1 } {
     multirow append header_links "stylesheet" "text/css" "/resources/dotlrn/dotlrn-toolbar.css" "all"
     set dotlrn_toolbar_p 1
 } else {