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.38 -r1.39 --- openacs-4/packages/dotlrn/tcl/class-procs.tcl 21 May 2002 15:05:09 -0000 1.38 +++ openacs-4/packages/dotlrn/tcl/class-procs.tcl 21 May 2002 17:30:02 -0000 1.39 @@ -77,7 +77,7 @@ dotlrn_community::init \ -community_type [community_type] \ -community_type_url_part [get_url_part] \ - -pretty_name [dotlrn::parameter -package_id [dotlrn::get_package_id] classes_pretty_plural] + -pretty_name [parameter::get -package_id [dotlrn::get_package_id] -parameter classes_pretty_plural] } ad_proc -public check_class_key_valid_p { Index: openacs-4/packages/dotlrn/tcl/club-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/club-procs.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn/tcl/club-procs.tcl 21 May 2002 15:05:09 -0000 1.15 +++ openacs-4/packages/dotlrn/tcl/club-procs.tcl 21 May 2002 17:30:02 -0000 1.16 @@ -61,7 +61,7 @@ dotlrn_community::init \ -community_type [community_type] \ -community_type_url_part [get_url_part] \ - -pretty_name [dotlrn::parameter -package_id [dotlrn::get_package_id] clubs_pretty_plural] + -pretty_name [parameter::get -package_id [dotlrn::get_package_id] -parameter clubs_pretty_plural] } ad_proc -public new { 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.129 -r1.130 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 May 2002 15:35:18 -0000 1.129 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 May 2002 17:30:02 -0000 1.130 @@ -57,9 +57,9 @@ dotlrn_community::set_type_package_id $community_type $package_id - 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 + parameter::set_value -package_id $package_id -parameter dotlrn_level_p -value 0 + parameter::set_value -package_id $package_id -parameter community_type_level_p -value 1 + parameter::set_value -package_id $package_id -parameter community_level_p -value 0 # create a "dummy" community for this community # type to get a portal template with all of the @@ -114,9 +114,9 @@ ] # Set some parameters - 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 + parameter::set_value -package_id $package_id -parameter dotlrn_level_p -value 0 + parameter::set_value -package_id $package_id -parameter community_type_level_p -value 1 + parameter::set_value -package_id $package_id -parameter community_level_p -value 0 # Set the site node dotlrn_community::set_type_package_id $community_type_key $package_id @@ -248,21 +248,21 @@ # 1. get the page_names and layouts # 2. the the list of default applets for this type if {[string equal $community_type "dotlrn_community"]} { - set csv_list [dotlrn::parameter -package_id $package_id subcomm_pages_csv] - set default_applets [dotlrn::parameter -package_id $package_id default_subcomm_applets] + set csv_list [parameter::get -package_id $package_id -parameter subcomm_pages_csv] + set default_applets [parameter::get -package_id $package_id -parameter default_subcomm_applets] } elseif {[string equal $community_type "dotlrn_club"]} { - set csv_list [dotlrn::parameter -package_id $package_id club_pages_csv] - set default_applets [dotlrn::parameter -package_id $package_id default_club_applets] + set csv_list [parameter::get -package_id $package_id -parameter club_pages_csv] + set default_applets [parameter::get -package_id $package_id -parameter default_club_applets] } elseif {[string equal $community_type "user_workspace"]} { - set csv_list [dotlrn::parameter -package_id $package_id user_wsp_page_names] + set csv_list [parameter::get -package_id $package_id -parameter user_wsp_page_names] set default_applets [list] } else { - set csv_list [dotlrn::parameter -package_id $package_id class_instance_pages_csv] - set default_applets [dotlrn::parameter -package_id $package_id default_class_instance_applets] + set csv_list [parameter::get -package_id $package_id -parameter class_instance_pages_csv] + set default_applets [parameter::get -package_id $package_id -parameter default_class_instance_applets] } - set non_member_page_name [dotlrn::parameter -package_id $package_id non_member_page_name] - set admin_page_name [dotlrn::parameter -package_id $package_id admin_page_name] + set non_member_page_name [parameter::get -package_id $package_id -parameter non_member_page_name] + set admin_page_name [parameter::get -package_id $package_id -parameter admin_page_name] if {[empty_string_p $dummy_comm_p]} { set user_id [ad_conn user_id] @@ -314,9 +314,9 @@ ] # Set the right parameters - 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 + parameter::set_value -package_id $package_id -parameter dotlrn_level_p -value 0 + parameter::set_value -package_id $package_id -parameter community_type_level_p -value 0 + parameter::set_value -package_id $package_id -parameter community_level_p -value 1 # Set up the node dotlrn_community::set_package_id $community_id $package_id @@ -1570,9 +1570,9 @@ ] # Set the right parameters - 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 + parameter::set_value -package_id $package_id -parameter dotlrn_level_p -value 0 + parameter::set_value -package_id $package_id -parameter community_type_level_p -value 0 + parameter::set_value -package_id $package_id -parameter community_level_p -value 1 # Set up the node dotlrn_community::set_package_id $clone_id $package_id @@ -1777,7 +1777,7 @@ if {![empty_string_p $reorder_hack_p]} { ns_log notice "aks1: applets_dispatch: reorder hack!" - set reorder_applets_string [dotlrn::parameter -default "dotlrn_news,dotlrn_bboard,dotlrn_survey,dotlrn_faq" user_wsp_applet_ordering] + set reorder_applets_string [parameter::get -parameter user_wsp_applet_ordering -default "dotlrn_news,dotlrn_bboard,dotlrn_faq"] set reorder_applets_list [string trim [split $reorder_applets_string {,}]] @@ -1788,21 +1788,16 @@ foreach applet $reorder_applets_list { set index [lsearch -exact $list_of_applets $applet] - if {$index != -1 } { - ns_log notice "aks2: reorder HIT with '$applet' against '$list_of_applets' // $index" + if {$index != -1} { set list_of_applets [lreplace $list_of_applets $index $index] lappend result_list $applet - } else { - ns_log notice "aks3: reorder MISS with '$applet' against '$list_of_applets'" } } set list_of_applets [concat $result_list $list_of_applets] } - foreach applet $list_of_applets { - # Callback on applet applet_call $applet $op $list_args } } 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.23 -r1.24 --- openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl 18 May 2002 22:42:11 -0000 1.23 +++ openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl 21 May 2002 17:30:02 -0000 1.24 @@ -35,7 +35,7 @@ ad_proc -public get_pretty_name { } { - return [dotlrn::parameter dotlrn_main_portlet_pretty_name] + return [parameter::get -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 [dotlrn::parameter dotlrn_main_portlet_region] \ + -force_region [parameter::get -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.54 -r1.55 --- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 18 May 2002 22:42:11 -0000 1.54 +++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 21 May 2002 17:30:02 -0000 1.55 @@ -368,18 +368,12 @@ } ad_proc -public parameter { - -set - {-package_id ""} + {-name:required} {-default ""} - name } { - wrap ad_parameter + wrap } { - if {[info exists set]} { - return [parameter::set_value -package_id $package_id -parameter $name -value $set] - } else { - return [parameter::get -package_id $package_id -parameter $name -default $default] - } + return [parameter::get -package_id [get_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.4 -r1.5 --- openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl 18 May 2002 22:42:11 -0000 1.4 +++ openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl 21 May 2002 17:30:02 -0000 1.5 @@ -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 [dotlrn::parameter -package_id [dotlrn::get_package_id] auto_dotlrn_user_email_patterns] + set param [parameter::get -package_id [dotlrn::get_package_id] -parameter 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.8 -r1.9 --- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 18 May 2002 22:42:11 -0000 1.8 +++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 21 May 2002 17:30:02 -0000 1.9 @@ -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] [dotlrn::parameter classes_pretty_plural]] + lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [parameter::get -parameter classes_pretty_plural]] } elseif {[string equal ${community_type} "dotlrn_club"] != 0} { - lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn::parameter clubs_pretty_plural]] + lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [parameter::get -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/community-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-type.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/community-type.tcl 18 May 2002 22:42:11 -0000 1.7 +++ openacs-4/packages/dotlrn/www/community-type.tcl 21 May 2002 17:30:02 -0000 1.8 @@ -24,7 +24,7 @@ } # Check that this is a community type -if {[dotlrn::parameter community_type_level_p] != 1} { +if {[parameter::get -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.8 -r1.9 --- openacs-4/packages/dotlrn/www/community.tcl 18 May 2002 22:42:11 -0000 1.8 +++ openacs-4/packages/dotlrn/www/community.tcl 21 May 2002 17:30:02 -0000 1.9 @@ -23,7 +23,7 @@ } # Check that this is a community type -if {[dotlrn::parameter community_level_p] != 1} { +if {[parameter::get -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.8 -r1.9 --- openacs-4/packages/dotlrn/www/configure-2.tcl 18 May 2002 22:42:11 -0000 1.8 +++ openacs-4/packages/dotlrn/www/configure-2.tcl 21 May 2002 17:30:02 -0000 1.9 @@ -29,7 +29,7 @@ set anchor [ns_set get $form anchor] # Check if this is a community type level thing -if {[dotlrn::parameter community_type_level_p] == 1} { +if {[parameter::get -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.6 -r1.7 --- openacs-4/packages/dotlrn/www/configure-element-2.tcl 18 May 2002 22:42:11 -0000 1.6 +++ openacs-4/packages/dotlrn/www/configure-element-2.tcl 21 May 2002 17:30:02 -0000 1.7 @@ -27,7 +27,7 @@ } # Check if this is a community type level thing -if {[dotlrn::parameter community_type_level_p] == 1} { +if {[parameter::get -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.9 -r1.10 --- openacs-4/packages/dotlrn/www/configure-element.tcl 18 May 2002 22:42:11 -0000 1.9 +++ openacs-4/packages/dotlrn/www/configure-element.tcl 21 May 2002 17:30:02 -0000 1.10 @@ -26,15 +26,15 @@ } # Check if this is a community type level thing -if {[dotlrn::parameter community_type_level_p] == 1} { +if {[parameter::get -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 {[dotlrn::parameter community_level_p] == 1} { +if {[parameter::get -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.10 -r1.11 --- openacs-4/packages/dotlrn/www/configure.tcl 18 May 2002 22:42:11 -0000 1.10 +++ openacs-4/packages/dotlrn/www/configure.tcl 21 May 2002 17:30:02 -0000 1.11 @@ -26,15 +26,15 @@ } # Check if this is a community type level thing -if {[dotlrn::parameter community_type_level_p] == 1} { +if {[parameter::get -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 {[dotlrn::parameter community_level_p] == 1} { +if {[parameter::get -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.7 -r1.8 --- openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl 18 May 2002 22:42:11 -0000 1.7 +++ openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl 21 May 2002 17:30:02 -0000 1.8 @@ -135,7 +135,7 @@ set navbar "
" set portal_id "" } -} elseif {[dotlrn::parameter -package_id [ad_conn package_id] community_type_level_p] == 1} { +} elseif {[parameter::get -parameter 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 {[dotlrn::parameter community_level_p] == 1 || $parent_comm_p } { +if {[parameter::get -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 {[dotlrn::parameter community_type_level_p] == 1} { +} elseif {[parameter::get -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.25 -r1.26 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 18 May 2002 22:42:11 -0000 1.25 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 21 May 2002 17:30:02 -0000 1.26 @@ -51,10 +51,10 @@ <% set old_level [expr $new_level - 1] %> -
  • <%= [dotlrn::parameter class_instances_pretty_plural] %>: +
  • <%= [parameter::get -parameter class_instances_pretty_plural] %>: -
  • <%= [dotlrn::parameter clubs_pretty_plural] %>: +
  • <%= [parameter::get -parameter clubs_pretty_plural] %>: 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.8 -r1.9 --- openacs-4/packages/dotlrn/www/index-not-a-user.tcl 18 May 2002 22:42:11 -0000 1.8 +++ openacs-4/packages/dotlrn/www/index-not-a-user.tcl 21 May 2002 17:30:02 -0000 1.9 @@ -28,6 +28,6 @@ set admin_p [dotlrn::admin_p] set admin_url [dotlrn::get_url]/admin -set admin_pretty_name [dotlrn::parameter dotlrn_admin_pretty_name] +set admin_pretty_name [parameter::get -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.32 -r1.33 --- openacs-4/packages/dotlrn/www/index.tcl 18 May 2002 22:42:11 -0000 1.32 +++ openacs-4/packages/dotlrn/www/index.tcl 21 May 2002 17:30:02 -0000 1.33 @@ -27,13 +27,13 @@ } # Check if this is a community type level thing -if {[dotlrn::parameter community_type_level_p] == 1} { +if {[parameter::get -parameter community_type_level_p] == 1} { ad_returnredirect "one-community-type" ad_script_abort } # Check if this is a community level thing -if {[dotlrn::parameter community_level_p] == 1} { +if {[parameter::get -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.11 -r1.12 --- openacs-4/packages/dotlrn/www/manage-memberships.adp 18 May 2002 22:42:11 -0000 1.11 +++ openacs-4/packages/dotlrn/www/manage-memberships.adp 21 May 2002 17:30:02 -0000 1.12 @@ -26,11 +26,11 @@

    - Current <%= [dotlrn::parameter clubs_pretty_plural] %> + Current <%= [parameter::get -parameter clubs_pretty_plural] %> | - Join a <%= [dotlrn::parameter class_instances_pretty_name] %> + Join a <%= [parameter::get -parameter class_instances_pretty_name] %> | - Join a <%= [dotlrn::parameter clubs_pretty_name] %> + Join a <%= [parameter::get -parameter clubs_pretty_name] %>

    @@ -41,12 +41,12 @@ -

    <%= [dotlrn::parameter class_instances_pretty_plural] %>

    +

    <%= [parameter::get -parameter class_instances_pretty_plural] %>

    - <%= [dotlrn::parameter departments_pretty_name] %>:  + <%= [parameter::get -parameter departments_pretty_name] %>:  Term:  @@ -57,7 +57,7 @@ - + @@ -90,12 +90,12 @@ -

    <%= [dotlrn::parameter clubs_pretty_plural] %>

    +

    <%= [parameter::get -parameter clubs_pretty_plural] %>

    <%= [dotlrn::parameter class_instances_pretty_name] %> Name<%= [parameter::get -parameter class_instances_pretty_name] %> Name Term Role Actions
    - + @@ -121,7 +121,7 @@
    <%= [dotlrn::parameter clubs_pretty_name] %> Name<%= [parameter::get -parameter clubs_pretty_name] %> Name Role Actions
    -

    No <%= [dotlrn::parameter clubs_pretty_plural] %>

    +

    No <%= [parameter::get -parameter clubs_pretty_plural] %>

    @@ -133,12 +133,12 @@ -

    <%= [dotlrn::parameter class_instances_pretty_plural] %>

    +

    <%= [parameter::get -parameter class_instances_pretty_plural] %>

    - <%= [dotlrn::parameter departments_pretty_name] %>:  + <%= [parameter::get -parameter departments_pretty_name] %>:  Term:  @@ -149,7 +149,7 @@ - + @@ -182,12 +182,12 @@ -

    <%= [dotlrn::parameter clubs_pretty_plural] %>

    +

    <%= [parameter::get -parameter clubs_pretty_plural] %>

    <%= [dotlrn::parameter class_instances_pretty_name] %> Name<%= [parameter::get -parameter class_instances_pretty_name] %> Name Term   Actions
    - + @@ -212,7 +212,7 @@ -

    No <%= [dotlrn::parameter clubs_pretty_plural] %>

    +

    No <%= [parameter::get -parameter clubs_pretty_plural] %>

    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.18 -r1.19 --- openacs-4/packages/dotlrn/www/one-community-type.tcl 18 May 2002 22:42:11 -0000 1.18 +++ openacs-4/packages/dotlrn/www/one-community-type.tcl 21 May 2002 17:30:02 -0000 1.19 @@ -35,7 +35,7 @@ } # Check that this is a community type -if {[dotlrn::parameter community_type_level_p] != 1} { +if {[parameter::get -parameter community_type_level_p] != 1} { ad_returnredirect "./" ad_script_abort } @@ -52,16 +52,16 @@ db_1row select_community_type_info {} 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] + set community_type_title [parameter::get -parameter classes_pretty_plural] + set communities_title [parameter::get -parameter class_instances_pretty_name] + set title [parameter::get -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] + set community_type_title [parameter::get -parameter clubs_pretty_plural] + set communities_title [parameter::get -parameter clubs_pretty_plural] + set title [parameter::get -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 community_type_title [parameter::get -parameter classes_pretty_plural] + set communities_title [parameter::get -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.26 -r1.27 --- openacs-4/packages/dotlrn/www/one-community.tcl 18 May 2002 22:42:11 -0000 1.26 +++ openacs-4/packages/dotlrn/www/one-community.tcl 21 May 2002 17:30:02 -0000 1.27 @@ -26,7 +26,7 @@ } # Check that this is a community type -if {[dotlrn::parameter community_level_p] != 1} { +if {[parameter::get -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.12 -r1.13 --- openacs-4/packages/dotlrn/www/preferences.tcl 18 May 2002 22:42:11 -0000 1.12 +++ openacs-4/packages/dotlrn/www/preferences.tcl 21 May 2002 17:30:02 -0000 1.13 @@ -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 [dotlrn::parameter dotlrn_admin_pretty_name] +set admin_pretty_name [parameter::get -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.2 -r1.3 --- openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 18 May 2002 22:42:11 -0000 1.2 +++ openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 21 May 2002 17:30:02 -0000 1.3 @@ -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 [dotlrn::parameter subcommunity_pretty_name] +set subcomm_pn [parameter::get -parameter subcommunity_pretty_name] set title "Archive $subcomm_pn" form create archive_subcomm 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.14 -r1.15 --- openacs-4/packages/dotlrn/www/subcommunity-new.tcl 18 May 2002 22:42:11 -0000 1.14 +++ openacs-4/packages/dotlrn/www/subcommunity-new.tcl 21 May 2002 17:30:02 -0000 1.15 @@ -28,7 +28,7 @@ set user_id [ad_get_user_id] set parent_community_id [dotlrn_community::get_community_id] -set title "New [dotlrn::parameter subcommunity_pretty_name]" +set title "New [parameter::get -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.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/class-edit.tcl 18 May 2002 22:42:11 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/class-edit.tcl 21 May 2002 17:30:02 -0000 1.5 @@ -33,8 +33,8 @@ ad_script_abort } -set title "Edit [dotlrn::parameter classes_pretty_name] $pretty_name" -set context_bar [list [list classes [dotlrn::parameter classes_pretty_plural]] Edit] +set title "Edit [parameter::get -parameter classes_pretty_name] $pretty_name" +set context_bar [list [list classes [parameter::get -parameter classes_pretty_plural]] Edit] form create edit_class 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.18 -r1.19 --- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 16 May 2002 13:29:15 -0000 1.18 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 21 May 2002 17:30:02 -0000 1.19 @@ -61,7 +61,7 @@ -options {{Open open} {"Needs Approval" "needs approval"} {Closed closed}} element create add_class_instance class_key \ - -label "[dotlrn::parameter classes_pretty_name] Key" \ + -label "[parameter::get -parameter classes_pretty_name] Key" \ -datatype text \ -widget hidden \ -value $class_key @@ -104,7 +104,7 @@ ad_script_abort } -set class_instances_pretty_name [dotlrn::parameter class_instances_pretty_name] +set class_instances_pretty_name [parameter::get -parameter class_instances_pretty_name] set context_bar [list \ {classes Classes} \ 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.10 -r1.11 --- openacs-4/packages/dotlrn/www/admin/class-new.tcl 16 May 2002 13:29:15 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/class-new.tcl 21 May 2002 17:30:02 -0000 1.11 @@ -29,13 +29,13 @@ context_bar:onevalue } -set title "New [dotlrn::parameter classes_pretty_name]" -set context_bar [list [list classes [dotlrn::parameter classes_pretty_plural]] New] +set title "New [parameter::get -parameter classes_pretty_name]" +set context_bar [list [list classes [parameter::get -parameter classes_pretty_plural]] New] form create add_class element create add_class department_key \ - -label [dotlrn::parameter departments_pretty_name] \ + -label [parameter::get -parameter departments_pretty_name] \ -datatype text \ -widget select \ -options [dotlrn_department::select_as_list] \ 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.18 -r1.19 --- openacs-4/packages/dotlrn/www/admin/class.adp 18 May 2002 22:42:11 -0000 1.18 +++ openacs-4/packages/dotlrn/www/admin/class.adp 21 May 2002 17:30:02 -0000 1.19 @@ -37,7 +37,7 @@
  • - Edit <%= [dotlrn::parameter classes_pretty_name] %> properties. + Edit <%= [parameter::get -parameter classes_pretty_name] %> properties.
  • @@ -47,7 +47,7 @@

    [ - New <%= [dotlrn::parameter class_instances_pretty_name] %> + New <%= [parameter::get -parameter class_instances_pretty_name] %> ] @@ -72,7 +72,7 @@

    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.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/class.tcl 18 May 2002 22:42:11 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/class.tcl 21 May 2002 17:30:02 -0000 1.12 @@ -77,7 +77,7 @@ set can_instantiate [dotlrn_class::can_instantiate] -set context_bar [list [list classes [dotlrn::parameter classes_pretty_plural]] $pretty_name] +set context_bar [list [list classes [parameter::get -parameter classes_pretty_plural]] $pretty_name] set referer "[ns_conn url]?[ns_conn query]" ad_return_template 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.10 -r1.11 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 18 May 2002 22:42:11 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 21 May 2002 17:30:02 -0000 1.11 @@ -20,7 +20,7 @@ [ - New <%= [dotlrn::parameter classes_pretty_name] %> + New <%= [parameter::get -parameter classes_pretty_name] %> ] @@ -30,7 +30,7 @@ @@ -41,9 +41,9 @@
    <%= [dotlrn::parameter clubs_pretty_name] %> Name<%= [parameter::get -parameter clubs_pretty_name] %> Name Actions
    Term - <%= [dotlrn::parameter class_instances_pretty_name] %> Name + <%= [parameter::get -parameter class_instances_pretty_name] %> Name Actions
    - <%= [dotlrn::parameter departments_pretty_name] %>:  + <%= [parameter::get -parameter departments_pretty_name] %>: 
    - - - + + + @@ -54,7 +54,7 @@ @@ -65,6 +65,6 @@ [ - New <%= [dotlrn::parameter classes_pretty_name] %> + New <%= [parameter::get -parameter classes_pretty_name] %> ] 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.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/classes.tcl 16 May 2002 13:29:15 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/classes.tcl 21 May 2002 17:30:02 -0000 1.12 @@ -27,7 +27,7 @@ context_bar:onevalue } -set title [dotlrn::parameter classes_pretty_plural] -set context_bar [dotlrn::parameter classes_pretty_plural] +set title [parameter::get -parameter classes_pretty_plural] +set context_bar $title ad_return_template 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.12 -r1.13 --- openacs-4/packages/dotlrn/www/admin/club-new.tcl 18 May 2002 22:42:11 -0000 1.12 +++ openacs-4/packages/dotlrn/www/admin/club-new.tcl 21 May 2002 17:30:02 -0000 1.13 @@ -67,7 +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]]] +set title "New [parameter::get -parameter clubs_pretty_name]" +set context_bar [list [list clubs [parameter::get -parameter clubs_pretty_plural]] $title] 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.10 -r1.11 --- openacs-4/packages/dotlrn/www/admin/club.tcl 18 May 2002 22:42:11 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/club.tcl 21 May 2002 17:30:02 -0000 1.11 @@ -34,6 +34,6 @@ db_1row select_club {} -set context_bar [list [list clubs [dotlrn::parameter clubs_pretty_plural]] $pretty_name] +set context_bar [list [list clubs [parameter::get -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.14 -r1.15 --- openacs-4/packages/dotlrn/www/admin/clubs.adp 18 May 2002 22:42:11 -0000 1.14 +++ openacs-4/packages/dotlrn/www/admin/clubs.adp 21 May 2002 17:30:02 -0000 1.15 @@ -22,14 +22,14 @@ @title@@context_bar@ -[ New <%= [dotlrn::parameter clubs_pretty_name] %> ] +[ New <%= [parameter::get -parameter clubs_pretty_name] %> ]

    <%= [dotlrn::parameter departments_pretty_name] %><%= [dotlrn::parameter classes_pretty_name] %> NameNumber of <%= [dotlrn::parameter class_instances_pretty_plural] %><%= [parameter::get -parameter departments_pretty_name] %><%= [parameter::get -parameter classes_pretty_name] %> NameNumber of <%= [parameter::get -parameter class_instances_pretty_plural] %> Actions
    [ - New <%= [dotlrn::parameter class_instances_pretty_name] %> + New <%= [parameter::get -parameter class_instances_pretty_name] %> ]
    - + @@ -44,5 +44,5 @@ -[ New <%= [dotlrn::parameter clubs_pretty_name] %> ] +[ New <%= [parameter::get -parameter clubs_pretty_name] %> ] 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.8 -r1.9 --- openacs-4/packages/dotlrn/www/admin/clubs.tcl 18 May 2002 22:42:11 -0000 1.8 +++ openacs-4/packages/dotlrn/www/admin/clubs.tcl 21 May 2002 17:30:02 -0000 1.9 @@ -29,8 +29,8 @@ clubs:multirow } -set title [dotlrn::parameter clubs_pretty_plural] -set context_bar [list [dotlrn::parameter clubs_pretty_plural]] +set title [parameter::get -parameter clubs_pretty_plural] +set context_bar [list $title] 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.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/department-edit.tcl 18 May 2002 22:42:11 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/department-edit.tcl 21 May 2002 17:30:02 -0000 1.4 @@ -33,13 +33,13 @@ ad_script_abort } -set title "Edit [dotlrn::parameter departments_pretty_name] $pretty_name" -set context_bar [list [list departments [dotlrn::parameter departments_pretty_plural]] Edit] +set title "Edit [parameter::get -parameter departments_pretty_name] $pretty_name" +set context_bar [list [list departments [parameter::get -parameter departments_pretty_plural]] Edit] form create edit_department element create edit_department department_key \ - -label "[dotlrn::parameter departments_pretty_name] Key (a short name, no spaces)" \ + -label "[parameter::get -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.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/department-new.tcl 18 May 2002 22:42:11 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/department-new.tcl 21 May 2002 17:30:02 -0000 1.5 @@ -27,8 +27,8 @@ context_bar:onevalue } -set title "New [dotlrn::parameter departments_pretty_name]" -set context_bar [list [list departments [dotlrn::parameter departments_pretty_plural]] New] +set title "New [parameter::get -parameter departments_pretty_name]" +set context_bar [list [list departments [parameter::get -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.7 -r1.8 --- openacs-4/packages/dotlrn/www/admin/department.tcl 18 May 2002 22:42:11 -0000 1.7 +++ openacs-4/packages/dotlrn/www/admin/department.tcl 21 May 2002 17:30:02 -0000 1.8 @@ -41,7 +41,7 @@ ad_script_abort } -set context_bar [list [list departments [dotlrn::parameter departments_pretty_plural]] $pretty_name] +set context_bar [list [list departments [parameter::get -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.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/departments.adp 19 May 2002 15:41:35 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/departments.adp 21 May 2002 17:30:02 -0000 1.12 @@ -23,15 +23,15 @@ @context_bar@ [ - New <%= [dotlrn::parameter departments_pretty_name] %> + New <%= [parameter::get -parameter departments_pretty_name] %> ]

    <%= [dotlrn::parameter clubs_pretty_name] %> Name<%= [parameter::get -parameter clubs_pretty_name] %> Name Description Actions
    - + @@ -40,7 +40,7 @@ @@ -51,6 +51,6 @@ [ - New <%= [dotlrn::parameter departments_pretty_name] %> + New <%= [parameter::get -parameter departments_pretty_name] %> ] 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.5 -r1.6 --- openacs-4/packages/dotlrn/www/admin/departments.tcl 19 May 2002 15:41:36 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/departments.tcl 21 May 2002 17:30:02 -0000 1.6 @@ -27,8 +27,8 @@ departments:multirow } -set title [dotlrn::parameter departments_pretty_plural] -set context_bar [dotlrn::parameter departments_pretty_plural] +set title [parameter::get -parameter departments_pretty_plural] +set context_bar [parameter::get -parameter departments_pretty_plural] set referer departments set can_create [dotlrn_class::can_create] 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.5 -r1.6 --- openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.tcl 18 May 2002 22:42:11 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.tcl 21 May 2002 17:30:02 -0000 1.6 @@ -29,12 +29,12 @@ -datatype text \ -widget text \ -html {size 50} \ - -value [dotlrn::parameter auto_dotlrn_user_email_patterns] + -value [parameter::get -parameter auto_dotlrn_user_email_patterns] if {[form is_valid edit_emails]} { form get_values edit_emails emails - dotlrn::parameter -set $emails auto_dotlrn_user_email_patterns + parameter::set_value -parameter auto_dotlrn_user_email_patterns -value $emails 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.17 -r1.18 --- openacs-4/packages/dotlrn/www/admin/index.adp 18 May 2002 22:42:11 -0000 1.17 +++ openacs-4/packages/dotlrn/www/admin/index.adp 21 May 2002 17:30:02 -0000 1.18 @@ -31,10 +31,10 @@ 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.10 -r1.11 --- openacs-4/packages/dotlrn/www/admin/index.tcl 18 May 2002 22:42:11 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/index.tcl 21 May 2002 17:30:02 -0000 1.11 @@ -19,10 +19,9 @@ @author Ben Adida (ben@openforce.net) @creation-date 2001-11-04 -} -query { } -set admin_pretty_name [dotlrn::parameter dotlrn_admin_pretty_name] +set admin_pretty_name [parameter::get -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.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/need-term-note.adp 18 May 2002 22:42:11 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/need-term-note.adp 21 May 2002 17:30:02 -0000 1.5 @@ -20,6 +20,6 @@ Note: You must create terms to be able to create - <%= [dotlrn::parameter class_instances_pretty_plural] %>, since these must be + <%= [parameter::get -parameter class_instances_pretty_plural] %>, since these must be associated with Terms. 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.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/term.adp 18 May 2002 22:42:11 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/term.adp 21 May 2002 17:30:02 -0000 1.12 @@ -60,7 +60,7 @@
    <%= [dotlrn::parameter departments_pretty_name] %> Name<%= [parameter::get -parameter departments_pretty_name] %> Name Actions
    [ - New <%= [dotlrn::parameter classes_pretty_name] %> + New <%= [parameter::get -parameter classes_pretty_name] %> ]
    - <%= [dotlrn::parameter departments_pretty_name] %>:  + <%= [parameter::get -parameter departments_pretty_name] %>:  @@ -76,12 +76,12 @@ - - + + - + 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.12 -r1.13 --- openacs-4/packages/dotlrn/www/admin/user.adp 21 May 2002 07:46:03 -0000 1.12 +++ openacs-4/packages/dotlrn/www/admin/user.adp 21 May 2002 17:30:02 -0000 1.13 @@ -111,7 +111,7 @@
    -

    <%= [dotlrn::parameter class_instances_pretty_name] %> Memberships

    +

    <%= [parameter::get -parameter class_instances_pretty_name] %> Memberships

      @@ -127,7 +127,7 @@
      -

      <%= [dotlrn::parameter clubs_pretty_name] %> Memberships

      +

      <%= [parameter::get -parameter clubs_pretty_name] %> Memberships

        @@ -142,7 +142,7 @@
        -

        <%= [dotlrn::parameter subcommunities_pretty_name] %> Memberships

        +

        <%= [parameter::get -parameter subcommunities_pretty_name] %> Memberships

          Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.tcl 19 May 2002 16:19:46 -0000 1.8 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.tcl 21 May 2002 17:30:03 -0000 1.9 @@ -26,7 +26,7 @@ array set config $cf set community_id $config(community_id) -set subcomm_pretty_plural [dotlrn::parameter subcommunities_pretty_plural] +set subcomm_pretty_plural [parameter::get -parameter subcommunities_pretty_plural] set subcomm_data [dotlrn_community::get_subcomm_chunk -community_id $community_id] set has_subcomm_p 0 Index: openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl 14 May 2002 21:42:16 -0000 1.19 +++ openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl 21 May 2002 17:30:03 -0000 1.20 @@ -93,7 +93,7 @@ set content_id [static_portal_content::new \ -package_id $community_id \ -content " " \ - -pretty_name "[dotlrn::parameter clubs_pretty_name] Info" + -pretty_name "[parameter::get -parameter clubs_pretty_name] Info" ] static_portal_content::add_to_portal -content_id $content_id -portal_id $portal_id @@ -103,15 +103,15 @@ set content_id [static_portal_content::new \ -package_id $community_id \ -content " " \ - -pretty_name "[dotlrn::parameter subcommunities_pretty_name] Info" + -pretty_name "[parameter::get -parameter subcommunities_pretty_name] Info" ] static_portal_content::add_to_portal -content_id $content_id -portal_id $portal_id } else { set content_id [static_portal_content::new \ -package_id $community_id \ -content " " \ - -pretty_name "[dotlrn::parameter class_instances_pretty_name] Info" + -pretty_name "[parameter::get -parameter class_instances_pretty_name] Info" ] static_portal_content::add_to_portal -content_id $content_id -portal_id $portal_id
    <%= [dotlrn::parameter departments_pretty_name] %><%= [dotlrn::parameter classes_pretty_name] %><%= [parameter::get -parameter departments_pretty_name] %><%= [parameter::get -parameter classes_pretty_name] %> Term <%= [dotlrn::parameter class_instances_pretty_name] %><%= [parameter::get -parameter class_instances_pretty_name] %> Actions