'.
''.
$lt->{'add'}.'
'.
&select_recipient($item,$num,$cdom,$sections).
@@ -1901,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',
@@ -1914,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',
@@ -1981,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) {
@@ -2024,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 {
@@ -2095,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',
@@ -2106,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'}).'',
@@ -2140,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' => {
@@ -2157,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'}).' '.
@@ -2198,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'}).'',
@@ -2206,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;
}
@@ -2221,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'}).''.
@@ -2259,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;
}
@@ -2302,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;
}
@@ -2338,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'),
@@ -2380,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;
}
@@ -2405,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 {
@@ -2422,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);
}
}
@@ -2510,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;
@@ -2518,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') {
@@ -2548,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;
@@ -2616,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;
}
@@ -2724,7 +2542,7 @@ ENDJS
&position_selector($pos,$currnum,$maxnum).
''.&mt('New').' | '.
&substitution_selector($currnum).' | '.
- '
';
+ '';
$pos ++;
$currnum ++;
$output .= '