Index: openacs-4/packages/bm-portlet/bm-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bm-portlet/bm-portlet.info,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/bm-portlet/bm-portlet.info	24 Feb 2005 13:33:02 -0000	1.11
+++ openacs-4/packages/bm-portlet/bm-portlet.info	24 Sep 2005 04:16:27 -0000	1.11.2.1
@@ -7,12 +7,12 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="2.1.0b3" url="http://openacs.org/repository/download/apm/bm-portlet-2.1.0b3.apm">
+    <version name="2.1.0b4" url="http://openacs.org/repository/download/apm/bm-portlet-2.1.0b4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2004-03-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
 
-        <provides url="bm-portlet" version="2.1.0b3"/>
+        <provides url="bm-portlet" version="2.1.0b4"/>
         <requires url="bulk-mail" version="0.1d"/>
         <requires url="new-portal" version="0.1a"/>
 
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/bm-portlet/catalog/bm-portlet.en_AU.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/bm-portlet/catalog/bm-portlet.es_CO.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/bm-portlet/catalog/bm-portlet.ms_my.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/calendar-portlet/calendar-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/calendar-portlet.info,v
diff -u -r1.20 -r1.20.2.1
--- openacs-4/packages/calendar-portlet/calendar-portlet.info	24 Feb 2005 13:33:05 -0000	1.20
+++ openacs-4/packages/calendar-portlet/calendar-portlet.info	24 Sep 2005 04:17:50 -0000	1.20.2.1
@@ -7,12 +7,12 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="2.1.0b3" url="http://openacs.org/repository/download/apm/calendar-portlet-2.1.0b3.apm">
+    <version name="2.1.0b4" url="http://openacs.org/repository/download/apm/calendar-portlet-2.1.0b4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2004-03-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
 
-        <provides url="calendar-portlet" version="2.1.0b3"/>
+        <provides url="calendar-portlet" version="2.1.0b4"/>
         <requires url="calendar" version="1.0"/>
         <requires url="new-portal" version="0.1a"/>
 
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar-portlet/catalog/calendar-portlet.en_AU.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar-portlet/catalog/calendar-portlet.es_CO.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar-portlet/catalog/calendar-portlet.ms_my.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/curriculum-portlet/curriculum-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-portlet/curriculum-portlet.info,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/curriculum-portlet/curriculum-portlet.info	24 Feb 2005 13:33:06 -0000	1.5
+++ openacs-4/packages/curriculum-portlet/curriculum-portlet.info	24 Sep 2005 04:15:18 -0000	1.5.2.1
@@ -7,12 +7,12 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="2.1.0b2" url="http://openacs.org/repository/download/apm/curriculum-portlet-2.1.0b2.apm">
+    <version name="2.1.2" url="http://openacs.org/repository/download/apm/curriculum-portlet-2.1.2.apm">
         <owner url="mailto:ola@polyxena.net">Ola Hansson</owner>
         <release-date>2004-03-10</release-date>
         <vendor url="http://www.polyxena.net">Polyxena</vendor>
 
-        <provides url="curriculum-portlet" version="2.1.0b2"/>
+        <provides url="curriculum-portlet" version="2.1.2"/>
         <requires url="curriculum" version="0.1d"/>
         <requires url="new-portal" version="0.1a"/>
 
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-portlet/sql/oracle/upgrade/upgrade-2.1.0b2-2.1.1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.4.1 refers to a dead (removed) revision in file `openacs-4/packages/curriculum-portlet/sql/postgresql/upgrade/upgrade-2.1.0b2-2.1.1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/curriculum-portlet/tcl/curriculum-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-portlet/tcl/curriculum-admin-portlet-procs.tcl,v
diff -u -r1.1.1.1 -r1.1.1.1.8.1
--- openacs-4/packages/curriculum-portlet/tcl/curriculum-admin-portlet-procs.tcl	16 Jun 2003 22:24:04 -0000	1.1.1.1
+++ openacs-4/packages/curriculum-portlet/tcl/curriculum-admin-portlet-procs.tcl	24 Sep 2005 04:15:19 -0000	1.1.1.1.8.1
@@ -17,7 +17,7 @@
 
     ad_proc -public get_pretty_name {
     } {
-        return "Curriculum Administration"
+        return "#curriculum.lt_Curriculum_Administration#"
     }
 
     ad_proc -private my_package_key {
Index: openacs-4/packages/curriculum-portlet/tcl/curriculum-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-portlet/tcl/curriculum-portlet-procs.tcl,v
diff -u -r1.1.1.1 -r1.1.1.1.8.1
--- openacs-4/packages/curriculum-portlet/tcl/curriculum-portlet-procs.tcl	16 Jun 2003 22:24:04 -0000	1.1.1.1
+++ openacs-4/packages/curriculum-portlet/tcl/curriculum-portlet-procs.tcl	24 Sep 2005 04:15:19 -0000	1.1.1.1.8.1
@@ -22,7 +22,7 @@
 
     ad_proc -public get_pretty_name {
     } {
-        return "Curriculum"
+        return "#curriculum.Curriculum_1#"
     }
 
     ad_proc -public link {
Index: openacs-4/packages/dotlrn-admin/dotlrn-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/dotlrn-admin.info,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn-admin/dotlrn-admin.info	24 Feb 2005 13:33:07 -0000	1.2
+++ openacs-4/packages/dotlrn-admin/dotlrn-admin.info	24 Sep 2005 04:12:32 -0000	1.2.2.1
@@ -7,12 +7,12 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="2.1.1" url="http://openacs.org/repository/download/apm/dotlrn-admin-2.1.1.apm">
+    <version name="2.1.3" url="http://openacs.org/repository/download/apm/dotlrn-admin-2.1.3.apm">
         <owner url="mailto:aegrumet@mit.edu">Andrew Grumet</owner>
         <summary>.LRN-wide admin pages.  Initially created as a singleton with automount at /dotlrn/dotlrn-admin.  These can be changed if and when .LRN supports multiple instances.</summary>
         <description format="text/plain">Contains pages and scripts for configuring .LRN --- managing users, departments, terms, classes and so on.</description>
 
-        <requires url="dotlrn" version="2.1.1"/>
+        <requires url="dotlrn" version="2.1.2"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/dotlrn-admin/tcl/dotlrn-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/tcl/dotlrn-admin-procs.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/tcl/dotlrn-admin-procs.tcl	20 Aug 2004 14:44:21 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/tcl/dotlrn-admin-procs.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -2,4 +2,7 @@
     ad_proc -public mount_point {} {} {
 	return dotlrn-admin
     }
+    ad_proc -public get_admin_url {} {} {
+	return [dotlrn::get_url]/[mount_point]/admin
+    }
 }
\ No newline at end of file
Index: openacs-4/packages/dotlrn-admin/www/admin/archived-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/archived-communities.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/archived-communities.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/archived-communities.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -26,7 +26,7 @@
     archived_comms:multirow
 }
 
-set groups_pretty_plural "[parameter::get -localize -parameter class_instances_pretty_plural] / [parameter::get -localize -parameter clubs_pretty_plural]"
+set groups_pretty_plural "[parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_plural] / [parameter::get -localize -parameter clubs_pretty_plural]"
 
 set title "[_ dotlrn.archived_groups]"
 set context_bar [list $title]
Index: openacs-4/packages/dotlrn-admin/www/admin/class-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/class-edit.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/class-edit.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/class-edit.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -33,8 +33,8 @@
     ad_script_abort
 }
 
-set title "[_ dotlrn.Edit] [parameter::get -localize -parameter classes_pretty_name] $pretty_name"
-set context_bar [list [list classes [parameter::get -localize -parameter classes_pretty_plural]] [_ dotlrn.Edit]]
+set title "[_ dotlrn.Edit] [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_name] $pretty_name"
+set context_bar [list [list classes [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_plural]] [_ dotlrn.Edit]]
 
 form create edit_class
 
Index: openacs-4/packages/dotlrn-admin/www/admin/class-instance-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/class-instance-new.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/class-instance-new.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/class-instance-new.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -61,7 +61,7 @@
     -options [list [list [_ dotlrn.Open] open] [list "[_ dotlrn.Needs_Approval]" "needs approval"] [list [_ dotlrn.Closed] closed]]
 
 element create add_class_instance class_key \
-    -label "[parameter::get -localize -parameter classes_pretty_name] [_ dotlrn.Key]" \
+    -label "[parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_name] [_ dotlrn.Key]" \
     -datatype text \
     -widget hidden \
     -value $class_key
@@ -105,10 +105,10 @@
 }
 
 # Used by en_US version of new_class_instance message
-set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
+set class_instances_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_name]
 
 set context_bar [list \
-                     [list classes [parameter::get -localize -parameter classes_pretty_plural]] \
+                     [list classes [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_plural]] \
                      [list "class?class_key=$class_key" $class_name] \
                      [_ dotlrn.new_class_instance]]
 
Index: openacs-4/packages/dotlrn-admin/www/admin/class-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/class-new.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/class-new.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/class-new.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -30,14 +30,14 @@
 }
 
 # Used in en_US title
-set classes_pretty_name [parameter::get -localize -parameter classes_pretty_name]
+set classes_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_name]
 set title "[_ dotlrn.new_class_1]"
-set context_bar [list [list classes [parameter::get -localize -parameter classes_pretty_plural]] [_ dotlrn.new_class_navbar_name]]
+set context_bar [list [list classes [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_plural]] [_ dotlrn.new_class_navbar_name]]
 
 form create add_class
 
 element create add_class department_key \
-    -label [parameter::get -localize -parameter departments_pretty_name] \
+    -label [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name] \
     -datatype text \
     -widget select \
     -options [dotlrn_department::select_as_list] \
Index: openacs-4/packages/dotlrn-admin/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/class.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/class.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/class.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -71,12 +71,12 @@
 
 set can_instantiate [dotlrn_class::can_instantiate]
 
-set context_bar [list [list classes [parameter::get -localize -parameter classes_pretty_plural]] $pretty_name]
+set context_bar [list [list classes [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_plural]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
 
 # Used by some en_US messages on the adp page
-set classes_pretty_name [parameter::get -localize -parameter classes_pretty_name]
-set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
-set class_instances_pretty_plural [parameter::get -localize -parameter class_instances_pretty_plural]
+set classes_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_name]
+set class_instances_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_name]
+set class_instances_pretty_plural [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_plural]
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/classes-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/classes-chunk.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/classes-chunk.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/classes-chunk.adp	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -40,7 +40,7 @@
     <tr bgcolor="#eeeeee">
       <th align="left" width="50%">
 <formtemplate id="department_form">
-        <%= [parameter::get -localize -parameter departments_pretty_name] %>:&nbsp;<formwidget id="department_key">
+        <%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name] %>:&nbsp;<formwidget id="department_key">
 </formtemplate>
       </th>
     </tr>
@@ -51,9 +51,9 @@
   <table bgcolor="#cccccc" cellpadding="5" width="95%">
 
     <tr>
-      <th align="left" width="30%"><%= [parameter::get -localize -parameter departments_pretty_name] %></th>
+      <th align="left" width="30%"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name] %></th>
       <th align="left">#dotlrn.class_name#</th>
-      <th align="center" width="5%"><%= [parameter::get -localize -parameter class_instances_pretty_plural] %></th>
+      <th align="center" width="5%"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_plural] %></th>
       <th align="center" width="10%">#dotlrn.Actions#</th>
     </tr>
 
Index: openacs-4/packages/dotlrn-admin/www/admin/classes-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/classes-chunk.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/classes-chunk.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/classes-chunk.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -68,8 +68,8 @@
 set can_instantiate [dotlrn_class::can_instantiate]
 
 # Used in the en_US versions of some of the messages in the adp
-set classes_pretty_name [parameter::get -localize -parameter classes_pretty_name]
-set classes_pretty_plural [parameter::get -localize -parameter classes_pretty_plural]
-set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
+set classes_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_name]
+set classes_pretty_plural [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_plural]
+set class_instances_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_name]
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/classes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/classes.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/classes.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/classes.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -27,7 +27,7 @@
     context_bar:onevalue
 }
 
-set title [parameter::get -localize -parameter classes_pretty_plural]
+set title [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_plural]
 set context_bar $title
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/club-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/club-new.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/club-new.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/club-new.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -67,8 +67,8 @@
     ad_script_abort
 }
 
-set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
+set clubs_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_name]
 set title "[_ dotlrn.new_community]"
-set context_bar [list [list clubs [parameter::get -localize -parameter clubs_pretty_plural]] $title]
+set context_bar [list [list clubs [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_plural]] $title]
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/club.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/club.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/club.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/club.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -36,7 +36,7 @@
 
 set description [ad_quotehtml $description]
 
-set context_bar [list [list clubs [parameter::get -localize -parameter clubs_pretty_plural]] $pretty_name]
+set context_bar [list [list clubs [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_plural]] $pretty_name]
 
 ad_return_template
 
Index: openacs-4/packages/dotlrn-admin/www/admin/clubs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/clubs.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/clubs.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/clubs.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -29,15 +29,15 @@
     clubs:multirow
 }
 
-set title [parameter::get -localize -parameter clubs_pretty_plural]
+set title [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_plural]
 set context_bar [list $title]
 
 db_multirow clubs select_clubs {} {
     set description [ad_quotehtml $description]
 }
 
 # Some of the en_US messages in the adp use these variables
-set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
-set clubs_pretty_plural [parameter::get -localize -parameter clubs_pretty_plural]
+set clubs_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_name]
+set clubs_pretty_plural [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_plural]
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/cockpit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/cockpit.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/cockpit.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/cockpit.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -22,7 +22,7 @@
     @version $Id$
 }
 
-set admin_pretty_name [parameter::get -localize -parameter dotlrn_admin_pretty_name]
+set admin_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter dotlrn_admin_pretty_name]
 
 # Does Developer support exists
 set ds_exists_p 0
Index: openacs-4/packages/dotlrn-admin/www/admin/department-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/department-delete.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/department-delete.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/department-delete.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -28,9 +28,9 @@
     context_bar:onevalue
 }
 
-set departments_pretty_name [parameter::get -localize -parameter departments_pretty_name]
+set departments_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name]
 set title "[_ dotlrn.Delete_Empty]"
-set context_bar [list [list departments [parameter::get -localize -parameter departments_pretty_plural]] Delete]
+set context_bar [list [list departments [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_plural]] Delete]
 
 form create delete_department
 
Index: openacs-4/packages/dotlrn-admin/www/admin/department-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/department-edit.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/department-edit.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/department-edit.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -33,13 +33,13 @@
     ad_script_abort
 }
 
-set title "[_ dotlrn.Edit] [parameter::get -localize -parameter departments_pretty_name] $pretty_name"
-set context_bar [list [list departments [parameter::get -localize -parameter departments_pretty_plural]] [_ dotlrn.Edit]]
+set title "[_ dotlrn.Edit] [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name] $pretty_name"
+set context_bar [list [list departments [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_plural]] [_ dotlrn.Edit]]
 
 form create edit_department
 
 element create edit_department department_key \
-    -label "[parameter::get -localize -parameter departments_pretty_name] [_ dotlrn.lt_Key_a_short_name_no_s]" \
+    -label "[parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name] [_ dotlrn.lt_Key_a_short_name_no_s]" \
     -datatype text \
     -widget hidden \
     -value $department_key
Index: openacs-4/packages/dotlrn-admin/www/admin/department-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/department-new.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/department-new.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/department-new.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -27,8 +27,8 @@
     context_bar:onevalue
 }
 
-set title "[_ dotlrn.New] [parameter::get -localize -parameter departments_pretty_name]"
-set context_bar [list [list departments [parameter::get -localize -parameter departments_pretty_plural]] [_ dotlrn.New]]
+set title "[_ dotlrn.New] [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name]"
+set context_bar [list [list departments [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_plural]] [_ dotlrn.New]]
 
 form create add_department
 
Index: openacs-4/packages/dotlrn-admin/www/admin/department.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/department.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/department.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/department.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -31,7 +31,7 @@
 }
 
 if {[empty_string_p $department_key]} {
-    ad_returnredirect "[dotlrn::get_admin_url]/classes"
+    ad_returnredirect "[dotlrn_admin::get_admin_url]/classes"
     ad_script_abort
 }
 
@@ -43,7 +43,7 @@
 
 set description [ad_quotehtml $description]
 
-set context_bar [list [list departments [parameter::get -localize -parameter departments_pretty_plural]] $pretty_name]
+set context_bar [list [list departments [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_plural]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/departments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/departments.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/departments.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/departments.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -27,13 +27,13 @@
     departments:multirow
 }
 
-set title [parameter::get -localize -parameter departments_pretty_plural]
-set context_bar [parameter::get -localize -parameter departments_pretty_plural]
+set title [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_plural]
+set context_bar [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_plural]
 set referer departments
 set can_create [dotlrn_class::can_create]
-set departments_pretty_name [parameter::get -localize -parameter departments_pretty_name]
-set departments_pretty_plural [parameter::get -localize -parameter departments_pretty_plural]
-set classes_pretty_name [parameter::get -localize -parameter classes_pretty_name]
+set departments_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name]
+set departments_pretty_plural [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_plural]
+set classes_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_name]
 
 db_multirow departments select_departments {}
 
Index: openacs-4/packages/dotlrn-admin/www/admin/edit-preapproved-emails.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/edit-preapproved-emails.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/edit-preapproved-emails.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/edit-preapproved-emails.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -17,7 +17,7 @@
     @creation-date 2002-03-05
     @version $Id$
 } -query {
-    {referer [dotlrn::get_admin_url]}
+    {referer [dotlrn_admin::get_admin_url]}
 } -properties {
     context_bar:onevalue
 }
Index: openacs-4/packages/dotlrn-admin/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/index.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/index.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/index.adp	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -32,10 +32,10 @@
   <li><a href="dotlrn-admins">#dotlrn.Administrators#</a></li> 
   <li><a href="users">#dotlrn.users#</a></li>
   <li><a href="terms">#dotlrn.terms#</a></li>
-  <li><a href="departments"><%= [parameter::get -localize -parameter departments_pretty_plural] %></a></li>
-  <li><a href="classes"><%= [parameter::get -localize -parameter classes_pretty_plural] %></a></li>
-  <li><a href="term?term_id=-1"><%= [parameter::get -localize -parameter class_instances_pretty_plural] %></a></li>
-  <li><a href="clubs"><%= [parameter::get -localize -parameter clubs_pretty_plural] %></a></li> 
+  <li><a href="departments"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_plural] %></a></li>
+  <li><a href="classes"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_plural] %></a></li>
+  <li><a href="term?term_id=-1"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_plural] %></a></li>
+  <li><a href="clubs"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_plural] %></a></li> 
   <li><a href="portal-templates">#dotlrn.portal_templates#</a></li>
   <li><a href="archived-communities">#dotlrn.archived_classes_and_communities#</a></li>
   <li><a href="edit-preapproved-emails">#dotlrn.edit_approved_email_servers#</a></li>
Index: openacs-4/packages/dotlrn-admin/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/index.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/index.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/index.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -23,12 +23,12 @@
 
 set oacs_site_wide_admin_p [acs_user::site_wide_admin_p]
 
-set admin_pretty_name [parameter::get -localize -parameter dotlrn_admin_pretty_name]
+set admin_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter dotlrn_admin_pretty_name]
 set context_bar {}
 
 # Some en_US messages reuse these configurable pretty names
-set class_instances_pretty_plural [parameter::get -localize -parameter class_instances_pretty_plural]
-set clubs_pretty_plural [parameter::get -localize -parameter clubs_pretty_plural]
+set class_instances_pretty_plural [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_plural]
+set clubs_pretty_plural [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_plural]
 
 set parameters_url [export_vars -base /shared/parameters { { package_id {[dotlrn::get_package_id]} } { return_url [ad_return_url] } }] 
 
Index: openacs-4/packages/dotlrn-admin/www/admin/need-term-note.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/need-term-note.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/need-term-note.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/need-term-note.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -2,4 +2,4 @@
 # Used by the en_US version of the message in the adp file
 set terms_url "terms"
 set terms_pretty_plural [_ dotlrn.terms]
-set class_instances_pretty_plural [parameter::get -localize -parameter class_instances_pretty_plural]
+set class_instances_pretty_plural [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_plural]
Index: openacs-4/packages/dotlrn-admin/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/term.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/term.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/term.adp	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -62,7 +62,7 @@
     <tr bgcolor="#eeeeee">
       <th align="left" width="50%">
 <formtemplate id="department_form">
-        <%= [parameter::get -localize -parameter departments_pretty_name] %>:&nbsp;<formwidget id="department_key">
+        <%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name] %>:&nbsp;<formwidget id="department_key">
 </formtemplate>
       </th>
       <th align="left" width="50%">
@@ -77,12 +77,12 @@
 
   <table bgcolor="#cccccc" cellpadding="5" width="95%">
     <tr>
-      <th align="left" width="20%"><%= [parameter::get -localize -parameter departments_pretty_name] %></th>
-      <th align="left" width="20%"><%= [parameter::get -localize -parameter classes_pretty_name] %></th>
+      <th align="left" width="20%"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter departments_pretty_name] %></th>
+      <th align="left" width="20%"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter classes_pretty_name] %></th>
 <if @term_id@ eq -1>
       <th align="left" width="10%">#dotlrn.term#</th>
 </if>
-      <th align="left" width="25%"><%= [parameter::get -localize -parameter class_instances_pretty_name] %></th>
+      <th align="left" width="25%"><%= [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_name] %></th>
       <th align="center" width="10%">#dotlrn.members#</th>
       <th align="center">#dotlrn.actions#</th>
     </tr>
Index: openacs-4/packages/dotlrn-admin/www/admin/term.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/term.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/term.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/term.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -117,6 +117,6 @@
 }
 
 # Used by the en_US version of the no_class_instances message in the adp
-set class_instances_pretty_plural [parameter::get -localize -parameter class_instances_pretty_plural]
+set class_instances_pretty_plural [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_plural]
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/user-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user-edit.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/user-edit.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user-edit.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -22,7 +22,7 @@
     @creation-date 2001-12-10
     @version $Id$
 } -query {
-    {return_url "[dotlrn::get_admin_url]/users"}
+    {return_url "[dotlrn_admin::get_admin_url]/users"}
     user_id
 }
 
Index: openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user-new-2.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -22,7 +22,7 @@
     @version $Id$
 } -query {
     user_id
-    {referer "[dotlrn::get_admin_url]/users"}
+    {referer "[dotlrn_admin::get_admin_url]/users"}
 }
 
 set context_bar [list [list users [_ dotlrn.Users]] [_ dotlrn.New]]
Index: openacs-4/packages/dotlrn-admin/www/admin/user-nuke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user-nuke.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/user-nuke.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user-nuke.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -7,7 +7,7 @@
     @version $Id$
 } {
     user_id:integer,notnull
-    {referer "[dotlrn::get_admin_url]/users"}
+    {referer "[dotlrn_admin::get_admin_url]/users"}
 }
 
 db_1row select_user_info {
Index: openacs-4/packages/dotlrn-admin/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/user.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/user.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/user.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -92,17 +92,17 @@
 
 set context_bar [list [list users [_ dotlrn.Users]] "$first_names $last_name"]
 
-set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
+set dual_approve_return_url [ns_urlencode [dotlrn_admin::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
 
 set approve_user_url "/acs-admin/users/member-state-change?user_id=$user_id&member_state=approved&return_url=$dual_approve_return_url"
 
 set remove_user_url "\[<small><a href=\"[export_vars -base user-nuke {user_id}]\">Nuke</a></small>\]"
 
 # Used in some en_US messages in the adp file
-set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
-set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
-set subcommunities_pretty_name [parameter::get -localize -parameter subcommunities_pretty_name]
+set class_instances_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter class_instances_pretty_name]
+set clubs_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter clubs_pretty_name]
+set subcommunities_pretty_name [parameter::get -package_id [dotlrn::get_package_id] -localize -parameter subcommunities_pretty_name]
 
-set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
+set dual_approve_return_url [ns_urlencode [dotlrn_admin::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk-large.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk-large.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk-large.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk-large.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -30,7 +30,7 @@
 }
 
 if {![exists_and_not_null referer]} {
-    set referer "[dotlrn::get_admin_url]/users"
+    set referer "[dotlrn_admin::get_admin_url]/users"
 }
 
 set user_id [ad_conn user_id]
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk-medium.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk-medium.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk-medium.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk-medium.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -35,7 +35,7 @@
 }
 
 if {![exists_and_not_null referer]} {
-    set referer "[dotlrn::get_admin_url]/users"
+    set referer "[dotlrn_admin::get_admin_url]/users"
 }
 
 set dimension_list {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z}
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk-small.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk-small.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk-small.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk-small.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -33,7 +33,7 @@
 }
 
 if {![exists_and_not_null referer]} {
-    set referer "[dotlrn::get_admin_url]/users"
+    set referer "[dotlrn_admin::get_admin_url]/users"
 }
 
 # Currently, just present a list of dotLRN users
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk.adp	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -77,7 +77,7 @@
 
     <if @oacs_site_wide_admin_p@ true>
     <% # We had to escape to Tcl to get the desired behavior. AG %>
-    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | </if>
+    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn_admin::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | </if>
     <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#acs-kernel.common_delete#</small>
     </td>
 </if>
Index: openacs-4/packages/dotlrn-admin/www/admin/users-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-chunk.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/users-chunk.tcl	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users-chunk.tcl	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -28,7 +28,7 @@
 set user_id [ad_conn user_id]
 
 if {![exists_and_not_null referer]} {
-    set referer "[dotlrn::get_admin_url]/users"
+    set referer "[dotlrn_admin::get_admin_url]/users"
 }
 
 ad_return_template
Index: openacs-4/packages/dotlrn-admin/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/dotlrn-admin/www/admin/users.adp	20 Aug 2004 14:44:22 -0000	1.1
+++ openacs-4/packages/dotlrn-admin/www/admin/users.adp	24 Sep 2005 04:12:32 -0000	1.1.4.1
@@ -22,7 +22,7 @@
 <property name="title">#dotlrn.Users#</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<% set referer "[dotlrn::get_admin_url]/users" %>
+<% set referer "[dotlrn_admin::get_admin_url]/users" %>
 
 [<small>
   <a href="../../user-add?add_membership_p=f&dotlrn_interactive_p=1&referer=@referer@"><small>#dotlrn.Create_A_New_User#</small></a> 
Index: openacs-4/packages/dotlrn-bm/dotlrn-bm.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/dotlrn-bm.info,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/dotlrn-bm/dotlrn-bm.info	24 Feb 2005 13:33:08 -0000	1.8
+++ openacs-4/packages/dotlrn-bm/dotlrn-bm.info	24 Sep 2005 04:08:50 -0000	1.8.2.1
@@ -7,12 +7,12 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="2.1.1" url="http://openacs.org/repository/download/apm/dotlrn-bm-2.1.1.apm">
+    <version name="2.1.3" url="http://openacs.org/repository/download/apm/dotlrn-bm-2.1.3.apm">
         <owner url="http://openacs.org">OpenACS</owner>
-        <release-date>2004-03-10</release-date>
+        <release-date>2005-09-03</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
 
-        <provides url="dotlrn-bm" version="2.1.1"/>
+        <provides url="dotlrn-bm" version="2.1.3"/>
         <requires url="bm-portlet" version="0.1a"/>
         <requires url="dotlrn" version="1.0"/>