--- loncom/interface/domainprefs.pm 2018/07/06 04:23:58 1.329
+++ loncom/interface/domainprefs.pm 2018/07/06 13:29:49 1.331
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.329 2018/07/06 04:23:58 raeburn Exp $
+# $Id: domainprefs.pm,v 1.331 2018/07/06 13:29:49 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1436,7 +1436,7 @@ sub print_login {
} else {
$datatable .= '';
}
- $datatable .= '
| ';
+ $datatable .= ' | ';
}
$datatable .= '';
}
@@ -1852,17 +1852,15 @@ sub image_changes {
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
my $output;
if ($img eq 'login') {
- # suppress image for Log-in header
+ $output = ''.$logincolors; # suppress image for Log-in header
} elsif (!$is_custom) {
if ($img ne 'domlogo') {
- $output .= &mt('Default image:').' ';
+ $output = &mt('Default image:').' ';
} else {
- $output .= &mt('Default in use:').' ';
+ $output = &mt('Default in use:').' ';
}
}
- if ($img eq 'login') { # suppress image for Log-in header
- $output .= ' | '.$logincolors;
- } else {
+ if ($img ne 'login') {
if ($img_import) {
$output .= '';
}
@@ -8571,7 +8569,7 @@ sub build_category_rows {
pop(@{$path});
}
} else {
- $text .= &mt('Add subcategory:').' '.&mt('Add subcategory:').' | ';
+ $text .= ''.&mt('Add subcategory:').' | ';
}
}
}