Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn/dotlrn.info	12 Jan 2002 10:05:19 -0000	1.22
+++ openacs-4/packages/dotlrn/dotlrn.info	15 Jan 2002 20:47:01 -0000	1.23
@@ -209,6 +209,10 @@
             <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="clubs_pretty_name"  default="Club" description="used everywhere in the ui"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="clubs_pretty_plural"  default="Clubs" description="used everywhere in the ui"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql	11 Jan 2002 06:33:26 -0000	1.10
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql	15 Jan 2002 20:48:30 -0000	1.11
@@ -29,7 +29,7 @@
         parent_type => 'dotlrn_community',
         pretty_name => 'Class',
         pretty_plural => 'Classes',
-        description => 'Classes - e.g. 6.001'
+        description => 'e.g. 6.001'
     );
 
     -- create the dotlrn_club community type
@@ -38,7 +38,7 @@
         parent_type => 'dotlrn_community',
         pretty_name => 'Club',
         pretty_plural => 'Clubs',
-        description => 'Clubs - e.g. Alumni'
+        description => 'e.g. Alumni'
     );
 
     -- create roles
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.3 -r1.4
--- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	29 Nov 2001 06:05:37 -0000	1.3
+++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	15 Jan 2002 20:47:01 -0000	1.4
@@ -60,8 +60,15 @@
 
 	set first_args []
 	lappend first_args [list [root_url] dotLRN]
-	lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn_community::get_community_type_name $community_type]]
 
+        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]]
+        } 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]]
+        } else {
+            lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn_community::get_community_type_name $community_type]]
+        }
+
 	if {![empty_string_p $community_id]} {
 	    lappend first_args [list [dotlrn_community::get_community_url $community_id] [dotlrn_community::get_community_name $community_id]]
 	}
Index: openacs-4/packages/dotlrn/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn/www/index.tcl	11 Jan 2002 21:51:51 -0000	1.19
+++ openacs-4/packages/dotlrn/www/index.tcl	15 Jan 2002 20:47:01 -0000	1.20
@@ -34,7 +34,7 @@
     set communities [dotlrn_community::get_all_communities_by_user $user_id]
 
     if {[llength $communities] == 0} {
-        ad_returnredirect index-not-a-user
+        ad_returnredirect "index-not-a-user"
         ad_script_abort
     }
 
@@ -49,7 +49,7 @@
 set portal_id [dotlrn::get_workspace_portal_id $user_id]
 
 if {[empty_string_p $portal_id]} {
-    ad_returnredirect index-not-a-user
+    ad_returnredirect "index-not-a-user"
     ad_script_abort
 }
 
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.9 -r1.10
--- openacs-4/packages/dotlrn/www/one-community-type.tcl	10 Jan 2002 19:30:18 -0000	1.9
+++ openacs-4/packages/dotlrn/www/one-community-type.tcl	15 Jan 2002 20:47:01 -0000	1.10
@@ -36,16 +36,16 @@
 db_1row select_community_type_info {}
 
 if {[string equal ${community_type} "dotlrn_class_instance"] != 0} {
-    set community_type_title "Classes"
-    set communities_title "Class Instances"
-    set title "Classes"
+    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]
 } elseif {[string equal ${community_type} "dotlrn_club"] != 0} {
-    set community_type_title "Clubs"
-    set communities_title "Clubs"
-    set title "Clubs"
+    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 "Classes"
-    set communities_title "Class Instances"
+    set community_type_title [ad_parameter classes_pretty_plural]
+    set communities_title "[ad_parameter classes_pretty_name] Instances"
     set title $pretty_name
 } else {
     set community_type_title "Community Types"
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.adp	11 Jan 2002 06:33:26 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.adp	15 Jan 2002 20:47:01 -0000	1.5
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">New Class Instance of @class_name@</property>
+<property name="title">New Instance of @class_name@</property>
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_class_instance"></formtemplate>
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	10 Jan 2002 21:19:32 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	15 Jan 2002 20:47:01 -0000	1.10
@@ -24,7 +24,7 @@
     -label "Join Policy" -datatype text -widget select -options {{Open open} {"Needs Approval" "needs approval"} {Closed closed}}
 
 element create add_class_instance class_key \
-    -label "Class Key" -value $class_key -datatype text -widget hidden
+    -label "[ad_parameter classes_pretty_name] Key" -value $class_key -datatype text -widget hidden
 
 element create add_class_instance referer \
     -label "Referer" -value $referer -datatype text -widget hidden
Index: openacs-4/packages/dotlrn/www/admin/class-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/class-new.adp	11 Jan 2002 06:33:26 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/class-new.adp	15 Jan 2002 20:47:01 -0000	1.5
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">New Class</property>
+<property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_class"></formtemplate>
Index: openacs-4/packages/dotlrn/www/admin/class-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/class-new.tcl	10 Jan 2002 19:30:18 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/class-new.tcl	15 Jan 2002 20:47:01 -0000	1.5
@@ -7,12 +7,18 @@
     @version $Id$
 } -query {
     {referer "classes"}
+} -properties {
+    title:onevalue
+    context_bar:onevalue
 }
 
+set title "New [ad_parameter classes_pretty_name]"
+set context_bar [list [list classes [ad_parameter classes_pretty_plural]] New]
+
 form create add_class
 
 element create add_class class_key \
-    -label "Class Key (a short name, no spaces)" -datatype text -widget text -html {size 50}
+    -label "[ad_parameter classes_pretty_name] Key (a short name, no spaces)" -datatype text -widget text -html {size 50}
 
 element create add_class name \
     -label "Name" -datatype text -widget text -html {size 50}
@@ -32,6 +38,4 @@
     ad_script_abort
 }
 
-set context_bar {{classes Classes} New}
-
 ad_return_template
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.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/class.adp	12 Jan 2002 09:27:16 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/class.adp	15 Jan 2002 20:47:02 -0000	1.4
@@ -2,14 +2,14 @@
 <if @can_instantiate@ gt 0>
 [
   <font size="-1">
-    <a href="class-instance-new?class_key=@class_key@&referer=classes?filter=@filter@">new instance</a>
+    <a href="class-instance-new?class_key=@class_key@&referer=classes?filter=@filter@">New Instance</a>
   </font>
 ]
 </if>
 <else>
 [
   <font size="-1" color="#aaaaaa">
-    <i>new instance</i>
+    <i>New Instance</i>
   </font>
 ]
 </else>
Index: openacs-4/packages/dotlrn/www/admin/classes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/classes.adp	12 Jan 2002 09:27:16 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/classes.adp	15 Jan 2002 20:47:02 -0000	1.8
@@ -1,8 +1,8 @@
 <master src="master">
-<property name="title">Classes</property>
+<property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
-[ <a href="class-new?referer=classes?filter=@filter@">new class</a> ]
+[ <a href="class-new?referer=classes?filter=@filter@">New <%= [ad_parameter classes_pretty_name] %></a> ]
 
 <p>
 <include src="need-term-note">
@@ -20,5 +20,5 @@
 </if>
 
 <if @classes:rowcount@ gt 10>
-[ <a href="class-new?referer=classes?filter=@filter@">new class</a> ]
+[ <a href="class-new?referer=classes?filter=@filter@">New <%= [ad_parameter classes_pretty_name] %></a> ]
 </if>
Index: openacs-4/packages/dotlrn/www/admin/classes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/classes.tcl	12 Jan 2002 09:27:16 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/classes.tcl	15 Jan 2002 20:47:02 -0000	1.6
@@ -8,11 +8,14 @@
 } -query {
     {filter "select_current_class_instances"}
 } -properties {
+    title:onevalue
+    context_bar:onevalue
     filter_bar:onevalue
     classes:multirow
 }
 
-set context_bar "Classes"
+set title {[ad_parameter classes_pretty_plural]}
+set context_bar {[ad_parameter classes_pretty_plural]}
 
 set filter_bar [ad_dimensional {
     {filter "Term:" select_current_class_instances
Index: openacs-4/packages/dotlrn/www/admin/club-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/club-new.adp	11 Jan 2002 06:33:26 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/club-new.adp	15 Jan 2002 20:47:02 -0000	1.4
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">New Club</property>
+<property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_club"></formtemplate>
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.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/club-new.tcl	10 Jan 2002 19:30:18 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/club-new.tcl	15 Jan 2002 20:47:02 -0000	1.5
@@ -7,13 +7,17 @@
 } -query {
     {referer "clubs"}
 } -properties {
+    title:onevalue
     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 club_key \
-    -label "Club Key (a short name, no spaces)" -datatype text -widget text -html {size 50}
+    -label "[ad_parameter clubs_pretty_name] Key (a short name, no spaces)" -datatype text -widget text -html {size 50}
 
 element create add_club name \
     -label "Name" -datatype text -widget text -html {size 50}
@@ -36,6 +40,4 @@
     ad_script_abort
 }
 
-set context_bar {{clubs Clubs} New}
-
 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.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/clubs.adp	11 Jan 2002 06:33:26 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/clubs.adp	15 Jan 2002 20:47:02 -0000	1.6
@@ -1,8 +1,8 @@
 <master src="master">
-<property name="title">Clubs</property>
+<property name="title">@title@</property>
 <property name="context_bar">@context_bar@</property>
 
-[ <a href="club-new">new club</a> ]
+[ <a href="club-new">New <%= [ad_parameter clubs_pretty_name] %></a> ]
 
 <p></p>
 
@@ -18,5 +18,5 @@
 </if>
 
 <if @clubs:rowcount@ gt 10>
-[ <a href="club-new">new club</a> ]
+[ <a href="club-new">New <%= [ad_parameter clubs_pretty_name] %></a> ]
 </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.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/clubs.tcl	17 Dec 2001 23:02:56 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/clubs.tcl	15 Jan 2002 20:47:02 -0000	1.4
@@ -8,11 +8,13 @@
     @version $Id$
 } {
 } -properties {
+    title:onevalue
     context_bar:onevalue
     clubs:multirow
 }
 
-set context_bar "Clubs"
+set title "[ad_parameter clubs_pretty_plural]"
+set context_bar [list [ad_parameter clubs_pretty_plural]]
 
 db_multirow clubs select_clubs {}
 
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.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/index.adp	11 Jan 2002 06:33:26 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/index.adp	15 Jan 2002 20:47:02 -0000	1.9
@@ -11,6 +11,6 @@
 <ul>
   <li><a href="users">Users</a></li>
   <li><a href="terms">Terms</a></li>
-  <li><a href="classes">Classes</a></li>
-  <li><a href="clubs">Clubs</a></li>
+  <li><a href="classes"><%= [ad_parameter classes_pretty_plural] %></a></li>
+  <li><a href="clubs"><%= [ad_parameter clubs_pretty_plural] %></a></li>
 </ul>
Index: openacs-4/packages/dotlrn/www/admin/one-class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-class.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/one-class.tcl	17 Dec 2001 23:02:56 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/one-class.tcl	15 Jan 2002 20:47:02 -0000	1.5
@@ -17,13 +17,13 @@
 # Get information about that class
 if {![db_0or1row select_class_info {}]} {
     ad_returnredirect "classes"
-    return
+    ad_script_abort
 }
 
 db_multirow class_instances select_class_instances {}
 
 set can_instantiate [db_string can_instantiate_class {}]
 
-set context_bar {{classes Classes} One}
+set context_bar [list [list classes [ad_parameter classes_pretty_plural]] One]
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/one-club.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-club.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/one-club.tcl	10 Dec 2001 22:48:57 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/one-club.tcl	15 Jan 2002 20:47:02 -0000	1.2
@@ -16,7 +16,7 @@
     description:onevalue
 }
 
-set context_bar {{clubs Clubs} One}
+set context_bar [list [list clubs [ad_parameter clubs_pretty_plural]] One]
 
 db_1row select_club {}
 
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.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/terms.adp	11 Jan 2002 06:33:26 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/terms.adp	15 Jan 2002 20:47:02 -0000	1.3
@@ -2,7 +2,7 @@
 <property name="title">Terms</property>
 <property name="context_bar">@context_bar@</property>
 
-[ <a href="term-new">new term</a> ]
+[ <a href="term-new">New Term</a> ]
 
 <p></p>
 
@@ -18,5 +18,5 @@
 </if>
 
 <if @terms:rowcount@ gt 10>
-[ <a href="term-new">new term</a> ]
+[ <a href="term-new">New Term</a> ]
 </if>
Index: openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp	12 Jan 2002 09:27:16 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp	15 Jan 2002 20:47:02 -0000	1.5
@@ -7,4 +7,4 @@
 <p></p>
 
 You're asking to change the level of access of this user. This has strong repercussions. Are you user about this?
-<formtemplate id=verif_edit_user></formtemplate>
+<formtemplate id="verif_edit_user"></formtemplate>
Index: openacs-4/packages/dotlrn/www/admin/user-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/user-edit.adp	11 Jan 2002 06:33:26 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/user-edit.adp	15 Jan 2002 20:47:02 -0000	1.5
@@ -5,4 +5,4 @@
 You're editing <strong>@first_names@ @last_name@</strong>. 
 <p>
 
-<formtemplate id=edit_user></formtemplate>
+<formtemplate id="edit_user"></formtemplate>
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/user-new-2.adp	11 Jan 2002 06:33:26 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.adp	15 Jan 2002 20:47:02 -0000	1.9
@@ -5,4 +5,4 @@
 You've chosen to add <strong>@first_names@ @last_name@</strong>. 
 <p>
 
-<formtemplate id=add_user></formtemplate>
+<formtemplate id="add_user"></formtemplate>