--- loncom/interface/loncreateuser.pm 2009/02/05 12:19:50 1.277
+++ loncom/interface/loncreateuser.pm 2009/04/29 16:57:29 1.292
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.277 2009/02/05 12:19:50 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.292 2009/04/29 16:57:29 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -227,9 +227,9 @@ sub build_tools_display {
'official' => 'Can request creation of official courses',
'unofficial' => 'Can request creation of unofficial courses',
);
- if ($context eq 'requestcourse') {
+ if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
- 'requestcourse.official','requestcourse.unofficial');
+ 'requestcourses.official','requestcourses.unofficial');
@usertools = ('official','unofficial');
} else {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
@@ -337,7 +337,7 @@ sub print_username_entry_form {
'dom' => "Domain",
'ecrp' => "Edit Custom Role Privileges",
'nr' => "Name of Role",
- 'cre' => "Custom Role Editor",
+ 'cre' => "Next",
);
$r->print($start_page."\n".$crumbs);
if ($env{'form.action'} eq 'custom') {
@@ -347,7 +347,7 @@ sub print_username_entry_form {
$lt{'ecrp'}
-$lt{'nr'}: $choice
+$choice $lt{'nr'}:
ENDCUSTOM
@@ -631,7 +631,7 @@ sub print_user_modification_page {
&Apache::lonuserutils::can_create_user($ccdomain,$context,
$usertype);
if (!$cancreate) {
- my $helplink = ' href="javascript:helpMenu('."'display'".')"';
+ my $helplink = 'javascript:helpMenu('."'display'".')';
my %usertypetext = (
official => 'institutional',
unofficial => 'non-institutional',
@@ -641,7 +641,12 @@ sub print_user_modification_page {
$response = ''.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).
' ';
}
- $response .= ''.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the helpdesk for assistance.',$helplink).'
';
+ $response .= '
'
+ .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
+ .' '
+ .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+ ,'','')
+ .'
'.
&Apache::loncommon::start_data_table().
- &build_tools_display($ccuname,$ccdomain,'requestcourse').
+ &build_tools_display($ccuname,$ccdomain,'requestcourses').
&Apache::loncommon::end_data_table());
}
$r->print('');
@@ -901,7 +906,7 @@ ENDNOPORTPRIV
if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) {
my %lt=&Apache::lonlocal::texthash(
'utav' => "User Tools Availability",
- 'yodo' => "You do not have privileges to modify Portfolio, Blog or Home Page settings for this user.",
+ 'yodo' => "You do not have privileges to modify Portfolio, Blog or Personal Information Page settings for this user.",
'ifch' => "If a change is required, contact a domain coordinator for the domain",
);
$user_tools_text = <print('
'.
&Apache::loncommon::start_data_table().
@@ -2178,6 +2324,10 @@ sub update_user_data {
$lt{'id'}
$lt{'mail'}
END
+ if ($showinststatus) {
+ $r->print("
+
$lt{'inststatus'}
\n");
+ }
if ($showrequestcourses) {
foreach my $item (@requestcourses) {
$r->print("
@@ -2205,6 +2355,10 @@ END
$userenv{'id'}
$userenv{'permanentemail'}
END
+ if ($showinststatus) {
+ $r->print("
+
$oldinststatuses
\n");
+ }
if ($showrequestcourses) {
foreach my $item (@requestcourses) {
$r->print("
@@ -2232,6 +2386,10 @@ END
$env{'form.cid'}
$env{'form.cpermanentemail'}
END
+ if ($showinststatus) {
+ $r->print("
+
$newinststatuses
\n");
+ }
if ($showrequestcourses) {
foreach my $item (@requestcourses) {
$r->print("
@@ -2281,13 +2439,14 @@ END
# but we can still tell them what the name and quota and availabilities are
my %lt=&Apache::lonlocal::texthash(
'id' => "Student/Employee ID",
- 'mail' => "Permanent e-mail",
+ 'mail' => "Permanent e-mail address",
'disk' => "Disk space allocated to user's portfolio files",
'blog' => "Blog Availability",
- 'aboutme' => "Home Page Availability",
+ 'aboutme' => "Personal Information Page Availability",
'portfolio' => "Portfolio Availability",
'official' => "Can Request Official Courses",
'unofficial' => "Can Request Unofficial Course",
+ 'inststatus' => "Affiliation",
);
$r->print(<<"END");
$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
@@ -2296,6 +2455,9 @@ END
$r->print(' ['.$lt{'mail'}.': '.
$userenv{'permanentemail'}.']');
}
+ if ($showinststatus) {
+ $r->print(' ['.$lt{'inststatus'}.': '.$oldinststatuses.']');
+ }
if ($showrequestcourses) {
foreach my $item (@requestcourses) {
$r->print(' ['.$lt{$item}.': '.$newaccess{$item}.' '.
@@ -2337,8 +2499,11 @@ END
} else {
$r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname));
}
- $r->print(''.$rolestr.' '.
- &mt('Contact your helpdesk for more information.',"javascript:helpMenu('display')").' ');
+ my $helplink = 'javascript:helpMenu('."'display'".')';
+ $r->print(''.$rolestr.' '
+ .&mt('Please contact your [_1]helpdesk[_2] for more information.'
+ ,'','')
+ .' ');
}
$r->print(''
.$no_forceid_alert
@@ -2397,9 +2562,9 @@ sub tool_changes {
} else {
$oldaccesstext->{$tool} = &mt("availability set to 'off'");
}
- $changeHash->{$context.'.'.$tool} = $userenv->{'tools.'.$tool};
+ $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool};
if ($env{'form.custom'.$tool} == 1) {
- if ($env{'form.'.$context.'_'.$tool} ne $userenv->{'tools.'.$tool}) {
+ if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) {
$changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool},
$changeHash,$context);
if ($changed->{$tool}) {
@@ -2823,7 +2988,7 @@ sub quota_admin {
sub tool_admin {
my ($tool,$settool,$changeHash,$context) = @_;
my $canchange = 0;
- if ($context eq 'requestcourse') {
+ if ($context eq 'requestcourses') {
if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
$canchange = 1;
}
@@ -2993,14 +3158,14 @@ ENDCCF
my $privtext = &Apache::lonnet::plaintext($priv);
$r->print(&Apache::loncommon::start_data_table_row().
'