[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm
raeburn
raeburn@source.lon-capa.org
Fri, 30 Oct 2009 00:19:49 -0000
raeburn Fri Oct 30 00:19:49 2009 EDT
Modified files:
/loncom/interface lonmenu.pm
Log:
- Role selector: co instead of cc for communities.
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.297 loncom/interface/lonmenu.pm:1.298
--- loncom/interface/lonmenu.pm:1.297 Thu Oct 29 16:15:57 2009
+++ loncom/interface/lonmenu.pm Fri Oct 30 00:19:49 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.297 2009/10/29 16:15:57 raeburn Exp $
+# $Id: lonmenu.pm,v 1.298 2009/10/30 00:19:49 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -235,7 +235,7 @@
if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
# special treatment for role selector
- my $roles_selector = roles_selector(
+ my $roles_selector = &roles_selector(
$env{'course.' . $env{'request.course.id'} . '.domain'},
$env{'course.' . $env{'request.course.id'} . '.num'} );
@@ -1794,16 +1794,19 @@
sub roles_selector {
my ($cdom,$cnum) = @_;
- my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
- if ($crstype eq '') {
- $crstype = 'Course';
- }
+ my $crstype = &Apache::loncommon::course_type();
my $now = time;
my (%courseroles,%seccount);
my $is_cc;
my $role_selector;
- if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) {
- my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum});
+ my $ccrole;
+ if ($crstype eq 'Community') {
+ $ccrole = 'co';
+ } else {
+ $ccrole = 'cc';
+ }
+ if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
+ my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
if ((($start) && ($start<0)) ||
(($end) && ($end<$now)) ||
@@ -1853,7 +1856,7 @@
} else {
$switchtext = &mt('Switch course role to...')
}
- my @roles_order = ('cc','in','ta','ep','ad','st');
+ my @roles_order = ($ccrole,'in','ta','ep','ad','st');
if (keys(%courseroles) > 1) {
$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles);
$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
@@ -1861,7 +1864,7 @@
$role_selector .= '<option value="">'.$switchtext.'</option>';
foreach my $role (@roles_order) {
if (defined($courseroles{$role})) {
- $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>';
+ $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>';
}
}
foreach my $role (sort(keys(%courseroles))) {