--- loncom/auth/lonroles.pm 2006/06/22 23:22:47 1.158
+++ loncom/auth/lonroles.pm 2006/10/10 20:16:19 1.166
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.158 2006/06/22 23:22:47 albertel Exp $
+# $Id: lonroles.pm,v 1.166 2006/10/10 20:16:19 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,8 +53,8 @@ sub redirect_user {
my $swinfo=&Apache::lonmenu::rawconfig();
my $navwindow;
if ($launch_nav eq 'on') {
- $navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
- ($url =~ m-^/adm/whatsnew-));
+ $navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
+ ($url =~ m-^/adm/whatsnew-));
} else {
$navwindow.=&Apache::lonnavmaps::close();
}
@@ -266,15 +266,14 @@ ENDENTERKEY
}
return OK;
} else {
- my $type = 'Course/Group';
if (!$env{'request.course.id'}) {
- $type = &Apache::loncommon::course_type();
&Apache::lonnet::appenv(
"request.course.id" => $cdom.'_'.$cnum);
$furl='/adm/roles?tryagain=1';
$msg=
'
'.
- &mt('Could not initialize '.lc($type).' at this time.').
+ &mt('Could not initialize [_1] at this time.',
+ $env{'course.'.$cdom.'_'.$cnum.'.description'}).
'
'.&mt('Please try again.').'
'.$ferr;
}
if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
@@ -303,7 +302,8 @@ ENDENTERKEY
) {
my $startpage = &courseloadpage($courseid);
unless ($startpage eq 'firstres') {
- $msg = &mt('Entering '.lc($type).' ....');
+ $msg = &mt('Entering [_1] ....',
+ $env{'course.'.$courseid.'.description'});
&redirect_user($r,&mt('New in course'),
'/adm/whatsnew?refpage=start',$msg,
$env{'environment.remotenavmap'});
@@ -316,8 +316,10 @@ ENDENTERKEY
# Guess not ...
$furl=&Apache::lonpageflip::first_accessible_resource();
}
- $msg = &mt('Entering '.lc($type).' ...');
- &redirect_user($r,&mt('Entering '.$type),
+ $msg = &mt('Entering [_1] ...',
+ $env{'course.'.$courseid.'.description'});
+ &redirect_user($r,&mt('Entering [_1]',
+ $env{'course.'.$courseid.'.description'}),
$furl,$msg,
$env{'environment.remotenavmap'});
}
@@ -362,10 +364,10 @@ ENDENTERKEY
my $start_page=&Apache::loncommon::start_page('User Roles');
my $standby=&mt('Role selected. Please stand by.');
$standby=~s/\n/\\n/g;
- my $helptag=''.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).' |
';
+
$r->print(<
+