--- loncom/interface/loncreateuser.pm 2008/08/12 10:19:40 1.259
+++ loncom/interface/loncreateuser.pm 2008/11/27 15:15:06 1.264
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.259 2008/08/12 10:19:40 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.264 2008/11/27 15:15:06 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,11 +33,13 @@ package Apache::loncreateuser;
=head1 NAME
-Apache::loncreateuser - handler to create users and custom roles
+Apache::loncreateuser.pm
=head1 SYNOPSIS
-Apache::loncreateuser provides an Apache handler for creating users,
+ Handler to create users and custom roles
+
+ Provides an Apache handler for creating users,
editing their login parameters, roles, and removing roles, and
also creating and assigning custom roles.
@@ -833,10 +835,10 @@ ENDNOPORTPRIV
$addrolesdisplay = $add_domainroles;
}
$r->print(&course_level_dc($env{'request.role.domain'},'Course'));
- $r->print(' '."\n");
+ $r->print(' '."\n");
} elsif ($context eq 'author') {
if ($addrolesdisplay) {
- $r->print(' print(' print(' onClick="auth_check()" \>'."\n");
} else {
@@ -848,7 +850,7 @@ ENDNOPORTPRIV
}
} else {
$r->print(&course_level_table(%inccourses));
- $r->print(' '."\n");
+ $r->print(' '."\n");
}
}
$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
@@ -2605,7 +2607,7 @@ sub custom_role_editor {
my @template_roles = ("cc","in","ta","ep","st");
foreach my $role (@template_roles) {
$head_script .= &make_script_template($role);
- $button_code .= &make_button_code($role);
+ $button_code .= &make_button_code($role).' ';
}
$head_script .= "\n".$jsback."\n".''."\n";
$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
@@ -2625,10 +2627,15 @@ sub custom_role_editor {
'crl' => "Course Level",
'dml' => "Domain Level",
'ssl' => "System Level");
- $r->print(&mt('Select a Template').' ');
- $r->print('
');
+
+ $r->print('
'
+ .''
+ .'
'
+ );
+
$r->print(<
@@ -2731,7 +2738,7 @@ sub make_script_template {
sub make_button_code {
my ($role) = @_;
my $label = &Apache::lonnet::plaintext($role);
- my $button_code = '';
+ my $button_code = '';
return ($button_code);
}
# ---------------------------------------------------------- Call to definerole
@@ -3609,9 +3616,9 @@ sub visible_in_cat {
dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
);
- $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','','');
- $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','','');
- $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','','');
+ $visactions{'unhide'} = &mt('Use [_1]Set course environment[_2] to change the "Exclude from course catalog" setting.','"','"');
+ $visactions{'chgcat'} = &mt('Use [_1]Set course environment[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"','"');
+ $visactions{'addcat'} = &mt('Use [_1]Set course environment[_2] to assign a category to the course.','"','"');
if (ref($domconf{'coursecategories'}) eq 'HASH') {
if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
$settable{'togglecats'} = 1;
@@ -3621,11 +3628,11 @@ sub visible_in_cat {
}
$cathash = $domconf{'coursecategories'}{'cats'};
}
- if ($settable{'togglecats'} && $settable{'categories'}) {
+ if ($settable{'togglecats'} && $settable{'categorize'}) {
$cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.');
} elsif ($settable{'togglecats'}) {
$cansetvis = &mt('You are able to choose to exclude this course from the catalog, but only a Domain Coordinator may assign a course category.');
- } elsif ($settable{'categories'}) {
+ } elsif ($settable{'categorize'}) {
$cansetvis = &mt('You may assign a course category, but only a Domain Coordinator may choose to exclude this course from the catalog.');
} else {
$cansetvis = &mt('Only a Domain Coordinator may assign a course category or choose to exclude this course from the catalog.');
@@ -3679,7 +3686,7 @@ sub visible_in_cat {
}
}
if (!$matched) {
- if ($settable{'categories'}) {
+ if ($settable{'categorize'}) {
push(@vismsgs,'chgcat');
} else {
push(@vismsgs,'dc_chgcat');
@@ -3692,7 +3699,7 @@ sub visible_in_cat {
if (ref($cathash) eq 'HASH') {
if ((keys(%{$cathash}) > 1) ||
(keys(%{$cathash}) == 1) && ($cathash->{'instcode::0'} eq '')) {
- if ($settable{'categories'}) {
+ if ($settable{'categorize'}) {
push(@vismsgs,'addcat');
} else {
push(@vismsgs,'dc_addcat');