';
foreach my $key (sort(keys(%{$disallowed}))) {
@@ -1178,8 +1073,8 @@ sub get_course {
}
sub get_jscript {
- my ($cdom,$phase,$crstype) = @_;
- my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
+ my ($cdom,$phase) = @_;
+ my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
my ($jscript,$categorize_js);
my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
@@ -1286,11 +1181,12 @@ ENDSCRIPT
sub print_courseinfo {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
my ($cathash,$categoriesform);
+ my $crstype = &Apache::loncommon::course_type();
my %domconf =
&Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
if (ref($domconf{'coursecategories'}) eq 'HASH') {
@@ -1298,21 +1194,15 @@ sub print_courseinfo {
if (ref($cathash) eq 'HASH') {
$categoriesform =
&Apache::loncommon::assign_categories_table($cathash,
- $settings->{'categories'},$crstype)."\n";
+ $settings->{'categories'})."\n";
}
}
if (!defined($categoriesform)) {
- $categoriesform = &mt('No categories defined in this domain.');
+ $categoriesform = &mt('No categories defined for this domain');
}
- my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
+ my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
- my $replace;
- if ($crstype eq 'Community') {
- $replace = &mt('To replace the standard title for a course role, enter a title, otherwise leave blank');
- } else {
- $replace = &mt('To replace the standard title for a course role, enter a title, otherwise leave blank');
- }
my %items = (
'url' => {
text => ''.&mt($itemtext->{'url'}).''.(' 'x2).
@@ -1337,13 +1227,13 @@ sub print_courseinfo {
},
'cloners' => {
text => ''.&mt($itemtext->{'cloners'}).'
'.
- &mt('Coordinators included automatically'),
+ &mt('Course Coordinators included automatically'),
input => 'textbox',
size => '40',
},
'rolenames' => {
text => ''.&mt($itemtext->{'rolenames'}).'
'.
- '('.$replace.')',
+ '('.&mt('To replace the standard title for a course role, enter a title, otherwise leave blank').')',
input => 'textbox',
size => '20',
},
@@ -1455,14 +1345,7 @@ sub print_courseinfo {
&Apache::loncommon::end_data_table();
} elsif ($item eq 'rolenames') {
$datatable .= &Apache::loncommon::start_data_table();
- my @roles;
- if ($crstype eq 'Community') {
- @roles = ('co');
- } else {
- @roles = ('cc');
- }
- push (@roles,('in','ta','ep','ad','st'));
- foreach my $role (@roles) {
+ foreach my $role ('cc','in','ta','ep','ad','st') {
$datatable .= &Apache::loncommon::start_data_table_row().
''.
&Apache::lonnet::plaintext($role,$crstype,undef,1).
@@ -1511,31 +1394,22 @@ sub new_cloners_dom_row {
}
sub can_modify_catsettings {
- my ($dom,$crstype) = @_;
+ my ($dom) = @_;
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
my ($can_toggle_cat,$can_categorize);
if (ref($domconf{'coursecategories'}) eq 'HASH') {
- if ($crstype eq 'Community') {
- if ($domconf{'coursecategories'}{'togglecatscomm'} eq 'comm') {
- $can_toggle_cat = 1;
- }
- if ($domconf{'coursecategories'}{'categorizecomm'} eq 'comm') {
- $can_categorize = 1;
- }
- } else {
- if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
- $can_toggle_cat = 1;
- }
- if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
- $can_categorize = 1;
- }
+ if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+ $can_toggle_cat = 1;
+ }
+ if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+ $can_categorize = 1;
}
}
return ($can_toggle_cat,$can_categorize);
}
sub assign_course_categories {
- my ($r,$crstype) = @_;
+ my ($r) = @_;
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $hascats = 0;
@@ -1544,23 +1418,12 @@ sub assign_course_categories {
if (ref($domconf{'coursecategories'}) eq 'HASH') {
$cathash = $domconf{'coursecategories'}{'cats'};
if (ref($cathash) eq 'HASH') {
- foreach my $cat (keys(%{$cathash})) {
- next if ($cat eq 'instcode::0');
- unless ($crstype eq 'Community') {
- next if ($cat eq 'communities::0');
- }
- $hascats ++;
- }
+ $hascats = 1;
}
}
my $catwin_js;
if ($hascats) {
- my $alert;
- if ($crstype eq 'Community') {
- $alert = &mt("Use 'Save' in the main window to save community categories");
- } else {
- $alert = &mt("Use 'Save' in the main window to save course categories");
- }
+ my $alert = &mt("Use 'Save' in the main window to save course categories");
$catwin_js = <
@@ -1598,38 +1461,23 @@ ENDSCRIPT
} else {
my $onload;
}
- my ($crscat,$catcrs,$assign);
- if ($crstype eq 'Community') {
- $crscat = 'Community Categories';
- $catcrs = &mt('Categorize Community');
- $assign = &mt('Assign one or more categories to this community.')
- } else {
- $crscat = 'Course Categories';
- $catcrs = &mt('Categorize Course');
- $assign = &mt('Assign one or more categories to this course.')
- }
my $start_page =
- &Apache::loncommon::start_page($crscat,$catwin_js,
+ &Apache::loncommon::start_page('Course Categories',$catwin_js,
{'only_body' => 1,});
my $end_page = &Apache::loncommon::end_page();
- my $categoriesform = ''.$catcrs.'';
+ my $categoriesform = ''.&mt('Categorize Course').'';
if ($hascats) {
my %currsettings =
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
- my $cattable = &Apache::loncommon::assign_categories_table($cathash,
- $currsettings{'categories'},$crstype);
- if ($cattable eq '') {
- $categoriesform .= &mt('No suitable categories defined for this course type in this domain.');
- } else {
- $categoriesform .= $assign.'
'.
+ $categoriesform .= &mt('Assign one or more categories to this course.').'
'.
'
';
- }
} else {
- $categoriesform .= &mt('No categories defined in this domain.');
+ $categoriesform .= &mt('No categories defined for this domain');
}
$r->print($start_page.$categoriesform.$end_page);
return;
@@ -1760,11 +1608,11 @@ sub print_feedback {
my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
my @sections = sort( { $a <=> $b } keys(%sections));
my %lt = &Apache::lonlocal::texthash (
- currone => 'Current recipient:',
- currmult => 'Current recipients:',
- add => 'Additional recipient:',
- del => 'Delete?',
- sec => 'Sections:',
+ currone => 'Current recipient:',
+ curmult => 'Current recipients:',
+ add => 'Additional recipient:',
+ del => 'Delete?',
+ sec => 'Sections:',
);
foreach my $item (@{$ordered}) {
@@ -1825,7 +1673,7 @@ sub user_table {
if ($num) {
$output .= ''.
'| ';
- if ($num == 1) {
+ if ($num > 1) {
$output .= $lt->{'currone'};
} else {
$output .= $lt->{'currmult'};
@@ -1834,7 +1682,7 @@ sub user_table {
' | '.
' ';
}
- $output .= ''.
+ $output .= ' '.
''.
$lt->{'add'}.'
'.
&select_recipient($item,$num,$cdom,$sections).
@@ -1905,7 +1753,8 @@ sub print_discussion {
}
my %items = (
'plc.roles.denied' => {
- text => ''.&mt($itemtext->{'plc.roles.denied'}).''.
+ text => ''.
+ &mt($itemtext->{'plc.roles.denied'}).''.
&Apache::loncommon::help_open_topic("Course_Disable_Discussion").'
'.
&mt('(role-based)'),
input => 'checkbox',
@@ -1918,7 +1767,8 @@ sub print_discussion {
},
'pch.roles.denied' => {
- text => ''.&mt($itemtext->{'pch.roles.denied'}).''.
+ text => ''.
+ &mt($itemtext->{'pch.roles.denied'}).''.
&Apache::loncommon::help_open_topic("Course_Disable_Discussion").'
'.
&mt('(role-based)'),
input => 'checkbox',
@@ -1945,11 +1795,11 @@ sub print_discussion {
my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
my @sections = sort( { $a <=> $b } keys(%sections));
my %lt = &Apache::lonlocal::texthash (
- currone => 'Disallowed:',
- currmult => 'Disallowed:',
- add => 'Disallow more:',
- del => 'Delete?',
- sec => 'Sections:',
+ currone => 'Disallowed:',
+ curmult => 'Disallowed:',
+ add => 'Disallow more:',
+ del => 'Delete?',
+ sec => 'Sections:',
);
foreach my $item (@{$ordered}) {
@@ -1985,13 +1835,8 @@ sub print_discussion {
}
sub role_checkboxes {
- my ($cdom,$cnum,$item,$settings,$showsections,$crstype) = @_;
- my @roles = ('st','ad','ta','ep','in');
- if ($crstype eq 'Community') {
- push(@roles,'co');
- } else {
- push(@roles,'cc');
- }
+ my ($cdom,$cnum,$item,$settings,$showsections) = @_;
+ my @roles = ('st','ad','ta','ep','in','cc');
my $output;
my (@current,@curr_roles,%currsec,@sections);
if ($showsections) {
@@ -2028,7 +1873,7 @@ sub role_checkboxes {
if (grep(/^\Q$role\E$/,@current)) {
$checked = ' checked="checked" ';
}
- my $plrole=&Apache::lonnet::plaintext($role,$crstype);
+ my $plrole=&Apache::lonnet::plaintext($role);
if ($showsections) {
$output .= &Apache::loncommon::start_data_table_row();
} else {
@@ -2099,7 +1944,7 @@ sub role_checkboxes {
}
sub print_classlists {
- my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype) = @_;
+ my ($position,$cdom,$settings,$itemtext,$rowtotal) = @_;
my @ordered;
if ($position eq 'top') {
@ordered = ('default_enrollment_start_date',
@@ -2110,22 +1955,6 @@ sub print_classlists {
@ordered = ('student_classlist_view',
'student_opt_in','student_classlist_portfiles');
}
- my %lt;
-
- if ($crstype eq 'Community') {
- %lt = &Apache::lonlocal::texthash (
- disabled => 'No viewable membership list',
- section => "Membership of viewer's section",
- all => 'List of all members',
- );
- } else {
- %lt = &Apache::lonlocal::texthash (
- disabled => 'No viewable classlist',
- section => "Classlist of viewer's section",
- all => 'Classlist of all students',
- );
- }
-
my %items = (
'default_enrollment_start_date' => {
text => ''.&mt($itemtext->{'default_enrollment_start_date'}).'',
@@ -2144,7 +1973,11 @@ sub print_classlists {
'student_classlist_view' => {
text => ''.&mt($itemtext->{'student_classlist_view'}).'',
input => 'selectbox',
- options => \%lt,
+ options => {
+ disabled => &mt('No viewable classlist'),
+ section => &mt("Classlist of viewer's section"),
+ all => &mt('Classlist of all students'),
+ },
order => ['disabled','all','section'],
},
'student_opt_in' => {
@@ -2161,20 +1994,14 @@ sub print_classlists {
($settings->{'student_classlist_view'} eq 'section')) {
$settings->{'student_classlist_view'} = 'disabled';
}
- return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal);
}
sub print_appearance {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
- my $mathdef;
- if ($crstype eq 'Community') {
- $mathdef = &mt("None specified - use member's choice");
- } else {
- $mathdef = &mt("None specified - use student's choice");
- }
my %items = (
'default_xml_style' => {
text => ''.&mt($itemtext->{'default_xml_style'}).' '.
@@ -2202,7 +2029,7 @@ sub print_appearance {
tth => &mt('TeX to HTML'),
},
order => ['jsMath','mimetex','tth'],
- nullval => $mathdef,
+ nullval => &mt("None specified - use student's choice"),
},
'tthoptions' => {
text => ''.&mt($itemtext->{'tthoptions'}).'',
@@ -2210,11 +2037,11 @@ sub print_appearance {
size => 40,
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
}
sub print_grading {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -2225,11 +2052,10 @@ sub print_grading {
input => 'selectbox',
options => {
standard => &mt('Standard: shows points'),
- external => &mt('External: shows number of completed parts and totals'),
- externalnototals => &mt('External: shows only number of completed parts'),
+ external => &mt('External: shows number of completed parts'),
spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'),
},
- order => ['standard','external','externalnototals','spreadsheet'],
+ order => ['standard','external','spreadsheet'],
},
'rndseed' => {
text => ''.&mt($itemtext->{'rndseed'}).''.
@@ -2263,11 +2089,11 @@ sub print_grading {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
}
sub print_printouts {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -2306,11 +2132,11 @@ sub print_printouts {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
}
sub print_spreadsheet {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -2342,29 +2168,21 @@ sub print_spreadsheet {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
-}
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
+}
sub print_bridgetasks {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
- my ($stumsg,$msgnote);
- if ($crstype eq 'Community') {
- $stumsg = &mt('Send message to member');
- $msgnote = &mt('Message to member and add to user notes');
- } else {
- $stumsg = &mt('Send message to student');
- $msgnote = &mt('Message to student and add to user notes');
- }
my %items = (
task_messages => {
text => ''.&mt($itemtext->{'task_messages'}).'',
input => 'selectbox',
options => {
- only_student => $stumsg,
- student_and_user_notes_screen => $msgnote,
+ only_student => &mt('Send message to student'),
+ student_and_user_notes_screen => &mt('Message to student and add to user notes'),
},
order => ['only_student','student_and_user_notes_screen'],
nullval => &mt('No message or record in user notes'),
@@ -2384,11 +2202,11 @@ sub print_bridgetasks {
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal);
}
sub print_other {
- my ($cdom,$settings,$allitems,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$allitems,$rowtotal) = @_;
unless ((ref($settings) eq 'HASH') && (ref($allitems) eq 'ARRAY')) {
return;
}
@@ -2409,7 +2227,7 @@ sub print_other {
input => 'textbox',
size => '30',
};
- my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
+ my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal);
}
sub get_other_items {
@@ -2426,7 +2244,7 @@ sub get_other_items {
unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
|| ($parameter eq 'type') ||
- ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)) {
+ ($parameter =~ m/^(cc|in|ta|ep|ad|st)\.plaintext$/)) {
push(@ordered,$parameter);
}
}
@@ -2514,7 +2332,7 @@ sub select_from_options {
}
sub make_item_rows {
- my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype) = @_;
+ my ($cdom,$items,$ordered,$settings,$rowtotal) = @_;
my $datatable;
if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
my $count = 0;
@@ -2522,7 +2340,7 @@ sub make_item_rows {
$count ++;
$datatable .= &item_table_row_start($items->{$item}{text},$count);
if ($item eq 'nothideprivileged') {
- $datatable .= ¬hidepriv_row($cdom,$item,$settings,$crstype);
+ $datatable .= ¬hidepriv_row($cdom,$item,$settings);
} elsif ($item eq 'print_header_format') {
$datatable .= &print_hdrfmt_row($item,$settings);
} elsif ($items->{$item}{input} eq 'dates') {
@@ -2552,7 +2370,7 @@ sub make_item_rows {
}
sub nothidepriv_row {
- my ($cdom,$item,$settings,$crstype) = @_;
+ my ($cdom,$item,$settings) = @_;
my ($cnum) = &get_course();
my %nothide;
my $datatable;
@@ -2620,11 +2438,7 @@ sub nothidepriv_row {
}
$datatable .= '';
} else {
- if ($crstype eq 'Community') {
- $datatable .= &mt('No Domain Coordinators have community roles');
- } else {
- $datatable .= &mt('No Domain Coordinators have course roles');
- }
+ $datatable .= &mt('No Domain Coordinators have course roles');
}
return $datatable;
}
@@ -2728,7 +2542,7 @@ ENDJS
&position_selector($pos,$currnum,$maxnum).
''.&mt('New').' | '.
&substitution_selector($currnum).' | '.
- ' ';
+ '';
$pos ++;
$currnum ++;
$output .= ''.
@@ -2741,7 +2555,7 @@ ENDJS
''.
' '.
- '';
+ '';
return $output;
}
@@ -2761,18 +2575,10 @@ sub position_selector {
}
sub substitution_selector {
- my ($num,$subst,$limit,$crstype) = @_;
- my ($stunametxt,$crsidtxt);
- if ($crstype eq 'Community') {
- $stunametxt = 'member name';
- $crsidtxt = 'community ID',
- } else {
- $stunametxt = 'student name';
- $crsidtxt = 'course ID',
- }
+ my ($num,$subst,$limit) = @_;
my %lt = &Apache::lonlocal::texthash(
- n => $stunametxt,
- c => $crsidtxt,
+ n => 'student name',
+ c => 'course ID',
a => 'assignment note',
);
my $output .= &mt('Substitution').'
'.
|