--- loncom/interface/domainprefs.pm 2013/08/07 14:41:39 1.201 +++ loncom/interface/domainprefs.pm 2013/08/08 00:53:32 1.202 @@ -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 print_rolecolors { 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 @@ sub display_color_options { $datatable .= ''. ' '. + ' value="'.$current_color.'" /> '. ' '; unless ($role eq 'login') { $datatable .= ''. @@ -1267,7 +1267,7 @@ sub display_color_options { } else { $datatable .= ' '; } - $current_color = $designs->{'fontmenu'} ? + $current_color = $designs->{'fontmenu'} ? $designs->{'fontmenu'} : $defaults->{'fontmenu'}; $datatable .= ''. ''.$choices->{$item}."\n"; - if ($designs->{'links'}{$item}) { $datatable.=' '; } @@ -1496,7 +1495,6 @@ sub login_text_colors { my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item}; $color_menu .= '
'; - } $color_menu .= '
'; return $color_menu;