version 1.240.2.20, 2010/12/05 16:31:53
|
version 1.240.2.21, 2010/12/05 16:35:58
|
Line 500 ENDENTERKEY
|
Line 500 ENDENTERKEY
|
$courseid = substr($courseid, 1); |
$courseid = substr($courseid, 1); |
} |
} |
$courseid =~ s/\//_/; |
$courseid =~ s/\//_/; |
if (($cdom ne 'gcitest') && (($role eq 'cc') || ($role eq 'co')) |
if (($cdom !~ /^\w+citest$/) && (($role eq 'cc') || ($role eq 'co')) |
&& ($env{'course.' . $courseid .'.course.helper.not.run'})) { |
&& ($env{'course.' . $courseid .'.course.helper.not.run'})) { |
$furl = "/adm/helper/course.initialization.helper"; |
$furl = "/adm/helper/course.initialization.helper"; |
# Send the user to the course they selected |
# Send the user to the course they selected |
Line 524 ENDENTERKEY
|
Line 524 ENDENTERKEY
|
.$env{'request.course.sec'}) |
.$env{'request.course.sec'}) |
) { |
) { |
my $startpage = &courseloadpage($courseid); |
my $startpage = &courseloadpage($courseid); |
unless (($startpage eq 'firstres') || ($cdom eq 'gcitest')) { |
unless (($startpage eq 'firstres') || ($cdom =~ /^\w+citest$/)) { |
$msg = &mt('Entering [_1] ...', |
$msg = &mt('Entering [_1] ...', |
$env{'course.'.$courseid.'.description'}); |
$env{'course.'.$courseid.'.description'}); |
&redirect_user($r,&mt('New in course'), |
&redirect_user($r,&mt('New in course'), |
Line 539 ENDENTERKEY
|
Line 539 ENDENTERKEY
|
# Guess not ... |
# Guess not ... |
$furl=&Apache::lonpageflip::first_accessible_resource(); |
$furl=&Apache::lonpageflip::first_accessible_resource(); |
} |
} |
if (($cdom eq 'gcitest') && ($custommenu)) { |
if (($cdom =~ /^\w+citest$/) && ($custommenu)) { |
$furl = '/adm/navmaps'; |
$furl = '/adm/navmaps'; |
} |
} |
$msg = &mt('Entering [_1] ...', |
$msg = &mt('Entering [_1] ...', |
Line 775 ENDHEADER
|
Line 775 ENDHEADER
|
$r->print(&Apache::loncoursequeueadmin::queued_selfenrollment()); |
$r->print(&Apache::loncoursequeueadmin::queued_selfenrollment()); |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); |
unless ($env{'user.domain'} eq 'gcitest') { |
unless ($env{'user.domain'} =~ /^\w+citest$/) { |
$r->print( |
$r->print( |
'<p>' |
'<p>' |
.&mt('[_1]Visit the [_2]Course/Community Catalog[_3]' |
.&mt('[_1]Visit the [_2]Course/Community Catalog[_3]' |
Line 799 ENDHEADER
|
Line 799 ENDHEADER
|
$r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>'); |
$r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>'); |
} else { |
} else { |
if ($show_course) { |
if ($show_course) { |
if ($env{'user.domain'} eq 'gcitest') { |
if ($env{'user.domain'} =~ /^\w+citest$/) { |
$r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>'); |
$r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>'); |
} elsif ($env{'user.domain'} eq 'gci') { |
} elsif ($env{'user.domain'} =~ /ci$/) { |
$r->print('<h2>'.&mt('Currently not assigned as a GCI contributor').'</h2>'); |
$r->print('<h2>'.&mt('Currently not assigned as a GCI contributor').'</h2>'); |
} |
} |
} else { |
} else { |
$r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>'); |
$r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>'); |
} |
} |
} |
} |
unless ($env{'user.domain'} eq 'gcitest') { |
unless ($env{'user.domain'} =~ /^\w+citest$/) { |
&findcourse_advice($r); |
&findcourse_advice($r); |
&requestcourse_advice($r); |
&requestcourse_advice($r); |
} |
} |
$r->print('</form>'); |
$r->print('</form>'); |
if ($countfuture) { |
if ($countfuture) { |
if ($show_course) { |
if ($show_course) { |
if ($env{'user.domain'} eq 'gcitest') { |
if ($env{'user.domain'} =~ /^\w+citest$/) { |
$r->print(&mt('The following [quant,_1,Concept Test] will be available in the future:',$countfuture)); |
$r->print(&mt('The following [quant,_1,Concept Test] will be available in the future:',$countfuture)); |
} else { |
} else { |
$r->print(&mt('The following [quant,_1,course] will become active in the future:',$countfuture)); |
$r->print(&mt('The following [quant,_1,course] will become active in the future:',$countfuture)); |