--- loncom/interface/loncreateuser.pm 2010/03/11 15:48:33 1.329.2.2
+++ loncom/interface/loncreateuser.pm 2010/08/09 23:39:43 1.329.2.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.329.2.2 2010/03/11 15:48:33 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.329.2.3 2010/08/09 23:39:43 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -497,8 +497,14 @@ sub print_username_entry_form {
'onload' => "javascript:setFormElements(document.$formtoset)",
);
my %breadcrumb_text = &singleuser_breadcrumb($crstype);
+ my $title = 'User Management';
+ if ($context eq 'course') {
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Enrollment and Student Activity';
+ }
+ }
my $start_page =
- &Apache::loncommon::start_page('User Management',
+ &Apache::loncommon::start_page($title,
$jscript,{'add_entries' => \%loaditems,});
if ($env{'form.action'} eq 'custom') {
&Apache::lonhtmlcommon::add_breadcrumb
@@ -516,7 +522,7 @@ sub print_username_entry_form {
} elsif ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
}
- my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
+ my $crumbs = &Apache::lonhtmlcommon::breadcrumbs($title,
$helpitem);
my %lt=&Apache::lonlocal::texthash(
'srst' => 'Search for a user and enroll as a student',
@@ -792,7 +798,13 @@ ENDSCRIPT
if ($context eq 'requestcrs') {
$r->print('
');
} else {
- $r->print(&Apache::loncommon::start_page('User Management',$jscript));
+ my $title = 'User Management';
+ if ($context eq 'course') {
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Enrollment and Student Activity';
+ }
+ }
+ $r->print(&Apache::loncommon::start_page($title,$jscript));
my %breadcrumb_text = &singleuser_breadcrumb($crstype);
&Apache::lonhtmlcommon::add_breadcrumb
@@ -803,13 +815,13 @@ ENDSCRIPT
text=>$breadcrumb_text{'userpicked'},
faq=>282,bug=>'Instructor Interface',});
if ($env{'form.action'} eq 'singleuser') {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
'Course_Change_Privileges'));
$r->print("$lt{'usrch'}
");
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype));
$r->print('
'.$lt{'usel'}.'
');
} elsif ($env{'form.action'} eq 'singlestudent') {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
'Course_Add_Student'));
$r->print($jscript."");
if ($crstype eq 'Community') {
@@ -994,8 +1006,14 @@ sub print_user_modification_page {
if ($env{'form.popup'}) {
$args->{'no_nav_bar'} = 1;
}
+ my $title = 'User Management';
+ if ($context eq 'course') {
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Enrollment and Student Activity';
+ }
+ }
my $start_page =
- &Apache::loncommon::start_page('User Management',$js,$args);
+ &Apache::loncommon::start_page($title,$js,$args);
my %breadcrumb_text = &singleuser_breadcrumb($crstype);
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage($form)",
@@ -1016,7 +1034,7 @@ sub print_user_modification_page {
if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
}
- my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management',
+ my $crumbs = &Apache::lonhtmlcommon::breadcrumbs($title,
$helpitem);
my $forminfo =<<"ENDFORMINFO";
@@ -2204,7 +2222,13 @@ sub update_user_data {
if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
}
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ my $title = 'User Management';
+ if ($context eq 'course') {
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Enrollment and Student Activity';
+ }
+ }
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
$helpitem));
$r->print(&update_result_form($uhome));
# Check Inputs
@@ -3631,6 +3655,12 @@ sub custom_role_editor {
$context = 'domain';
$crstype = $env{'form.templatecrstype'};
}
+ my $title = 'User Management';
+ if ($context eq 'course') {
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Enrollment and Student Activity';
+ }
+ }
# ------------------------------------------------------- What can be assigned?
my %full=();
my %courselevel=();
@@ -3746,7 +3776,7 @@ sub custom_role_editor {
{href=>"javascript:backPage(document.form1,'','')",
text=>"Edit custom role",
faq=>282,bug=>'Instructor Interface',});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
'Course_Editing_Custom_Roles'));
$r->print($body_top);
@@ -3899,7 +3929,12 @@ sub set_custom_role {
.$jsback."\n"
.'// ]]>'."\n"
.''."\n";
-
+ my $title = 'User Management';
+ if ($context eq 'course') {
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Enrollment and Student Activity';
+ }
+ }
$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.customresult,'pickrole','')",
@@ -3911,7 +3946,7 @@ sub set_custom_role {
{href=>"javascript:backPage(document.customresult,'set_custom_roles','')",
text=>"Result",
faq=>282,bug=>'Instructor Interface',});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management',
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($title,
'Course_Editing_Custom_Roles'));
my ($rdummy,$roledef)=
@@ -3989,6 +4024,12 @@ sub handler {
} else {
$context = 'domain';
}
+ my $title = 'User Management';
+ if ($context eq 'course') {
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Enrollment and Student Activity';
+ }
+ }
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
'username','domain','srchterm','srchdomain','srchin','srchby','srchtype']);
@@ -3996,7 +4037,7 @@ sub handler {
if ($env{'form.action'} ne 'dateselect') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createuser",
- text=>"User Management",
+ text=>$title,
help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'});
}
#SD Following files not added to help, because the corresponding .tex-files seem to
@@ -4016,7 +4057,7 @@ sub handler {
# Main switch on form.action and form.state, as appropriate
if (! exists($env{'form.action'})) {
$r->print(&header());
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($title));
$r->print(&print_main_menu($permission,$context,$crstype));
$r->print(&Apache::loncommon::end_page());
} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
@@ -4272,7 +4313,7 @@ sub handler {
$r->print(&Apache::loncommon::end_page());
} else {
$r->print(&header());
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs($title));
$r->print(&print_main_menu($permission,$context,$crstype));
$r->print(&Apache::loncommon::end_page());
}
@@ -4552,7 +4593,7 @@ sub print_gci_main_menu {
drop => 'Drop Students',
upload => 'Upload a File of Course Users',
singleuser => 'Add/Modify a Course User',
- listusers => 'Manage Course Users',
+ listusers => 'Concept Test Roster and Student Activity',
},
);
my %linktitles = (