Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/dotlrn/tcl/class-procs.tcl	16 May 2002 13:29:14 -0000	1.35
+++ openacs-4/packages/dotlrn/tcl/class-procs.tcl	18 May 2002 22:42:11 -0000	1.36
@@ -253,19 +253,16 @@
         ]
     }
 
-    ad_proc -public can_create {
-    } {
+    ad_proc -public can_create {} {
         can a class be created? essentially, does at least one department
         exist?
     } {
         return [db_string can_create {}]
     }
 
-    ad_proc -public can_instantiate {
-        {-class_key:required}
+    ad_proc -public can_instantiate {} {
+        can we instantiate classes? essentially, are there any current terms?
     } {
-        can this class be instantiated?
-    } {
         return [db_string can_instantiate {}]
     }
 
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.120 -r1.121
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	15 May 2002 17:47:13 -0000	1.120
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	18 May 2002 22:42:11 -0000	1.121
@@ -57,9 +57,9 @@
 
             dotlrn_community::set_type_package_id $community_type $package_id
 
-            ad_parameter -package_id $package_id -set 0 dotlrn_level_p
-            ad_parameter -package_id $package_id -set 1 community_type_level_p
-            ad_parameter -package_id $package_id -set 0 community_level_p
+            dotlrn::parameter -package_id $package_id -set 0 dotlrn_level_p
+            dotlrn::parameter -package_id $package_id -set 1 community_type_level_p
+            dotlrn::parameter -package_id $package_id -set 0 community_level_p
 
             # create a "dummy" community for this community
             # type to get a portal template with all of the
@@ -114,9 +114,9 @@
             ]
 
             # Set some parameters
-            ad_parameter -package_id $package_id -set 0 dotlrn_level_p
-            ad_parameter -package_id $package_id -set 1 community_type_level_p
-            ad_parameter -package_id $package_id -set 0 community_level_p
+            dotlrn::parameter -package_id $package_id -set 0 dotlrn_level_p
+            dotlrn::parameter -package_id $package_id -set 1 community_type_level_p
+            dotlrn::parameter -package_id $package_id -set 0 community_level_p
 
             # Set the site node
             dotlrn_community::set_type_package_id $community_type_key $package_id
@@ -312,9 +312,9 @@
                 ]
 
                 # Set the right parameters
-                ad_parameter -package_id $package_id -set 0 dotlrn_level_p
-                ad_parameter -package_id $package_id -set 0 community_type_level_p
-                ad_parameter -package_id $package_id -set 1 community_level_p
+                dotlrn::parameter -package_id $package_id -set 0 dotlrn_level_p
+                dotlrn::parameter -package_id $package_id -set 0 community_type_level_p
+                dotlrn::parameter -package_id $package_id -set 1 community_level_p
 
                 # Set up the node
                 dotlrn_community::set_package_id $community_id $package_id
@@ -1500,9 +1500,9 @@
             ]
             
             # Set the right parameters
-            ad_parameter -package_id $package_id -set 0 dotlrn_level_p
-            ad_parameter -package_id $package_id -set 0 community_type_level_p
-            ad_parameter -package_id $package_id -set 1 community_level_p
+            dotlrn::parameter -package_id $package_id -set 0 dotlrn_level_p
+            dotlrn::parameter -package_id $package_id -set 0 community_type_level_p
+            dotlrn::parameter -package_id $package_id -set 1 community_level_p
             
             # Set up the node
             dotlrn_community::set_package_id $clone_id $package_id
@@ -1707,7 +1707,7 @@
         if {![empty_string_p $reorder_hack_p]} {
             ns_log notice "aks1: applets_dispatch: reorder hack!"
 
-            set reorder_applets_string [ad_parameter user_wsp_applet_ordering "dotlrn" "dotlrn_news,dotlrn_bboard,dotlrn_survey,dotlrn_faq"]
+            set reorder_applets_string [dotlrn::parameter user_wsp_applet_ordering -default "dotlrn_news,dotlrn_bboard,dotlrn_survey,dotlrn_faq"]
 
             set reorder_applets_list [string trim [split $reorder_applets_string {,}]]
 
Index: openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl	12 May 2002 18:17:56 -0000	1.22
+++ openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl	18 May 2002 22:42:11 -0000	1.23
@@ -35,7 +35,7 @@
 
     ad_proc -public get_pretty_name {
     } {
-        return [ad_parameter dotlrn_main_portlet_pretty_name]
+        return [dotlrn::parameter dotlrn_main_portlet_pretty_name]
     }
 
     ad_proc -public link {
@@ -51,7 +51,7 @@
         # we use "portal::add_element" here since there is no
         # configuration necessary for this portlet (no params)
         return [portal::add_element \
-            -force_region [ad_parameter "dotlrn_main_portlet_region" dotlrn] \
+            -force_region [dotlrn::parameter dotlrn_main_portlet_region] \
             -pretty_name [get_pretty_name] \
             -portal_id $portal_id \
             -portlet_name [get_my_name] \
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.53 -r1.54
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	16 May 2002 13:29:15 -0000	1.53
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	18 May 2002 22:42:11 -0000	1.54
@@ -50,7 +50,7 @@
     } {
 	Returns the group_type key that is being used for class management
     } {
-	return [parameter "group_type_key"]
+	return [parameter group_type_key]
     }
 
     ad_proc -public package_key {} {
@@ -369,15 +369,16 @@
 
     ad_proc -public parameter {
         -set
+        {-package_id ""}
         {-default ""}
         name
     } {
         wrap ad_parameter
     } {
         if {[info exists set]} {
-            return [ad_parameter -set -package_id [get_package_id] -default $default $name]
+            return [parameter::set_value -package_id $package_id -parameter $name -value $set]
         } else {
-            return [ad_parameter -package_id [get_package_id] $name]
+            return [parameter::get -package_id $package_id -parameter $name -default $default]
         }
     }
 
Index: openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl	29 Mar 2002 19:14:45 -0000	1.3
+++ openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl	18 May 2002 22:42:11 -0000	1.4
@@ -37,7 +37,7 @@
     ad_proc -public automatic_email_patterns {} {
         Returns a list of email patterns for which a user is automatically made into a dotLRN user
     } {
-        set param [ad_parameter -package_id [dotlrn::get_package_id] auto_dotlrn_user_email_patterns]
+        set param [dotlrn::parameter -package_id [dotlrn::get_package_id] auto_dotlrn_user_email_patterns]
 
         return [split $param ","]
     }
Index: openacs-4/packages/dotlrn/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	29 Mar 2002 19:14:45 -0000	1.7
+++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	18 May 2002 22:42:11 -0000	1.8
@@ -78,9 +78,9 @@
 	lappend first_args [list [root_url] dotLRN]
 
         if {[string equal ${community_type} "dotlrn_class_instance"] != 0} {
-            lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [ad_parameter classes_pretty_plural]]
+            lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn::parameter classes_pretty_plural]]
         } elseif {[string equal ${community_type} "dotlrn_club"] != 0} {
-            lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [ad_parameter clubs_pretty_plural]]
+            lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn::parameter clubs_pretty_plural]]
         } elseif {[string equal ${community_type} "dotlrn_community"] != 0} {
         } else {
             lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn_community::get_community_type_name $community_type]]
Index: openacs-4/packages/dotlrn/www/applets-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets-chunk.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/applets-chunk.adp	29 Mar 2002 19:14:46 -0000	1.3
+++ openacs-4/packages/dotlrn/www/applets-chunk.adp	18 May 2002 22:42:11 -0000	1.4
@@ -34,11 +34,10 @@
 <ul>
 <multiple name="all_applets">
   <li>
-    @all_applets.applet_pretty_name@ - [
-      <small>
-        <a href=applet-add?applet_key=@all_applets.applet_key@>add</a>
-      </small>
-    ]
+    @all_applets.applet_pretty_name@
+    [<small>
+      <a href=applet-add?applet_key=@all_applets.applet_key@>Add</a>
+    </small>]
   </li>
 </multiple>
 </ul>
Index: openacs-4/packages/dotlrn/www/community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-type.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/community-type.tcl	29 Mar 2002 19:14:46 -0000	1.6
+++ openacs-4/packages/dotlrn/www/community-type.tcl	18 May 2002 22:42:11 -0000	1.7
@@ -24,7 +24,7 @@
 }
 
 # Check that this is a community type
-if {[ad_parameter community_type_level_p] != 1} {
+if {[dotlrn::parameter community_type_level_p] != 1} {
     ad_returnredirect "./"
     ad_script_abort
 }
Index: openacs-4/packages/dotlrn/www/community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/community.tcl	6 May 2002 23:55:02 -0000	1.7
+++ openacs-4/packages/dotlrn/www/community.tcl	18 May 2002 22:42:11 -0000	1.8
@@ -23,7 +23,7 @@
 }
 
 # Check that this is a community type
-if {[ad_parameter community_level_p] != 1} {
+if {[dotlrn::parameter community_level_p] != 1} {
     ns_returnredirect "./"
     return
 }
Index: openacs-4/packages/dotlrn/www/configure-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/configure-2.tcl	8 May 2002 14:35:07 -0000	1.7
+++ openacs-4/packages/dotlrn/www/configure-2.tcl	18 May 2002 22:42:11 -0000	1.8
@@ -29,7 +29,7 @@
 set anchor [ns_set get $form anchor]
 
 # Check if this is a community type level thing
-if {[ad_parameter community_type_level_p] == 1} {
+if {[dotlrn::parameter community_type_level_p] == 1} {
     ad_returnredirect "one-community-type"
     return
 }
Index: openacs-4/packages/dotlrn/www/configure-element-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/configure-element-2.tcl	6 May 2002 23:55:02 -0000	1.5
+++ openacs-4/packages/dotlrn/www/configure-element-2.tcl	18 May 2002 22:42:11 -0000	1.6
@@ -27,7 +27,7 @@
 }
 
 # Check if this is a community type level thing
-if {[ad_parameter community_type_level_p] == 1} {
+if {[dotlrn::parameter community_type_level_p] == 1} {
     ad_returnredirect "one-community-type"
     return
 }
Index: openacs-4/packages/dotlrn/www/configure-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/configure-element.tcl	6 May 2002 23:55:02 -0000	1.8
+++ openacs-4/packages/dotlrn/www/configure-element.tcl	18 May 2002 22:42:11 -0000	1.9
@@ -26,15 +26,15 @@
 }
 
 # Check if this is a community type level thing
-if {[ad_parameter community_type_level_p] == 1} {
+if {[dotlrn::parameter community_type_level_p] == 1} {
     ad_returnredirect "one-community-type"
     return
 }
 
 # Make sure user is logged in
 set user_id [ad_maybe_redirect_for_registration]
 
-if {[ad_parameter community_level_p] == 1} {
+if {[dotlrn::parameter community_level_p] == 1} {
     # This is a community
     # What community type are we at?
     set community_id [dotlrn_community::get_community_id]
Index: openacs-4/packages/dotlrn/www/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/configure.tcl	12 May 2002 21:24:01 -0000	1.9
+++ openacs-4/packages/dotlrn/www/configure.tcl	18 May 2002 22:42:11 -0000	1.10
@@ -26,15 +26,15 @@
 }
 
 # Check if this is a community type level thing
-if {[ad_parameter community_type_level_p] == 1} {
+if {[dotlrn::parameter community_type_level_p] == 1} {
     ad_returnredirect "one-community-type"
     return
 }
 
 # Make sure user is logged in
 set user_id [ad_maybe_redirect_for_registration]
 
-if {[ad_parameter community_level_p] == 1} {
+if {[dotlrn::parameter community_level_p] == 1} {
     # This is a community
     # What community type are we at?
     set community_id [dotlrn_community::get_community_id]
Index: openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-default-master.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl	7 May 2002 15:48:44 -0000	1.6
+++ openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl	18 May 2002 22:42:11 -0000	1.7
@@ -135,7 +135,7 @@
         set navbar "<br>"
         set portal_id ""
     }
-} elseif {[ad_parameter -package_id [ad_conn package_id] community_type_level_p] == 1} {
+} elseif {[dotlrn::parameter -package_id [ad_conn package_id] community_type_level_p] == 1} {
     set extra_td_html ""
     set link_all 1
     set link [dotlrn::get_url]
@@ -214,7 +214,7 @@
 }
 
 # in a community or just under one in a mounted package like /calendar 
-if {[ad_parameter community_level_p] == 1 || $parent_comm_p } {
+if {[dotlrn::parameter community_level_p] == 1 || $parent_comm_p } {
     set community_id [dotlrn_community::get_community_id]
     
     # color hack
@@ -236,7 +236,7 @@
     # The header text is the name of the community
     set text [dotlrn_community::get_community_header_name $community_id] 
 
-} elseif {[ad_parameter community_type_level_p] == 1} {
+} elseif {[dotlrn::parameter community_type_level_p] == 1} {
     # in a community type
     set text \
             [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]]
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	7 Apr 2002 06:09:35 -0000	1.24
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	18 May 2002 22:42:11 -0000	1.25
@@ -51,10 +51,10 @@
 <% set old_level [expr $new_level - 1] %>
       </if>
       <if @new_simple_community_type@ eq "dotlrn_class_instance">
-        <li><%= [ad_parameter "class_instances_pretty_plural"] %>:
+        <li><%= [dotlrn::parameter class_instances_pretty_plural] %>:
       </if>
       <else>
-        <li><%= [ad_parameter "clubs_pretty_plural"] %>:
+        <li><%= [dotlrn::parameter clubs_pretty_plural] %>:
       </else>
     </if>
 
@@ -65,7 +65,9 @@
       <li>
         <a href="@communities.url@">@communities.pretty_name@</a>
         <if @communities.admin_p@ eq t> 
-          <small>[<a href="@communities.url@one-community-admin">admin</a>]</small>
+          [<small>
+            <a href="@communities.url@one-community-admin">Administer</a>
+          </small>]
         </if>
       </li>
 
Index: openacs-4/packages/dotlrn/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/folder-chunk.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/folder-chunk.adp	4 Apr 2002 03:01:45 -0000	1.4
+++ openacs-4/packages/dotlrn/www/folder-chunk.adp	18 May 2002 22:42:11 -0000	1.5
@@ -51,7 +51,10 @@
 <if @contents.new_p@>(&nbsp;new&nbsp;)</if>
       </td>
       <td>
-        [&nbsp;<small><if @contents.write_p@ or @contents.admin_p@><a href="simple-edit?object_id=@contents.object_id@">edit</a></if><if @contents.delete_p@ or @contents.admin_p@>&nbsp;|&nbsp;<a href="simple-delete?folder_id=@folder_id@&object_id=@contents.object_id@">delete</a></if></small>&nbsp;]
+        [<small>
+          <if @contents.write_p@ or @contents.admin_p@><a href="simple-edit?object_id=@contents.object_id@">Edit</a></if>
+          <if @contents.delete_p@ or @contents.admin_p@>&nbsp;|&nbsp;<a href="simple-delete?folder_id=@folder_id@&object_id=@contents.object_id@">Delete</a></if>
+        </small>]
       </td>
       <td>&nbsp;</td>
       <td>@contents.type@</td>
@@ -64,7 +67,10 @@
 <if @contents.new_p@>(&nbsp;new&nbsp;)</if>
       </td>
       <td>
-        [&nbsp;<small><a href="download/index?version_id=@contents.live_revision@">download</a><if @contents.delete_p@ or @contents.admin_p@>&nbsp;|&nbsp;<a href="file-delete?file_id=@contents.object_id@">delete</a></if></small>&nbsp;]
+        [<small>
+          <a href="download/index?version_id=@contents.live_revision@">Download</a>
+          <if @contents.delete_p@ or @contents.admin_p@>&nbsp;|&nbsp;<a href="file-delete?file_id=@contents.object_id@">Delete</a></if>
+        </small>]
       </td>
       <td>@contents.content_size@ byte<if @contents.content_size@ ne 1>s</if></td>
       <td>@contents.type@</td>
Index: openacs-4/packages/dotlrn/www/index-not-a-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/index-not-a-user.tcl	8 May 2002 14:35:07 -0000	1.7
+++ openacs-4/packages/dotlrn/www/index-not-a-user.tcl	18 May 2002 22:42:11 -0000	1.8
@@ -28,6 +28,6 @@
 
 set admin_p [dotlrn::admin_p]
 set admin_url [dotlrn::get_url]/admin
-set admin_pretty_name [ad_parameter "dotlrn_admin_pretty_name"]
+set admin_pretty_name [dotlrn::parameter dotlrn_admin_pretty_name]
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/dotlrn/www/index.tcl	28 Apr 2002 04:08:42 -0000	1.31
+++ openacs-4/packages/dotlrn/www/index.tcl	18 May 2002 22:42:11 -0000	1.32
@@ -27,13 +27,13 @@
 }
 
 # Check if this is a community type level thing
-if {[ad_parameter community_type_level_p] == 1} {
+if {[dotlrn::parameter community_type_level_p] == 1} {
     ad_returnredirect "one-community-type"
     ad_script_abort
 }
 
 # Check if this is a community level thing
-if {[ad_parameter community_level_p] == 1} {
+if {[dotlrn::parameter community_level_p] == 1} {
     ad_returnredirect "one-community?page_num=$page_num"
     ad_script_abort
 }
Index: openacs-4/packages/dotlrn/www/manage-memberships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	16 May 2002 16:35:38 -0000	1.10
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	18 May 2002 22:42:11 -0000	1.11
@@ -28,7 +28,10 @@
   <small>
     <a href="#current_clubs">Current <%= [dotlrn::parameter clubs_pretty_plural] %></a>
     |
-    <a href="#join">Join a Group</a>
+    <a href="#join_class">Join a <%= [dotlrn::parameter class_instances_pretty_name] %></a>
+    |
+    <a href="#join_club">Join a <%= [dotlrn::parameter clubs_pretty_name] %></a>
+  </small>
 </p>
 
 <if @n_member_classes@ gt 0 or @member_clubs:rowcount@ gt 0>
Index: openacs-4/packages/dotlrn/www/members-chunk-table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/members-chunk-table.adp	4 May 2002 12:21:58 -0000	1.2
+++ openacs-4/packages/dotlrn/www/members-chunk-table.adp	18 May 2002 22:42:11 -0000	1.3
@@ -57,9 +57,11 @@
     &nbsp;
     <i>@pending_users.role@</i>
     &nbsp;
-    [<small><include src="approve-link" url="approve?user_id=@pending_users.user_id@&referer=@referer@"></small>
-    &nbsp;|&nbsp;
-    <small><include src="reject-link" url="reject?user_id=@pending_users.user_id@&referer=@referer@"></small>]
+    [<small>
+      <include src="approve-link" url="approve?user_id=@pending_users.user_id@&referer=@referer@">
+      |
+      <include src="reject-link" url="reject?user_id=@pending_users.user_id@&referer=@referer@">
+    </small>]
   </li>
 </multiple>
 </ul>
Index: openacs-4/packages/dotlrn/www/members-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/members-chunk.adp	15 Apr 2002 19:52:52 -0000	1.13
+++ openacs-4/packages/dotlrn/www/members-chunk.adp	18 May 2002 22:42:11 -0000	1.14
@@ -31,7 +31,9 @@
     <i>@users.role@</i>
     <if @admin_p@ eq 1 or @user_id@ eq @users.user_id@>
       &nbsp;
-      <small>[<include src="deregister-link" url="deregister?user_id=@users.user_id@&referer=@referer@" label="Drop Membership">]</small>
+      [<small>
+        <include src="deregister-link" url="deregister?user_id=@users.user_id@&referer=@referer@" label="Drop Membership">
+      </small>]
     </if>
   </li>
 </group>
@@ -74,9 +76,11 @@
     &nbsp;
     <i>@pending_users.role@</i>
     &nbsp;
-    [<small><include src="approve-link" url="approve?user_id=@pending_users.user_id@&referer=@referer@"></small>
-    &nbsp;|&nbsp;
-    <small><include src="reject-link" url="reject?user_id=@pending_users.user_id@&referer=@referer@"></small>]
+    [<small>
+      <include src="approve-link" url="approve?user_id=@pending_users.user_id@&referer=@referer@">
+      |
+      <include src="reject-link" url="reject?user_id=@pending_users.user_id@&referer=@referer@">
+    </small>]
   </li>
 </multiple>
 </ul>
Index: openacs-4/packages/dotlrn/www/my-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/my-communities.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/my-communities.adp	5 Apr 2002 21:52:34 -0000	1.9
+++ openacs-4/packages/dotlrn/www/my-communities.adp	18 May 2002 22:42:11 -0000	1.10
@@ -20,20 +20,30 @@
 
 <h3><if @title@ nil>My Communities</if><else>@title@</else></h3>
 
-<ul>
+<table>
 <multiple name="communities">
-  <li>
-    <a href="@communities.url@">@communities.pretty_name@</a>
-    - @communities.role@
+  <tr>
+    <td><a href="@communities.url@">@communities.pretty_name@</a></td>
+    <td>@communities.role@</td>
+    <td>
+      [<small>
 <if @communities.admin_p@ eq 1>
-    - [ <a href="@communities.url@one-community-admin">admin</a> ]
-    - [ <a href="@communities.url@spam?community_id=@communities.community_id@&referer=@referer@">Email Members</a> ]
+        <a href="@communities.url@one-community-admin">Administer</a>
+        |
+        <a href="@communities.url@spam?community_id=@communities.community_id@&referer=@referer@">Email Members</a>
+        |
 </if>
-    - [<include src="deregister-link" url="deregister?community_id=@communities.community_id@&referer=@referer@">]
-  </li>
+        <include src="deregister-link" url="deregister?community_id=@communities.community_id@&referer=@referer@">
+      </small>]
+    </td>
+  </tr>
 </multiple>
 <if @user_can_browse_p@ eq 1>
-  <br>
-  <li><a href="manage-memberships">Join A Group</a></li>
+  <tr>
+    <td colspan="3">&nbsp;</td>
+  </tr>
+  <tr>
+    <td colspan="3"><a href="manage-memberships">Join A Group</a></td>
+  </tr>
 </if>
-</ul>
+</table>
Index: openacs-4/packages/dotlrn/www/one-community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/one-community-type.tcl	29 Mar 2002 19:14:46 -0000	1.17
+++ openacs-4/packages/dotlrn/www/one-community-type.tcl	18 May 2002 22:42:11 -0000	1.18
@@ -35,7 +35,7 @@
 }
 
 # Check that this is a community type
-if {[ad_parameter community_type_level_p] != 1} {
+if {[dotlrn::parameter community_type_level_p] != 1} {
     ad_returnredirect "./"
     ad_script_abort
 }
@@ -51,17 +51,17 @@
 # Load some community type info
 db_1row select_community_type_info {}
 
-if {[string equal ${community_type} "dotlrn_class_instance"] != 0} {
-    set community_type_title [ad_parameter "classes_pretty_plural"]
-    set communities_title [ad_parameter "class_instances_pretty_name"]
-    set title [ad_parameter "classes_pretty_plural"]
-} elseif {[string equal ${community_type} "dotlrn_club"] != 0} {
-    set community_type_title [ad_parameter "clubs_pretty_plural"]
-    set communities_title [ad_parameter "clubs_pretty_plural"]
-    set title [ad_parameter "clubs_pretty_plural"]
-} elseif {[string equal ${ancestor_type} "dotlrn_class_instance"] != 0} {
-    set community_type_title [ad_parameter "classes_pretty_plural"]
-    set communities_title [ad_parameter "class_instances_pretty_name"]
+if {[string equal ${community_type} dotlrn_class_instance] != 0} {
+    set community_type_title [dotlrn::parameter classes_pretty_plural]
+    set communities_title [dotlrn::parameter class_instances_pretty_name]
+    set title [dotlrn::parameter classes_pretty_plural]
+} elseif {[string equal ${community_type} dotlrn_club] != 0} {
+    set community_type_title [dotlrn::parameter clubs_pretty_plural]
+    set communities_title [dotlrn::parameter clubs_pretty_plural]
+    set title [dotlrn::parameter clubs_pretty_plural]
+} elseif {[string equal ${ancestor_type} dotlrn_class_instance] != 0} {
+    set community_type_title [dotlrn::parameter classes_pretty_plural]
+    set communities_title [dotlrn::parameter class_instances_pretty_name]
     set title $pretty_name
 } else {
     set community_type_title "Community Types"
Index: openacs-4/packages/dotlrn/www/one-community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/dotlrn/www/one-community.tcl	6 May 2002 23:55:02 -0000	1.25
+++ openacs-4/packages/dotlrn/www/one-community.tcl	18 May 2002 22:42:11 -0000	1.26
@@ -26,7 +26,7 @@
 }
 
 # Check that this is a community type
-if {[ad_parameter community_level_p] != 1} {
+if {[dotlrn::parameter community_level_p] != 1} {
     ns_returnredirect "./"
     ad_script_abort
 }
Index: openacs-4/packages/dotlrn/www/preferences.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/preferences.tcl	8 May 2002 14:35:07 -0000	1.11
+++ openacs-4/packages/dotlrn/www/preferences.tcl	18 May 2002 22:42:11 -0000	1.12
@@ -40,6 +40,6 @@
 set admin_p [dotlrn::admin_p]
 set admin_url "[dotlrn::get_url]/admin"
 set referer [ns_conn url]
-set admin_pretty_name [ad_parameter "dotlrn_admin_pretty_name"]
+set admin_pretty_name [dotlrn::parameter dotlrn_admin_pretty_name]
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/subcommunity-archive.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/subcommunity-archive.tcl	14 May 2002 19:27:54 -0000	1.1
+++ openacs-4/packages/dotlrn/www/subcommunity-archive.tcl	18 May 2002 22:42:11 -0000	1.2
@@ -29,7 +29,7 @@
 set user_id [ad_get_user_id]
 dotlrn::require_user_admin_community $community_id
 set pretty_name [dotlrn_community::get_community_name $community_id]
-set subcomm_pn [ad_parameter subcommunity_pretty_name]
+set subcomm_pn [dotlrn::parameter subcommunity_pretty_name]
 set title "Archive $subcomm_pn"
 
 form create archive_subcomm
Index: openacs-4/packages/dotlrn/www/subcommunity-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/subcommunity-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/subcommunity-edit.tcl	6 May 2002 23:55:02 -0000	1.2
+++ openacs-4/packages/dotlrn/www/subcommunity-edit.tcl	18 May 2002 22:42:11 -0000	1.3
@@ -29,7 +29,7 @@
 set user_id [ad_get_user_id]
 set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
 
-set title "Edit [ad_parameter subcommunity_pretty_name]"
+set title "Edit [dotlrn::parameter subcommunity_pretty_name]"
 set old_pn [dotlrn_community::get_community_name $community_id]
 
 dotlrn::require_user_admin_community $community_id
Index: openacs-4/packages/dotlrn/www/subcommunity-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-new.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/subcommunity-new.tcl	12 May 2002 18:20:57 -0000	1.13
+++ openacs-4/packages/dotlrn/www/subcommunity-new.tcl	18 May 2002 22:42:11 -0000	1.14
@@ -28,7 +28,7 @@
 
 set user_id [ad_get_user_id]
 set parent_community_id [dotlrn_community::get_community_id]
-set title "New [ad_parameter subcommunity_pretty_name]"
+set title "New [dotlrn::parameter subcommunity_pretty_name]"
 set portal_id [dotlrn_community::get_portal_id -community_id $parent_community_id]
 
 form create add_subcomm
Index: openacs-4/packages/dotlrn/www/admin/class-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/class-edit.tcl	16 May 2002 13:29:15 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/class-edit.tcl	18 May 2002 22:42:11 -0000	1.4
@@ -33,8 +33,8 @@
     ad_script_abort
 }
 
-set title "Edit [ad_parameter classes_pretty_name] $pretty_name"
-set context_bar [list [list classes [ad_parameter classes_pretty_plural]] Edit]
+set title "Edit [dotlrn::parameter classes_pretty_name] $pretty_name"
+set context_bar [list [list classes [dotlrn::parameter classes_pretty_plural]] Edit]
 
 form create edit_class
 
Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/admin/class.adp	16 May 2002 13:29:15 -0000	1.17
+++ openacs-4/packages/dotlrn/www/admin/class.adp	18 May 2002 22:42:11 -0000	1.18
@@ -46,7 +46,9 @@
 
 <p>
 <if @can_instantiate@>
-  [<small><a href="class-instance-new?class_key=@class_key@">New <%= [dotlrn::parameter class_instances_pretty_name] %></a></small>]
+  [<small>
+    <a href="class-instance-new?class_key=@class_key@">New <%= [dotlrn::parameter class_instances_pretty_name] %></a>
+  </small>]
 </if>
 <else>
 <include src="need-term-note">
@@ -78,7 +80,7 @@
   <tr>
     <td><a href="term?term_id=@class_instances.term_id@">@class_instances.term_name@&nbsp;@class_instances.term_year@</a></td>
     <td><a href="@class_instances.url@">@class_instances.pretty_name@</a></td>
-    <td>[<small><a href="@class_instances.url@one-community-admin">admin</a></small>]</td>
+    <td>[<small> <a href="@class_instances.url@one-community-admin">Administer</a> </small>]</td>
   </tr>
 </multiple>
 </table>
Index: openacs-4/packages/dotlrn/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/class.tcl	16 May 2002 13:29:15 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/class.tcl	18 May 2002 22:42:11 -0000	1.11
@@ -75,7 +75,7 @@
 
 db_multirow class_instances $query {}
 
-set can_instantiate [dotlrn_class::can_instantiate -class_key $class_key]
+set can_instantiate [dotlrn_class::can_instantiate]
 
 set context_bar [list [list classes [dotlrn::parameter classes_pretty_plural]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	16 May 2002 13:29:15 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	18 May 2002 22:42:11 -0000	1.10
@@ -19,7 +19,9 @@
 %>
 
 <if @can_create@>
-[<small><a href="class-new?department_key=@department_key@&referer=@referer@">New <%= [ad_parameter classes_pretty_name] %></a></small>]
+[<small>
+  <a href="class-new?department_key=@department_key@&referer=@referer@">New <%= [dotlrn::parameter classes_pretty_name] %></a>
+</small>]
 </if>
 
 <p></p>
@@ -41,17 +43,28 @@
   <tr>
     <th align="left" width="30%"><%= [dotlrn::parameter departments_pretty_name] %></th>
     <th align="left"><%= [dotlrn::parameter classes_pretty_name] %> Name</th>
+    <th align="left">Number of <%= [dotlrn::parameter class_instances_pretty_plural] %></th>
+    <th align="left">Actions</th>
   </tr>
 <multiple name="classes">
   <tr>
     <td><a href="department?department_key=@classes.department_key@">@classes.department_name@</a></td>
     <td><a href="class?class_key=@classes.class_key@">@classes.pretty_name@</a></td>
+    <td>@classes.n_instances@</td>
+    <td>
+<if @can_instantiate@>
+      [<small>
+        <a href="class-instance-new?class_key=@classes.class_key@">New <%= [dotlrn::parameter class_instances_pretty_name] %></a>
+      </small>]
+</if>
+    </td>
   </tr>
 </multiple>
 </table>
 </if>
 
 <if @can_create@ and @classes:rowcount@ gt 10>
-[<small><a
-href="class-new?department_key=@department_key@&referer=@referer@">New <%= [dotlrn::parameter classes_pretty_name] %></a></small>]
+[<small>
+  <a href="class-new?department_key=@department_key@&referer=@referer@">New <%= [dotlrn::parameter classes_pretty_name] %></a>
+</small>]
 </if>
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	16 May 2002 13:29:15 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	18 May 2002 22:42:11 -0000	1.6
@@ -65,5 +65,6 @@
 db_multirow classes $query {}
 
 set can_create [dotlrn_class::can_create]
+set can_instantiate [dotlrn_class::can_instantiate]
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.xql	1 May 2002 01:19:47 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.xql	18 May 2002 22:42:11 -0000	1.6
@@ -8,7 +8,10 @@
                    dotlrn_classes_full.pretty_name,
                    dotlrn_classes_full.description,
                    dotlrn_classes_full.department_key,
-                   dotlrn_departments_full.pretty_name as department_name
+                   dotlrn_departments_full.pretty_name as department_name,
+                   (select count(*)
+                    from dotlrn_class_instances
+                    where dotlrn_class_instances.class_key = dotlrn_classes_full.class_key) as n_instances
             from dotlrn_classes_full,
                  dotlrn_departments_full
             where dotlrn_classes_full.department_key = dotlrn_departments_full.department_key
@@ -24,7 +27,10 @@
                    dotlrn_classes_full.pretty_name,
                    dotlrn_classes_full.description,
                    dotlrn_classes_full.department_key,
-                   dotlrn_departments_full.pretty_name as department_name
+                   dotlrn_departments_full.pretty_name as department_name,
+                   (select count(*)
+                    from dotlrn_class_instances
+                    where dotlrn_class_instances.class_key = dotlrn_classes_full.class_key) as n_instances
             from dotlrn_classes_full,
                  dotlrn_departments_full
             where dotlrn_classes_full.department_key = :department_key
Index: openacs-4/packages/dotlrn/www/admin/club-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/club-new.tcl	29 Mar 2002 19:14:47 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/club-new.tcl	18 May 2002 22:42:11 -0000	1.12
@@ -27,9 +27,6 @@
     context_bar:onevalue
 }
 
-set title "New [ad_parameter clubs_pretty_name]"
-set context_bar [list [list clubs [ad_parameter clubs_pretty_plural]] New]
-
 form create add_club
 
 element create add_club pretty_name \
@@ -70,4 +67,7 @@
     ad_script_abort
 }
 
+set title "New [dotlrn::parameter clubs_pretty_name]"
+set context_bar [list [list clubs [dotlrn::parameter clubs_pretty_plural]] [list New [dotlrn::parameter clubs_pretty_name]]]
+
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/club.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/club.tcl	29 Mar 2002 19:14:47 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/club.tcl	18 May 2002 22:42:11 -0000	1.10
@@ -34,6 +34,6 @@
 
 db_1row select_club {}
 
-set context_bar [list [list clubs [ad_parameter clubs_pretty_plural]] $pretty_name]
+set context_bar [list [list clubs [dotlrn::parameter clubs_pretty_plural]] $pretty_name]
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/clubs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/clubs.adp	29 Mar 2002 19:14:47 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/clubs.adp	18 May 2002 22:42:11 -0000	1.14
@@ -22,27 +22,27 @@
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
-[<small><a href="club-new">New <%= [ad_parameter clubs_pretty_name] %></a></small>]
+[<small> <a href="club-new">New <%= [dotlrn::parameter clubs_pretty_name] %></a> </small>]
 
 <p></p>
 
 <if @clubs:rowcount@ gt 0>
 <table width="100%">
   <tr>
-    <th align="left" width="15%"><%= [ad_parameter clubs_pretty_name] %> Name</th>
+    <th align="left" width="15%"><%= [dotlrn::parameter clubs_pretty_name] %> Name</th>
     <th align="left" width="50%">Description</th>
     <th align="left">Actions</th>
   </tr>
 <multiple name="clubs">
   <tr>
     <td><a href="@clubs.url@">@clubs.pretty_name@</a></td>
     <td>@clubs.description@</td>
-    <td>[<small><a href="@clubs.url@one-community-admin">admin</a></small>]</td>
+    <td>[<small> <a href="@clubs.url@one-community-admin">Administer</a> </small>]</td>
   </tr>
 </multiple>
 </table>
 </if>
 
 <if @clubs:rowcount@ gt 10>
-[<small><a href="club-new">New <%= [ad_parameter clubs_pretty_name] %></a></small>]
+[<small> <a href="club-new">New <%= [dotlrn::parameter clubs_pretty_name] %></a> </small>]
 </if>
Index: openacs-4/packages/dotlrn/www/admin/clubs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/clubs.tcl	29 Mar 2002 19:14:47 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/clubs.tcl	18 May 2002 22:42:11 -0000	1.8
@@ -29,8 +29,8 @@
     clubs:multirow
 }
 
-set title "[ad_parameter clubs_pretty_plural]"
-set context_bar [list [ad_parameter clubs_pretty_plural]]
+set title [dotlrn::parameter clubs_pretty_plural]
+set context_bar [list [dotlrn::parameter clubs_pretty_plural]]
 
 db_multirow clubs select_clubs {}
 
Index: openacs-4/packages/dotlrn/www/admin/department-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/department-edit.tcl	29 Mar 2002 19:14:47 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/department-edit.tcl	18 May 2002 22:42:11 -0000	1.3
@@ -33,13 +33,13 @@
     ad_script_abort
 }
 
-set title "Edit [ad_parameter departments_pretty_name] $pretty_name"
-set context_bar [list [list departments [ad_parameter departments_pretty_plural]] Edit]
+set title "Edit [dotlrn::parameter departments_pretty_name] $pretty_name"
+set context_bar [list [list departments [dotlrn::parameter departments_pretty_plural]] Edit]
 
 form create edit_department
 
 element create edit_department department_key \
-    -label "[ad_parameter departments_pretty_name] Key (a short name, no spaces)" \
+    -label "[dotlrn::parameter departments_pretty_name] Key (a short name, no spaces)" \
     -datatype text \
     -widget hidden \
     -value $department_key
Index: openacs-4/packages/dotlrn/www/admin/department-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-new.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/department-new.tcl	29 Mar 2002 19:14:47 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/department-new.tcl	18 May 2002 22:42:11 -0000	1.4
@@ -27,8 +27,8 @@
     context_bar:onevalue
 }
 
-set title "New [ad_parameter departments_pretty_name]"
-set context_bar [list [list departments [ad_parameter departments_pretty_plural]] New]
+set title "New [dotlrn::parameter departments_pretty_name]"
+set context_bar [list [list departments [dotlrn::parameter departments_pretty_plural]] New]
 
 form create add_department
 
Index: openacs-4/packages/dotlrn/www/admin/department.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/department.tcl	29 Mar 2002 19:14:47 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/department.tcl	18 May 2002 22:42:11 -0000	1.7
@@ -41,7 +41,7 @@
     ad_script_abort
 }
 
-set context_bar [list [list departments [ad_parameter departments_pretty_plural]] $pretty_name]
+set context_bar [list [list departments [dotlrn::parameter departments_pretty_plural]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/departments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/departments.adp	29 Mar 2002 19:14:47 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	18 May 2002 22:42:11 -0000	1.10
@@ -22,14 +22,16 @@
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
-[<small><a href="department-new?referer=departments">New <%= [ad_parameter departments_pretty_name] %></a></small>]
+[<small>
+  <a href="department-new?referer=departments">New <%= [dotlrn::parameter departments_pretty_name] %></a>
+</small>]
 
 <p></p>
 
 <if @departments:rowcount@ gt 0>
 <table width="100%">
   <tr>
-    <th align="left"><%= [ad_parameter departments_pretty_name] %> Name</th>
+    <th align="left"><%= [dotlrn::parameter departments_pretty_name] %> Name</th>
   </tr>
 <multiple name="departments">
   <tr>
@@ -40,5 +42,7 @@
 </if>
 
 <if @departments:rowcount@ gt 10>
-[<small><a href="department-new?referer=departments">New <%= [ad_parameter departments_pretty_name] %></a></small>]
+[<small>
+  <a href="department-new?referer=departments">New <%= [dotlrn::parameter departments_pretty_name] %></a>
+</small>]
 </if>
Index: openacs-4/packages/dotlrn/www/admin/departments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/departments.tcl	29 Mar 2002 19:14:47 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/departments.tcl	18 May 2002 22:42:11 -0000	1.4
@@ -27,8 +27,8 @@
     departments:multirow
 }
 
-set title "[ad_parameter departments_pretty_plural]"
-set context_bar "[ad_parameter departments_pretty_plural]"
+set title [dotlrn::parameter departments_pretty_plural]
+set context_bar [dotlrn::parameter departments_pretty_plural]
 
 db_multirow departments select_departments {}
 
Index: openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.tcl	29 Mar 2002 19:14:47 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.tcl	18 May 2002 22:42:11 -0000	1.5
@@ -29,12 +29,12 @@
     -datatype text \
     -widget text \
     -html {size 50} \
-    -value [ad_parameter "auto_dotlrn_user_email_patterns"]
+    -value [dotlrn::parameter auto_dotlrn_user_email_patterns]
 
 if {[form is_valid edit_emails]} {
     form get_values edit_emails emails
 
-    ad_parameter -set $emails "auto_dotlrn_user_email_patterns"
+    dotlrn::parameter -set $emails auto_dotlrn_user_email_patterns
 
     ad_returnredirect $referer
     ad_script_abort
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.16 -r1.17
--- openacs-4/packages/dotlrn/www/admin/index.adp	8 May 2002 14:35:07 -0000	1.16
+++ openacs-4/packages/dotlrn/www/admin/index.adp	18 May 2002 22:42:11 -0000	1.17
@@ -31,10 +31,10 @@
 <ul>
   <li><a href="users">Users</a></li>
   <li><a href="terms">Terms</a></li>
-  <li><a href="departments"><%= [ad_parameter "departments_pretty_plural"] %></a></li>
-  <li><a href="classes"><%= [ad_parameter "classes_pretty_plural"] %></a></li>
-  <li><a href="term?term_id=-1"><%= [ad_parameter "class_instances_pretty_plural"] %></a></li>
-  <li><a href="clubs"><%= [ad_parameter "clubs_pretty_plural"] %></a></li>
+  <li><a href="departments"><%= [dotlrn::parameter departments_pretty_plural] %></a></li>
+  <li><a href="classes"><%= [dotlrn::parameter classes_pretty_plural] %></a></li>
+  <li><a href="term?term_id=-1"><%= [dotlrn::parameter class_instances_pretty_plural] %></a></li>
+  <li><a href="clubs"><%= [dotlrn::parameter clubs_pretty_plural] %></a></li>
   <li><a href="edit-preapproved-emails">Edit Pre-approved Email Servers</a></li>
   <li><a href="portal-templates">Portal Templates</a></li>
 </ul>
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.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/index.tcl	8 May 2002 14:35:07 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/index.tcl	18 May 2002 22:42:11 -0000	1.10
@@ -22,7 +22,7 @@
 } -query {
 }
 
-set admin_pretty_name [ad_parameter "dotlrn_admin_pretty_name" dotlrn]
+set admin_pretty_name [dotlrn::parameter dotlrn_admin_pretty_name]
 set context_bar {}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/need-term-note.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/need-term-note.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/need-term-note.adp	29 Mar 2002 19:14:47 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/need-term-note.adp	18 May 2002 22:42:11 -0000	1.4
@@ -20,6 +20,6 @@
 
 <i>
   <b>Note:</b> You must create <a href="terms">terms</a> to be able to create
-  <%= [ad_parameter "class_instances_pretty_plural"] %>, since these must be
+  <%= [dotlrn::parameter class_instances_pretty_plural] %>, since these must be
   associated with Terms.
 </i>
Index: openacs-4/packages/dotlrn/www/admin/portal-templates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/portal-templates.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/portal-templates.adp	18 Apr 2002 04:06:34 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/portal-templates.adp	18 May 2002 22:42:11 -0000	1.3
@@ -22,9 +22,21 @@
 <property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
-  <ul>
-    <multiple name=templates>
-      <li>@templates.name@ [<a href="@url@/portal-show.tcl?portal_id=@templates.portal_id@&referer=@referer@">view</a>|<a href="@url@/portal-config?portal_id=@templates.portal_id@&referer=@referer@">edit</a>]</li>
-    </multiple>
-  </ul>
-</else>
+<table width="50%" cellpadding="3" cellspacing="3">
+  <tr>
+    <th align="left">Template</th>
+    <th align="left">Actions</th>
+  </tr>
+<multiple name=templates>
+  <tr>
+    <td>
+      <a href="@url@/portal-show.tcl?portal_id=@templates.portal_id@&referer=@referer@">@templates.name@</a>
+    </td>
+    <td>
+      [<small>
+        <a href="@url@/portal-config?portal_id=@templates.portal_id@&referer=@referer@">Edit</a>
+      </small>]
+    </td>
+  </tr>
+</multiple>
+</table>
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/term.adp	29 Mar 2002 19:14:47 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/term.adp	18 May 2002 22:42:11 -0000	1.11
@@ -48,8 +48,7 @@
   <br>
 
   <li>
-    <a href="term-edit?term_id=@term_id@&referer=@referer@">Edit</a> term
-    properties.
+    <a href="term-edit?term_id=@term_id@&referer=@referer@">Edit</a> term properties.
   </li>
 
 </ul>
@@ -61,7 +60,7 @@
   <tr>
     <th align="left" width="50%">
 <formtemplate id="department_form">
-      <%= [ad_parameter departments_pretty_name] %>:&nbsp;<formwidget id="department_key">
+      <%= [dotlrn::parameter departments_pretty_name] %>:&nbsp;<formwidget id="department_key">
 </formtemplate>
     </th>
     <th align="left" width="50%">
@@ -77,12 +76,12 @@
 <if @classes:rowcount@ gt 0>
 <table width="100%">
   <tr>
-    <th align="left" width="25%"><%= [ad_parameter departments_pretty_name] %></th>
-    <th align="left" width="25%"><%= [ad_parameter classes_pretty_name] %></th>
+    <th align="left" width="25%"><%= [dotlrn::parameter departments_pretty_name] %></th>
+    <th align="left" width="25%"><%= [dotlrn::parameter classes_pretty_name] %></th>
 <if @term_id@ eq -1>
     <th align="left" width="10%">Term</th>
 </if>
-    <th align="left" width="25%"><%= [ad_parameter class_instances_pretty_name] %></th>
+    <th align="left" width="25%"><%= [dotlrn::parameter class_instances_pretty_name] %></th>
     <th align="left">Actions</th>
   </tr>
 <multiple name="classes">
@@ -93,7 +92,7 @@
     <td>@classes.term_name@ @classes.term_year@</td>
 </if>
     <td><a href="@classes.url@">@classes.pretty_name@</a></td>
-    <td>[<small><a href="@classes.url@one-community-admin">admin</a></small>]</td>
+    <td>[<small> <a href="@classes.url@one-community-admin">Administer</a> </small>]</td>
   </tr>
 </multiple>
 </table>
Index: openacs-4/packages/dotlrn/www/admin/terms.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/terms.adp	29 Mar 2002 19:14:47 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/terms.adp	18 May 2002 22:42:11 -0000	1.11
@@ -22,7 +22,7 @@
 <property name="title">Terms</property>
 <property name="context_bar">@context_bar@</property>
 
-[<small><a href="term-new">New Term</a></small>]
+[<small> <a href="term-new">New Term</a> </small>]
 
 <p></p>
 
@@ -46,5 +46,5 @@
 </if>
 
 <if @terms:rowcount@ gt 10>
-[<small><a href="term-new">New Term</a></small>]
+[<small> <a href="term-new">New Term</a> </small>]
 </if>
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/user.adp	8 May 2002 14:35:07 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/user.adp	18 May 2002 22:42:11 -0000	1.11
@@ -29,19 +29,19 @@
   <li>
     Name:
     @first_names@ @last_name@
-    [<small><a href="/user/basic-info-update?@export_edit_vars@">edit</a></small>]
+    [<small> <a href="/user/basic-info-update?@export_edit_vars@">Edit</a> </small>]
   </li>
 
   <li>
     Email:
     <a href="mailto:@email@">@email@</a>
-    [<small><a href="/user/basic-info-update?@export_edit_vars@">edit</a></small>]
+    [<small> <a href="/user/basic-info-update?@export_edit_vars@">Edit</a> </small>]
   </li>
 
   <li>
     Screen name:
     @screen_name@
-    [<small><a href="/user/basic-info-update?@export_edit_vars@">edit</a></small>]
+    [<small> <a href="/user/basic-info-update?@export_edit_vars@">Edit</a> </small>]
   </li>
 
   <li>
@@ -63,8 +63,7 @@
 
 <if @portrait_p@ eq 1>
   <li>
-    Portrait:
-    <a href="/shared/portrait?user_id=@user_id@">@portrait_title@</a>
+    Portrait: <a href="/shared/portrait?user_id=@user_id@">@portrait_title@</a>
   </li>
 </if>
 
@@ -105,15 +104,14 @@
   <br>
 
   <li>
-    <a href="user-edit?@export_edit_vars@">Edit</a> dotLRN properties for this
-    user.
+    <a href="user-edit?@export_edit_vars@">Edit</a> dotLRN properties for this user.
   </li>
 
 </ul>
 
 <if @member_classes:rowcount@ gt 0>
   <blockquote>
-    <h4><%= [ad_parameter "class_instances_pretty_name"] %> Memberships</h4>
+    <h4><%= [dotlrn::parameter class_instances_pretty_name] %> Memberships</h4>
 
     <ul>
 <multiple name="member_classes">
@@ -129,7 +127,7 @@
 
 <if @member_clubs:rowcount@ gt 0>
   <blockquote>
-    <h4><%= [ad_parameter "clubs_pretty_name"] %> Memberships</h4>
+    <h4><%= [dotlrn::parameter clubs_pretty_name] %> Memberships</h4>
 
     <ul>
 <multiple name="member_clubs">
@@ -144,7 +142,7 @@
 
 <if @member_subgroups:rowcount@ gt 0>
   <blockquote>
-    <h4><%= [ad_parameter "subcommunities_pretty_name"] %> Memberships</h4>
+    <h4><%= [dotlrn::parameter subcommunities_pretty_name] %> Memberships</h4>
 
     <ul>
 <multiple name="member_subgroups">
@@ -177,10 +175,10 @@
 
 <ul>
   <li><a href="/user/password-update?@export_edit_vars@">Update this user's password</a></li>
-  <if @portrait_p@>
-    <br>
-    <li><a href="/user/portrait/index.tcl?@export_edit_vars@">Manage this user's portrait</a></li>
-    <br>
-  </if>
+<if @portrait_p@>
+  <br>
+  <li><a href="/user/portrait/index.tcl?@export_edit_vars@">Manage this user's portrait</a></li>
+</if>
+  <br>
   <li><a href="/acs-admin/users/become?user_id=@user_id@">Become this user!</a></li>
 </ul>
Index: openacs-4/packages/dotlrn/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/dotlrn/www/admin/users.adp	11 Apr 2002 02:36:04 -0000	1.21
+++ openacs-4/packages/dotlrn/www/admin/users.adp	18 May 2002 22:42:11 -0000	1.22
@@ -22,13 +22,13 @@
 <property name="title">Users</property>
 <property name="context_bar">@context_bar@</property>
 
-[ 
+[<small>
   <a href="../user-add?add_membership_p=f&referer=/dotlrn/admin/users"><small>Create A New User</small></a> 
   |
   <a href="users-search"><small>Search Users</small></a>
   |
   <a href="users-bulk-upload"><small>Bulk Upload</small></a>
-]
+</small>]
 
 <p></p>