--- loncom/interface/loncreateuser.pm 2009/08/04 18:02:30 1.301
+++ loncom/interface/loncreateuser.pm 2009/08/06 05:48:56 1.304
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.301 2009/08/04 18:02:30 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.304 2009/08/06 05:48:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -248,13 +248,15 @@ sub build_tools_display {
&Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef,
$context);
if ($userenv{$context.'.'.$item} eq '') {
- $custom_access = 'default';
+ $custom_access =
+ &mt('Availability determined currently from default setting.');
if (!$curr_access) {
$tool_off = 'checked="checked" ';
$tool_on = '';
}
} else {
- $custom_access = 'custom';
+ $custom_access =
+ &mt('Availability determined currently from custom setting.');
$cust_on = ' checked="checked" ';
$cust_off = '';
if ($userenv{$context.'.'.$item} == 0) {
@@ -266,8 +268,7 @@ sub build_tools_display {
'
'.$lt{$item}.' '."\n".
' '."\n".
&Apache::loncommon::start_data_table_row()."\n".
- ' '.&mt('Availability determined currently from [_1] setting.',$custom_access).
- ' '.$lt{'avai'}.': '.
+ ' '.$custom_access.(' 'x5).$lt{'avai'}.': '.
($curr_access?&mt('Yes'):&mt('No')).' '."\n".
&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::start_data_table_row()."\n".
@@ -530,7 +531,7 @@ END
# =================================================================== Phase two
sub print_user_selection_page {
- my ($r,$response,$srch,$srch_results,$srcharray,$context) = @_;
+ my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements) = @_;
my @fields = ('username','domain','lastname','firstname','permanentemail');
my $sortby = $env{'form.sortby'};
@@ -566,28 +567,32 @@ ENDSCRIPT
'firstname' => "first name",
'permanentemail' => "permanent e-mail",
);
- $r->print(&Apache::loncommon::start_page('User Management',$jscript));
+ if ($context eq 'requestcrs') {
+ $r->print('');
+ } else {
+ $r->print(&Apache::loncommon::start_page('User Management',$jscript));
- my %breadcrumb_text = &singleuser_breadcrumb();
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:backPage(document.usersrchform,'','')",
- text=>$breadcrumb_text{'search'},
- faq=>282,bug=>'Instructor Interface',},
- {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
- text=>$breadcrumb_text{'userpicked'},
- faq=>282,bug=>'Instructor Interface',});
- if ($env{'form.action'} eq 'singleuser') {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
- 'Course_Change_Privileges'));
- $r->print("$lt{'usrch'} ");
- $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
- $r->print('
'.$lt{'usel'}.' ');
- } elsif ($env{'form.action'} eq 'singlestudent') {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
- 'Course_Add_Student'));
- $r->print($jscript."$lt{'stusrch'} ");
- $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
- $r->print(''.$lt{'stusel'}.' ');
+ my %breadcrumb_text = &singleuser_breadcrumb();
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"javascript:backPage(document.usersrchform,'','')",
+ text=>$breadcrumb_text{'search'},
+ faq=>282,bug=>'Instructor Interface',},
+ {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
+ text=>$breadcrumb_text{'userpicked'},
+ faq=>282,bug=>'Instructor Interface',});
+ if ($env{'form.action'} eq 'singleuser') {
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ 'Course_Change_Privileges'));
+ $r->print("$lt{'usrch'} ");
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
+ $r->print(''.$lt{'usel'}.' ');
+ } elsif ($env{'form.action'} eq 'singlestudent') {
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ 'Course_Add_Student'));
+ $r->print($jscript."$lt{'stusrch'} ");
+ $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
+ $r->print(''.$lt{'stusel'}.' ');
+ }
}
$r->print(''.&Apache::loncommon::end_page());
+ if ($context eq 'requestcrs') {
+ $r->print($opener_elements.'');
+ } else {
+ $r->print($response.''.&Apache::loncommon::end_page());
+ }
}
sub print_user_query_page {
@@ -815,6 +836,7 @@ ENDTITLE
&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);
+#FIXME
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($ccdomain,'hserver',
'default','hide');
@@ -826,6 +848,13 @@ $lt{'hs'}: $home_server_pick
} else {
$r->print($home_server_pick);
}
+ if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+ $r->print(''.&mt('User Can Request Creation of Courses in this Domain?').' '.
+ &Apache::loncommon::start_data_table().
+ &build_tools_display($ccuname,$ccdomain,
+ 'requestcourses').
+ &Apache::loncommon::end_data_table());
+ }
$r->print(''."\n".''.
$lt{'lg'}.' ');
my ($fixedauth,$varauth,$authmsg);
@@ -5114,8 +5143,7 @@ ENDSCRIPT
# Table Header
my $tableheader =
- &Apache::loncommon::start_data_table()
- .&Apache::loncommon::start_data_table_header_row()
+ &Apache::loncommon::start_data_table_header_row()
.'
'
.'
'.&mt('When').' '
.'
'.&mt('Who made the change').' '
@@ -5200,15 +5228,22 @@ sub role_display_filter {
}
$output .= '
'.$lt{$chgtype}.' '."\n";
}
- $output .= ''.
- '
'.
- '
'.
- '
'.
- &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
+ $output .= ''
+ .'';
+
+ # Update Display button
+ $output .= ''
+ .' '
+ .'
';
+
+ # Server version info
+ $output .= ''
+ .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+ ,'2.6.99.0');
if ($version) {
- $output .= ' '.&mt('This server is version [_3].','',' ',$version); }
- $output .= '
';
+ $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
+ }
+ $output .= '
';
return $output;
}