[LON-CAPA-cvs] cvs: loncom /interface courseprefs.pm
raeburn
raeburn at source.lon-capa.org
Sat Jun 3 07:21:37 EDT 2023
raeburn Sat Jun 3 11:21:37 2023 EDT
Modified files:
/loncom/interface courseprefs.pm
Log:
- Remove trailing white space
- Fix indents
No code changes.
-------------- next part --------------
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.123 loncom/interface/courseprefs.pm:1.124
--- loncom/interface/courseprefs.pm:1.123 Sat Jun 3 03:32:16 2023
+++ loncom/interface/courseprefs.pm Sat Jun 3 11:21:37 2023
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set configuration settings for a course
#
-# $Id: courseprefs.pm,v 1.123 2023/06/03 03:32:16 raeburn Exp $
+# $Id: courseprefs.pm,v 1.124 2023/06/03 11:21:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -316,7 +316,7 @@
idnu => 'Course ID or number',
unco => 'Unique code',
desc => 'Course Description',
- cred => 'Student credits',
+ cred => 'Student credits',
ownr => 'Course Owner',
cown => 'Course Co-owners',
catg => 'Categorize course',
@@ -522,7 +522,7 @@
uselcmath => 'Student formula entry uses inline preview, not DragMath pop-up',
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
inline_chem => 'Chemical reaction response uses inline preview, not pop-up',
- extresource => 'Display of external resources',
+ extresource => 'Display of external resources',
},
},
'grading' =>
@@ -1337,14 +1337,14 @@
my ($classorder,$classtitles) = &discussion_vote_classes();
my $fontchange = 0;
foreach my $class (@{$classorder}) {
- my $ext_entry = $entry.'_'.$class;
+ my $ext_entry = $entry.'_'.$class;
my $size = $env{'form.'.$ext_entry.'_size'};
my $unit = $env{'form.'.$ext_entry.'_unit'};
my $weight = $env{'form.'.$ext_entry.'_weight'};
my $style = $env{'form.'.$ext_entry.'_style'};
my $other = $env{'form.'.$ext_entry.'_other'};
$size =~ s/,//g;
- $unit =~ s/,//g;
+ $unit =~ s/,//g;
$weight =~ s/,//g;
$style =~ s/,//g;
$other =~ s/[^\w;:\s\-\%.]//g;
@@ -1352,7 +1352,7 @@
$newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
my $current = $values->{$ext_entry};
if ($values->{$ext_entry} eq '') {
- $current = ',,,';
+ $current = ',,,';
}
if ($newvalues{$ext_entry} ne $current) {
$changes->{$ext_entry} = $newvalues{$ext_entry};
@@ -1361,7 +1361,7 @@
}
if ($fontchange) {
$changes->{$entry} = 1;
- }
+ }
} elsif ($entry eq 'nothideprivileged') {
my @curr_nothide;
my @new_nothide;
@@ -1436,7 +1436,7 @@
my $newtext = $maxnum-1;
$newhdr[$env{'form.printfmthdr_pos_'.$newtext}] = $env{'form.printfmthdr_text_'.$newtext};
$newvalues{$entry} = join('', at newhdr);
- } elsif (($entry eq 'languages') ||
+ } elsif (($entry eq 'languages') ||
($entry eq 'checkforpriv')) {
my $settings;
my $total = $env{'form.'.$entry.'_total'};
@@ -1452,7 +1452,7 @@
}
if ($env{'form.'.$entry.'_'.$total} ne '') {
my $new = $env{'form.'.$entry.'_'.$total};
- if ($entry eq 'languages') {
+ if ($entry eq 'languages') {
my %langchoices = &get_lang_choices();
if ($langchoices{$new}) {
$settings .= $new;
@@ -1551,7 +1551,7 @@
} else {
$newvalues{$entry} = $env{'form.'.$entry};
}
- unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts') ||
+ unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts') ||
($entry eq 'extresource') || ($entry eq 'timezone')) {
if ($newvalues{$entry} ne $values->{$entry}) {
$changes->{$entry} = $newvalues{$entry};
@@ -1797,7 +1797,7 @@
$tries ++;
sleep (0.1);
if ($context eq 'domain') {
- $gotlock = &Apache::lonnet::newput_dom('linkprot',$lockhash,$cdom);
+ $gotlock = &Apache::lonnet::newput_dom('linkprot',$lockhash,$cdom);
} else {
$gotlock = &Apache::lonnet::newput('lti',$lockhash,$cdom,$cnum);
}
@@ -1835,7 +1835,7 @@
$error = 'nonumber';
}
}
- my $dellockoutcome;
+ my $dellockoutcome;
if ($context eq 'domain') {
$dellockoutcome = &Apache::lonnet::del_dom('linkprot',['lock'],$cdom);
} else {
@@ -3123,7 +3123,7 @@
}
} elsif ($title eq 'returnurl') {
if ($values{$title}) {
- $display .= &mt('Return URL parameter').': '.$values{$title}.', ';
+ $display .= &mt('Return URL parameter').': '.$values{$title}.', ';
}
} elsif ($title eq 'passbackformat') {
if ($values{$title} eq '1.0') {
@@ -3555,7 +3555,7 @@
$local_to_standard{$code_order[$i]} = $standardnames[$i];
}
foreach my $cloner (@cloners) {
- if (($cloner !~ /^\Q*:\E$match_domain$/) &&
+ if (($cloner !~ /^\Q*:\E$match_domain$/) &&
($cloner !~ /^$match_username\:$match_domain$/)) {
foreach my $item (split(/\&/,$cloner)) {
my ($key,$val) = split(/\=/,$item);
@@ -3782,7 +3782,7 @@
}
ENDSCRIPT
$jscript = '<script type="text/javascript" language="Javascript">'."\n".
- '// <![CDATA['."\n".
+ '// <![CDATA['."\n".
$browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
$cloners_js."\n".$instcode_js."\n".$localization_js."\n".
$syllabus_js."\n".$menuitems_js."\n".$extresource_js."\n".
@@ -3996,7 +3996,7 @@
&mt('Modification may make assessment data inaccessible!').
'</span>';
$editsyllabus = &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
- '</a>');
+ '</a>');
}
my %items = (
'url' => {
@@ -4077,7 +4077,7 @@
next if (!$env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'});
}
unless (($item eq 'cloners') || ($item eq 'rolenames')) {
- $colspan = 2;
+ $colspan = 2;
}
$count ++;
if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
@@ -4260,12 +4260,12 @@
if ($clonesrc =~ m{/$match_domain/$match_courseid}) {
my %clonesrcinfo = &Apache::lonnet::coursedescription($clonesrc);
if ($clonesrcinfo{'description'}) {
- $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
+ $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
}
}
$datatable .= $clonedfrom;
} elsif ($item eq 'uniquecode') {
- my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'};
+ my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'};
if ($code) {
$datatable .= $code;
}
@@ -4312,12 +4312,12 @@
} elsif ($uploaded) {
$datatable .= &mt('Uploaded file');
} else {
- $datatable .= &mt('Standard template');
+ $datatable .= &mt('Standard template');
}
$datatable .= (' ' x 2).
&mt('[_1]View[_2]',
'<a href="javascript:syllabusinfo();">',
- '</a>');
+ '</a>');
} elsif ($item eq 'loncaparev') {
my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
my $showreqd;
@@ -4342,7 +4342,7 @@
my ($output,$checkedon,$checkedoff);
if ($newdom ne '') {
if ($num eq $default) {
- $checkedon = 'checked="checked" ';
+ $checkedon = 'checked="checked" ';
} else {
$checkedoff = 'checked="checked" ';
}
@@ -4493,7 +4493,7 @@
sub display_loncaparev_constraints {
my ($r,$navmap,$loncaparev,$crstype) = @_;
- my ($reqdmajor,$reqdminor);
+ my ($reqdmajor,$reqdminor);
my $cid = $env{'request.course.id'};
my $cdom = $env{'course.'.$cid.'.domain'};
my $cnum = $env{'course.'.$cid.'.num'};
@@ -4763,7 +4763,7 @@
if (ref($fromblocks{$type}) eq 'HASH') {
foreach my $rev (keys(%{$fromblocks{$type}})) {
my ($major,$minor) = split(/\./,$rev);
- ($reqdmajor,$reqdminor) =
+ ($reqdmajor,$reqdminor) =
&Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
$output .= &Apache::loncommon::start_data_table_row().
'<td>'.$rev.'</td><td>'.$lt{$type}.'</td><td>';
@@ -4850,7 +4850,7 @@
&Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
$reqdmajor,$reqdminor);
$checkedrev{$key} = 1;
- }
+ }
push(@{$byresponsetype{$symb}{$rev}},$key);
$allmaps{$enclosing_map} = 1;
}
@@ -5102,7 +5102,7 @@
sub releases_by_map {
my ($r,$bymap,$url,$scopeorder,$lt) = @_;
return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
- my $newrow = 0;
+ my $newrow = 0;
if (ref($bymap->{$url}) eq 'HASH') {
foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
if ($newrow) {
@@ -5423,7 +5423,7 @@
undef,$includeempty,$disabled);
} else {
if ($settings->{$item} eq '') {
- unless ($noedit) {
+ unless ($noedit) {
$datatable .= '</td><td align="right">'.
&Apache::loncommon::select_language('languages_0','',1);
}
@@ -5460,8 +5460,8 @@
&Apache::loncommon::select_language('languages_'.$num,'',1).
'<input type="hidden" name="languages_total" value="'.$num.'" />'.
'</td>'.&Apache::loncommon::end_data_table_row();
- }
- $datatable .= &Apache::loncommon::end_data_table().'<br />';
+ }
+ $datatable .= &Apache::loncommon::end_data_table().'<br />';
}
}
$datatable .= &item_table_row_end();
@@ -5747,7 +5747,7 @@
my $colspan;
if ($item eq 'allow_limited_html_in_feedback') {
$colspan = 2;
- }
+ }
$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
if ($item eq 'plc.roles.denied') {
$datatable .= '</td><td align="right">'.
@@ -5792,7 +5792,7 @@
'<th align="center">'.&mt('font-size').'</th>'.
'<th align="center">'.&mt('font-weight').'</th>'.
'<th align="center">'.&mt('font-style').'</th>'.
- '<th align="center">'.&mt('Other css').'</th>'.
+ '<th align="center">'.&mt('Other css').'</th>'.
&Apache::loncommon::end_data_table_row().
&set_discussion_fonts($cdom,$cnum,$item,$settings,$noedit).
&Apache::loncommon::end_data_table().'<br />';
@@ -5844,7 +5844,7 @@
my $count = 0;
my $disabled;
if ($noedit) {
- $disabled = ' disabled="disabled"';
+ $disabled = ' disabled="disabled"';
}
foreach my $role (@roles) {
my $checked = '';
@@ -5972,7 +5972,7 @@
sub discussion_vote_classes {
my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
- my %classtitles = &Apache::lonlocal::texthash(
+ my %classtitles = &Apache::lonlocal::texthash(
'twoplus' => 'Two sigma above mean',
'oneplus' => 'One sigma above mean',
'zero' => 'Within one sigma of mean',
@@ -6038,7 +6038,7 @@
'defaultcredits' => {
text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
},
-
+
'nothideprivileged' => {
text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
input => 'checkbox',
@@ -7250,7 +7250,7 @@
'<legend>'.$menutitles{$category}.'</legend>'."\n";
if ($category eq 'text') {
$output .= '<b>'.&mt('Header Text').'</b><br /><br />';
- }
+ }
foreach my $field (@{$categories{$category}}) {
if ($field eq 'disc') {
$output .= '<br /><b>'.&mt('Footer Text').'</b><br /><br />';
@@ -7305,12 +7305,12 @@
} else {
$dest = '/adm/courseprefs';
}
-
+
my ($switchserver,$switchmessage);
$switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
if ($switchserver) {
if ($context eq 'domain') {
- $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);
+ $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);
} elsif ($crstype eq 'Community') {
$switchmessage = &mt("submit from community's home server: [_1].",$switchserver);
} else {
@@ -7346,7 +7346,7 @@
%checkedpassback = (
'no' => ' checked="checked"',
'yes' => '',
- );
+ );
%checkedpassbackfmt = (
'1p1' => ' checked="checked"',
'1p0' => '',
@@ -7372,7 +7372,7 @@
$checkedrequser{'no'} = '';
}
$datatable .= '<fieldset><legend>'.$lt{'requ'}.'</legend>';
- if ($values{'requser'}) {
+ if ($values{'requser'}) {
$usersty = 'display:inline-block';
}
}
@@ -7671,7 +7671,7 @@
$config->{'options'},$selected,
$config->{'nullval'},
undef,undef,$onchange,$noedit,$id);
- my ($checked,$reusesty,$sizesty);
+ my ($checked,$reusesty,$sizesty);
if ($reuse) {
$checked = ' checked="checked"';
}
@@ -7965,7 +7965,7 @@
}
}
if ($settings->{'checkforpriv'}) {
- @checkdoms = split(/,/,$settings->{'checkforpriv'});
+ @checkdoms = split(/,/,$settings->{'checkforpriv'});
}
}
push(@checkdoms,$cdom);
@@ -7979,7 +7979,7 @@
if ($end == -1 || $start == -1) {
next;
}
- foreach my $dom (@checkdoms) {
+ foreach my $dom (@checkdoms) {
if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
unless (grep(/^\Q$user\E$/, at privusers)) {
push(@privusers,$user);
@@ -8055,7 +8055,7 @@
my $domdesc = &Apache::lonnet::domain($currdom,'description');
if ($domdesc eq '') {
$domdesc = $currdom;
- }
+ }
$datatable .=
&Apache::loncommon::start_data_table_row().
'<td align="left"><span class="LC_nobreak">'.
@@ -8067,13 +8067,13 @@
&mt('Delete').'</label></span></td>'.
&Apache::loncommon::end_data_table_row();
$num ++;
- unless (grep(/^\Q$currdom\E$/, at excdoms)) {
+ unless (grep(/^\Q$currdom\E$/, at excdoms)) {
push(@excdoms,$currdom);
}
}
}
if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
- $datatable .=
+ $datatable .=
&Apache::loncommon::start_data_table_row().
'<td align="left"><span class="LC_nobreak">'.
&mt('Additional domain:'). '</span><br />'.
@@ -8187,7 +8187,7 @@
}
}
my $pos = $currnum+1;
- unless ($noedit) {
+ unless ($noedit) {
$output .=
'<tr>'.
'<td align="left"><span class="LC_nobreak">'.
More information about the LON-CAPA-cvs
mailing list