[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm
raeburn
raeburn at source.lon-capa.org
Wed Aug 7 20:53:33 EDT 2013
raeburn Thu Aug 8 00:53:33 2013 EDT
Modified files:
/loncom/interface domainprefs.pm
Log:
- Remove trailing whitespace.
- Remove lines containing only linefeed.
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.201 loncom/interface/domainprefs.pm:1.202
--- loncom/interface/domainprefs.pm:1.201 Wed Aug 7 14:41:39 2013
+++ loncom/interface/domainprefs.pm Thu Aug 8 00:53:32 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.201 2013/08/07 14:41:39 raeburn Exp $
+# $Id: domainprefs.pm,v 1.202 2013/08/08 00:53:32 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1205,8 +1205,8 @@
sub role_defaults {
my ($role,$bgs,$links,$images,$logintext) = @_;
- my %defaults;
- unless ((ref($bgs) eq 'ARRAY') && (ref($links) eq 'ARRAY') && (ref($images) eq 'ARRAY')) {
+ my %defaults;
+ unless ((ref($bgs) eq 'ARRAY') && (ref($links) eq 'ARRAY') && (ref($images) eq 'ARRAY')) {
return %defaults;
}
my %defaultdesign = %Apache::loncommon::defaultdesign;
@@ -1257,7 +1257,7 @@
$datatable .= '<td><span class="LC_nobreak">'.
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
- ' value="'.$current_color.'" /> '.
+ ' value="'.$current_color.'" /> '.
' </td></tr>';
unless ($role eq 'login') {
$datatable .= '<tr'.$css_class.'>'.
@@ -1267,7 +1267,7 @@
} else {
$datatable .= '<td> </td>';
}
- $current_color = $designs->{'fontmenu'} ?
+ $current_color = $designs->{'fontmenu'} ?
$designs->{'fontmenu'} : $defaults->{'fontmenu'};
$datatable .= '<td><span class="LC_nobreak">'.
'<input class="colorchooser" type="text" size="10" name="'
@@ -1431,7 +1431,6 @@
foreach my $item (@{$links}) {
my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
$datatable .= '<td align="center">'.$choices->{$item}."\n";
-
if ($designs->{'links'}{$item}) {
$datatable.=' ';
}
@@ -1496,7 +1495,6 @@
my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item};
$color_menu .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
-
}
$color_menu .= '</tr></table><br />';
return $color_menu;
More information about the LON-CAPA-cvs
mailing list