[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /auth lonroles.pm
raeburn
raeburn@source.lon-capa.org
Sat, 02 Jan 2010 18:41:56 -0000
raeburn Sat Jan 2 18:41:56 2010 EDT
Modified files: (Branch: version_2_9_X)
/loncom/auth lonroles.pm
Log:
- Backport 1.234.
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.231.4.4 loncom/auth/lonroles.pm:1.231.4.5
--- loncom/auth/lonroles.pm:1.231.4.4 Sat Jan 2 18:33:24 2010
+++ loncom/auth/lonroles.pm Sat Jan 2 18:41:56 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.231.4.4 2010/01/02 18:33:24 raeburn Exp $
+# $Id: lonroles.pm,v 1.231.4.5 2010/01/02 18:41:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -659,11 +659,11 @@
if ($reinit) {
$r->print(
'<h3><span class="LC_error">'.
- &mt('As your session file for the course has expired, you will need to re-select the course.').'</span></h3>');
+ &mt('As your session file for the course or community has expired, you will need to re-select the course.').'</span></h3>');
} else {
$r->print(
'<h3><span class="LC_error">'.
- &mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
+ &mt('You need to choose another user role or enter a specific course or community for this function').'</span></h3>');
}
}
}
@@ -720,11 +720,12 @@
# No active roles
if ($countactive==0) {
if ($inrole) {
- $r->print('<h2>'.&mt('Currently no additional roles or courses').'</h2>');
+ $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
} else {
- $r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
+ $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
}
&findcourse_advice($r);
+ &requestcourse_advice($r);
$r->print('</form>');
if ($countfuture) {
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -1158,12 +1159,66 @@
} else {
$r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
}
- $r->print('<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
- $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
+ $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
+ '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
+ $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
&queued_selfenrollment($r);
return;
}
+sub requestcourse_advice {
+ my ($r) = @_;
+ my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+ my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+ my (%can_request,%request_doms);
+ &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
+ if (keys(%request_doms) > 0) {
+ my ($types,$typename) = &Apache::loncommon::course_types();
+ if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
+ $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
+ '<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
+ my (@reqdoms,@reqtypes);
+ foreach my $type (sort(keys(%request_doms))) {
+ push(@reqtypes,$type);
+ if (ref($request_doms{$type}) eq 'ARRAY') {
+ my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
+ $r->print(
+ '<li>'
+ .&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
+ '<i>',
+ '</i>',
+ '<b>'.$domstr.'</b>')
+ .'</li>'
+ );
+ foreach my $dom (@{$request_doms{$type}}) {
+ unless (grep(/^\Q$dom\E/,@reqdoms)) {
+ push(@reqdoms,$dom);
+ }
+ }
+ }
+ }
+ my @showtypes;
+ foreach my $type (@{$types}) {
+ if (grep(/^\Q$type\E$/,@reqtypes)) {
+ push(@showtypes,$type);
+ }
+ }
+ my $requrl = '/adm/requestcourse';
+ if (@reqdoms == 1) {
+ $requrl .= '?showdom='.$reqdoms[0];
+ }
+ if (@showtypes > 0) {
+ $requrl.=(($requrl=~/\?/)?'&':'?').'crstype='.$showtypes[0];
+ }
+ if (@reqdoms == 1 || @showtypes > 0) {
+ $requrl .= '&state=crstype&action=new';
+ }
+ $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
+ }
+ }
+ return;
+}
+
sub queued_selfenrollment {
my ($r) = @_;
my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
@@ -1470,8 +1525,8 @@
sub coursepick_jscript {
my %lt = &Apache::lonlocal::texthash(
- plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.",
- youc => 'You can only use this screen to select courses in the current domain.',
+ plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.",
+ youc => 'You can only use this screen to select courses and communities in the current domain.',
);
my $verify_script = <<"END";
<script type="text/javascript">