Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.64 -r1.65
--- openacs-4/packages/dotlrn/dotlrn.info	11 Mar 2002 21:24:54 -0000	1.64
+++ openacs-4/packages/dotlrn/dotlrn.info	13 Mar 2002 00:12:09 -0000	1.65
@@ -301,15 +301,17 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="community_type_level_p"  description="Whether this is a Class Level instance of the package"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="community_level_p"  description="Whether this is a Class Instance Level instantiation of the package"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="group_type_key"  default="dotlrn_community" description="Class Group Type"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="classes_pretty_name"  default="Class" description="used to display everywhere in the ui"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="classes_pretty_plural"  default="Classes" description="used everywhere in the ui"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_name"  default="Department" description="used everywhere in the ui"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_plural"  default="Departments" description="used everywhere in the ui"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="classes_pretty_name"  default="Subject" description="used to display everywhere in the ui"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="classes_pretty_plural"  default="Subjects" description="used everywhere in the ui"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="class_instances_pretty_name"  default="Class" description="used to display everywhere in the ui"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="class_instances_pretty_plural"  default="Classes" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="clubs_pretty_name"  default="Community" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="clubs_pretty_plural"  default="Communities" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="dotlrn_main_portlet_pretty_name"  default="Groups" description="The pretty name for the dotlrn main portlet (aka &quot;My Groups&quot;)"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="user_wsp_page_names"  default="MySpace,Simple 2-Column;Calendar,Simple 1-Column;My Files,Simple 1-Column" description="a csv list of the other pages to create on the user wsp by default"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="auto_dotlrn_user_email_patterns"  description="Automatic dotLRN user email patterns"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_name"  default="Department" description="used everywhere in the ui"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_plural"  default="Departments" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_class_instance_applets"  default="dotlrn_dotlrn,dotlrn_members_staff,dotlrn_bboard,dotlrn_calendar,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_survey" description="dotLRN applets to add by default to each new community"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_name"  default="Subgroup" description="what subcomms are called"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_plural"  default="Subgroups" description="the plural"/>
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-classes-create.sql,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql	7 Mar 2002 20:24:41 -0000	1.16
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql	13 Mar 2002 00:12:09 -0000	1.17
@@ -118,16 +118,19 @@
            dotlrn_classes_full.url as class_url,
            dotlrn_classes_full.department_key,
            dotlrn_departments_full.pretty_name as department_name,
-           dotlrn_departments_full.url as department_url
+           dotlrn_departments_full.url as department_url,
+           groups.join_policy
     from dotlrn_communities,
          dotlrn_class_instances,
          dotlrn_terms,
          dotlrn_classes_full,
-         dotlrn_departments_full
+         dotlrn_departments_full,
+         groups
     where dotlrn_communities.community_id = dotlrn_class_instances.class_instance_id
     and dotlrn_class_instances.term_id = dotlrn_terms.term_id
     and dotlrn_communities.community_type = dotlrn_classes_full.class_key
-    and dotlrn_classes_full.department_key = dotlrn_departments_full.department_key;
+    and dotlrn_classes_full.department_key = dotlrn_departments_full.department_key
+    and dotlrn_communities.community_id = groups.group_id;
 
 create or replace view dotlrn_class_instances_current
 as
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-clubs-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-clubs-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-clubs-create.sql	17 Dec 2001 23:02:55 -0000	1.4
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-clubs-create.sql	13 Mar 2002 00:12:09 -0000	1.5
@@ -31,10 +31,13 @@
            dotlrn_communities.portal_id,
            dotlrn_communities.portal_template_id,
            dotlrn_communities.package_id,
-           dotlrn_community.url(dotlrn_communities.community_id) as url
+           dotlrn_community.url(dotlrn_communities.community_id) as url,
+           groups.join_policy
     from dotlrn_communities,
-         dotlrn_clubs
-    where dotlrn_communities.community_id = dotlrn_clubs.club_id;
+         dotlrn_clubs,
+         groups
+    where dotlrn_communities.community_id = dotlrn_clubs.club_id
+    and dotlrn_communities.community_id = groups.group_id;
 
 create or replace package dotlrn_club
 is
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.1 -r1.2
--- openacs-4/packages/dotlrn/www/applets-chunk.adp	19 Jan 2002 22:54:20 -0000	1.1
+++ openacs-4/packages/dotlrn/www/applets-chunk.adp	13 Mar 2002 00:12:09 -0000	1.2
@@ -15,9 +15,9 @@
 <multiple name="all_applets">
   <li>
     @all_applets.applet_pretty_name@ - [
-      <font size="-1">
+      <small>
         <a href=applet-add?applet_key=@all_applets.applet_key@>add</a>
-      </font>
+      </small>
     ]
   </li>
 </multiple>
Index: openacs-4/packages/dotlrn/www/community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/community.adp	28 Jan 2002 21:57:52 -0000	1.6
+++ openacs-4/packages/dotlrn/www/community.adp	13 Mar 2002 00:12:09 -0000	1.7
@@ -4,15 +4,15 @@
 <property name="portal_id">@portal_id@</property>
 
 [
-  <font size="-1">
+  <small>
     <include src="deregister-link">
     |
     <a href="configure">customize</a>
 <if @admin_p@ eq 1>
     |
     <a href="one-community-admin">admin</a>
 </if>
-  </font>
+  </small>
 ]
 
 @rendered_page@
Index: openacs-4/packages/dotlrn/www/index-not-a-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/index-not-a-user.adp	11 Mar 2002 23:19:16 -0000	1.7
+++ openacs-4/packages/dotlrn/www/index-not-a-user.adp	13 Mar 2002 00:12:09 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
 <property name="title">dotLRN - Not a User</property>
 
-<if @admin_p@>Visit <a href=@admin_url@>dotLRN Administration</a>.<p>
+<if @admin_p@><p>Visit <a href=@admin_url@>dotLRN Administration</a>.</p><if>
 
-You are not registered as a dotLRN user.<br>
-You're going to have to wait to see what the admin does.
+Thank you. Your registration request has been sent to the dotLRN
+Administrator.
Index: openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/manage-memberships-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql	11 Mar 2002 21:24:54 -0000	1.1
+++ openacs-4/packages/dotlrn/www/manage-memberships-oracle.xql	13 Mar 2002 00:12:09 -0000	1.2
@@ -119,10 +119,11 @@
         <querytext>
             select count(*)
             from dotlrn_class_instances_full
-            where not exists (select 1
-                              from dotlrn_member_rels_full
-                              where dotlrn_member_rels_full.user_id = :user_id
-                              and dotlrn_member_rels_full.community_id = dotlrn_class_instances_full.class_instance_id)
+            where dotlrn_class_instances_full.join_policy <> 'closed'
+            and not exists (select 1
+                            from dotlrn_member_rels_full
+                            where dotlrn_member_rels_full.user_id = :user_id
+                            and dotlrn_member_rels_full.community_id = dotlrn_class_instances_full.class_instance_id)
         </querytext>
     </fullquery>
 
@@ -131,10 +132,11 @@
             select dotlrn_class_instances_full.*,
                    acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
             from dotlrn_class_instances_full
-            where not exists (select 1
-                              from dotlrn_member_rels_full
-                              where dotlrn_member_rels_full.user_id = :user_id
-                              and dotlrn_member_rels_full.community_id = dotlrn_class_instances_full.class_instance_id)
+            where dotlrn_class_instances_full.join_policy <> 'closed'
+            and not exists (select 1
+                            from dotlrn_member_rels_full
+                            where dotlrn_member_rels_full.user_id = :user_id
+                            and dotlrn_member_rels_full.community_id = dotlrn_class_instances_full.class_instance_id)
             order by dotlrn_class_instances_full.department_name,
                      dotlrn_class_instances_full.department_key,
                      dotlrn_class_instances_full.pretty_name,
@@ -148,6 +150,7 @@
                    acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.department_key = :non_member_department_key
+            and dotlrn_class_instances_full.join_policy <> 'closed'
             and not exists (select 1
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
@@ -165,6 +168,7 @@
                    acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.term_id = :non_member_term_id
+            and dotlrn_class_instances_full.join_policy <> 'closed'
             and not exists (select 1
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
@@ -183,6 +187,7 @@
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.department_key = :non_member_department_key
             and dotlrn_class_instances_full.term_id = :non_member_term_id
+            and dotlrn_class_instances_full.join_policy <> 'closed'
             and not exists (select 1
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
@@ -199,10 +204,11 @@
             select dotlrn_clubs_full.*,
                    acs_permission.permission_p(dotlrn_clubs_full.club_id, :user_id, 'admin') as admin_p
             from dotlrn_clubs_full
-            where not exists (select 1
-                              from dotlrn_member_rels_full
-                              where dotlrn_member_rels_full.user_id = :user_id
-                              and dotlrn_member_rels_full.community_id = dotlrn_clubs_full.club_id)
+            where dotlrn_clubs_full.join_policy <> 'closed'
+            and not exists (select 1
+                            from dotlrn_member_rels_full
+                            where dotlrn_member_rels_full.user_id = :user_id
+                            and dotlrn_member_rels_full.community_id = dotlrn_clubs_full.club_id)
             order by dotlrn_clubs_full.pretty_name,
                      dotlrn_clubs_full.community_key
         </querytext>
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.2 -r1.3
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	12 Mar 2002 16:26:55 -0000	1.2
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	13 Mar 2002 00:12:09 -0000	1.3
@@ -23,12 +23,11 @@
 <h3>Add/Drop Memberships</h3>
 
 <if @n_member_classes@ gt 0 or @member_clubs:rowcount@ gt 0>
-  <br><hr>
+  <hr>
 
   <h4>Your Current Memberships</h4>
 
 <if @n_member_classes@ gt 0>
-    <br>
 
     <h4><%= [ad_parameter classes_pretty_plural] %></h4>
 
@@ -46,18 +45,26 @@
 <if @member_classes:rowcount@ gt 0>
     <table width="100%">
       <tr>
-        <th align="left"><%= [ad_parameter classes_pretty_name] %></th>
-        <th align="left">Term</th>
-        <th align="left">Role</th>
-        <th align="left">Actions</th>
+        <th align="left" width="55%"><%= [ad_parameter classes_pretty_name] %></th>
+        <th align="left" width="15%">Term</th>
+        <th align="left" width="15%">Role</th>
+        <th align="left" width="15%">Actions</th>
       </tr>
 
+<% set i 0 %>
+
 <multiple name="member_classes">
-      <tr>
+
+<%
+    if {!$i} { set bgcolor "#ffffff" } else { set bgcolor "#ececec" }
+    set i [expr 1 - $i]
+%>
+
+      <tr bgcolor=@bgcolor@>
         <td><a href="@member_classes.url@">@member_classes.pretty_name@</td>
         <td>@member_classes.term_name@ @member_classes.term_year@</td>
         <td>@member_classes.role@</td>
-        <td>[&nbsp;<include src="deregister-link" url="@member_classes.url@deregister" referer=@referer@>&nbsp;]</td>
+        <td>[<small><include src="deregister-link" url="@member_classes.url@deregister" referer=@referer@></small>]</td>
       </tr>
 </multiple>
     </table>
@@ -68,23 +75,29 @@
 
 </if>
 
-  <br>
-
   <h4><%= [ad_parameter clubs_pretty_plural] %></h4>
 
 <if @member_clubs:rowcount@ gt 0>
     <table width="100%">
       <tr>
-        <th align="left"><%= [ad_parameter clubs_pretty_name] %></th>
-        <th align="left">Role</th>
-        <th align="left">Actions</th>
+        <th align="left" colspan="2" width="70%"><%= [ad_parameter clubs_pretty_name] %></th>
+        <th align="left" width="15%">Role</th>
+        <th align="left" width="15%">Actions</th>
       </tr>
 
+<% set i 0 %>
+
 <multiple name="member_clubs">
-      <tr>
-        <td><a href="@member_clubs.url@">@member_clubs.pretty_name@</td>
+
+<%
+    if {!$i} { set bgcolor "#ffffff" } else { set bgcolor "#ececec" }
+    set i [expr 1 - $i]
+%>
+
+      <tr bgcolor=@bgcolor@>
+        <td colspan="2"><a href="@member_clubs.url@">@member_clubs.pretty_name@</td>
         <td>@member_clubs.role@</td>
-        <td>[&nbsp;<include src="deregister-link" url="@member_clubs.url@deregister" referer=@referer@>&nbsp;]</td>
+        <td>[<small><include src="deregister-link" url="@member_clubs.url@deregister" referer=@referer@></small>]</td>
       </tr>
 </multiple>
     </table>
@@ -97,12 +110,11 @@
 </if>
 
 <if @n_non_member_classes@ gt 0 or @non_member_clubs:rowcount@ gt 0>
-  <br><hr>
+  <hr>
 
   <h4>Join A Group</h4>
 
 <if @n_non_member_classes@ gt 0>
-    <br>
 
     <h4><%= [ad_parameter classes_pretty_plural] %></h4>
 
@@ -120,16 +132,26 @@
 <if @non_member_classes:rowcount@ gt 0>
     <table width="100%">
       <tr>
-        <th align="left"><%= [ad_parameter classes_pretty_name] %></th>
-        <th align="left">Term</th>
-        <th align="left">Actions</th>
+        <th align="left" width="55%"><%= [ad_parameter classes_pretty_name] %></th>
+        <th align="left" width="15%">Term</th>
+        <th align="left" width="15%">&nbsp;</th>
+        <th align="left" width="15%">Actions</th>
       </tr>
 
+<% set i 0 %>
+
 <multiple name="non_member_classes">
-      <tr>
+
+<%
+    if {!$i} { set bgcolor "#ffffff" } else { set bgcolor "#ececec" }
+    set i [expr 1 - $i]
+%>
+
+      <tr bgcolor=@bgcolor@>
         <td><a href="@non_member_classes.url@">@non_member_classes.pretty_name@</td>
         <td>@non_member_classes.term_name@ @non_member_classes.term_year@</td>
-        <td>[&nbsp;<include src="register-link" url="@non_member_classes.url@register" referer=@referer@>&nbsp;]</td>
+        <td>&nbsp;</td>
+        <td>[<small><include src="register-link" url="@non_member_classes.url@register" referer=@referer@></small>]</td>
       </tr>
 </multiple>
     </table>
@@ -140,21 +162,27 @@
 
 </if>
 
-  <br>
-
   <h4><%= [ad_parameter clubs_pretty_plural] %></h4>
 <if @non_member_clubs:rowcount@ gt 0>
 
     <table width="100%">
       <tr>
-        <th align="left"><%= [ad_parameter clubs_pretty_name] %></th>
+        <th align="left" colspan="3" width="85%"><%= [ad_parameter clubs_pretty_name] %></th>
         <th align="left">Actions</th>
       </tr>
 
+<% set i 0 %>
+
 <multiple name="non_member_clubs">
-      <tr>
-        <td><a href="@non_member_clubs.url@">@non_member_clubs.pretty_name@</td>
-        <td>[&nbsp;<include src="register-link" url="@non_member_clubs.url@register" referer=@referer@>&nbsp;]</td>
+
+<%
+    if {!$i} { set bgcolor "#ffffff" } else { set bgcolor "#ececec" }
+    set i [expr 1 - $i]
+%>
+
+      <tr bgcolor=@bgcolor@>
+        <td colspan="3"><a href="@non_member_clubs.url@">@non_member_clubs.pretty_name@</td>
+        <td>[<small><include src="register-link" url="@non_member_clubs.url@register" referer=@referer@></small>]</td>
       </tr>
 </multiple>
     </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.15 -r1.16
--- openacs-4/packages/dotlrn/www/one-community-type.tcl	23 Jan 2002 07:41:04 -0000	1.15
+++ openacs-4/packages/dotlrn/www/one-community-type.tcl	13 Mar 2002 00:12:09 -0000	1.16
@@ -36,16 +36,16 @@
 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 classes_pretty_name] Instances"
-    set title [ad_parameter classes_pretty_plural]
+    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]
+    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 classes_pretty_name] Instances"
+    set community_type_title [ad_parameter "classes_pretty_plural"]
+    set communities_title [ad_parameter "class_instances_pretty_name"]
     set title $pretty_name
 } else {
     set community_type_title "Community Types"
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.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/class.adp	8 Mar 2002 00:27:05 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/class.adp	13 Mar 2002 00:12:09 -0000	1.12
@@ -8,7 +8,7 @@
 
 <p>
 <if @can_instantiate@ gt 0>
-  [ <a href="class-instance-new?class_key=@class_key@">New <%= [ad_parameter classes_pretty_name] %> Instance</a> ]
+  [ <a href="class-instance-new?class_key=@class_key@">New <%= [ad_parameter class_instances_pretty_name] %></a> ]
 </if>
 <else>
 <include src="need-term-note">
@@ -31,14 +31,14 @@
 <table width="100%">
   <tr>
     <th align="left" width="15%">Term</th>
-    <th align="left" width="50%"><%= [ad_parameter classes_pretty_name] %> Instance Name</th>
+    <th align="left" width="50%"><%= [ad_parameter class_instances_pretty_name] %> Name</th>
     <th align="left">Actions</th>
   </tr>
 <multiple name="class_instances">
   <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>[&nbsp;<font size="-1"><a href="@class_instances.url@one-community-admin">admin</a></font>&nbsp;]</td>
+    <td>[<small><a href="@class_instances.url@one-community-admin">admin</a></small>]</td>
   </tr>
 </multiple>
 </table>
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.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/clubs.adp	8 Mar 2002 00:27:05 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/clubs.adp	13 Mar 2002 00:12:09 -0000	1.10
@@ -17,7 +17,7 @@
   <tr>
     <td><a href="@clubs.url@">@clubs.pretty_name@</a></td>
     <td>@clubs.description@</td>
-    <td>[&nbsp<font size="-1"><a href="@clubs.url@one-community-admin">admin</a></font>&nbsp;]</td>
+    <td>[<small><a href="@clubs.url@one-community-admin">admin</a></small>]</td>
   </tr>
 </multiple>
 </table>
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.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/need-term-note.adp	17 Dec 2001 23:02:56 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/need-term-note.adp	13 Mar 2002 00:12:09 -0000	1.2
@@ -1,4 +1,5 @@
 <i>
   <b>Note:</b> You must create <a href="terms">terms</a> to be able to create
-  class instances, since these must be associated with terms.
+  <%= [ad_parameter "class_instances_pretty_plural"] %>, since these must be
+  associated with Terms.
 </i>
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.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/term.adp	8 Mar 2002 00:27:05 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/term.adp	13 Mar 2002 00:12:09 -0000	1.5
@@ -24,15 +24,15 @@
   <tr>
     <th align="left" width="30%"><%= [ad_parameter departments_pretty_name] %></th>
     <th align="left" width="30%"><%= [ad_parameter classes_pretty_name] %></th>
-    <th align="left" width="30%"><%= [ad_parameter classes_pretty_name] %> Instance</th>
+    <th align="left" width="30%"><%= [ad_parameter class_instances_pretty_name] %></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.class_name@</a></td>
     <td><a href="@classes.url@">@classes.pretty_name@</a></td>
-    <td>[&nbsp;<font size="-1"><a href="@classes.url@one-community-admin">admin</a></font>&nbsp;]</td>
+    <td>[<small><a href="@classes.url@one-community-admin">admin</a></small>]</td>
   </tr>
 </multiple>
 </table>
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.17 -r1.18
--- openacs-4/packages/dotlrn/www/admin/users.adp	12 Mar 2002 01:55:09 -0000	1.17
+++ openacs-4/packages/dotlrn/www/admin/users.adp	13 Mar 2002 00:12:09 -0000	1.18
@@ -3,11 +3,11 @@
 <property name="context_bar">@context_bar@</property>
 
 [ 
-  <a href="../user-add?add_membership_p=f&referer=/dotlrn/admin/users"><font size="-1">Create A New User</font></a> 
+  <a href="../user-add?add_membership_p=f&referer=/dotlrn/admin/users"><small>Create A New User</small></a> 
   |
-  <a href="users-search"><font size="-1">Search Users</font></a>
+  <a href="users-search"><small>Search Users</small></a>
   |
-  <a href="users-bulk-upload"><font size=-1>Bulk Upload</font></a>
+  <a href="users-bulk-upload"><small>Bulk Upload</small></a>
 ]
 
 <p></p>