--- loncom/interface/domainprefs.pm	2012/12/20 13:15:36	1.180
+++ loncom/interface/domainprefs.pm	2013/01/09 21:34:26	1.187
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.180 2012/12/20 13:15:36 raeburn Exp $
+# $Id: domainprefs.pm,v 1.187 2013/01/09 21:34:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,7 +45,7 @@ described at http://www.lon-capa.org.
 =head1 OVERVIEW
 
 Each institution using LON-CAPA will typically have a single domain designated 
-for use by individuals affliated with the institution.  Accordingly, each domain
+for use by individuals affiliated with the institution.  Accordingly, each domain
 may define a default set of logos and a color scheme which can be used to "brand"
 the LON-CAPA instance. In addition, an institution will typically have a language
 and timezone which are used for the majority of courses.
@@ -386,11 +386,11 @@ sub handler {
                               col2 => 'Rules'}],
                  },
          'loadbalancing' =>
-                 {text  => 'Dedicated Load Balancer',
+                 {text  => 'Dedicated Load Balancer(s)',
                   help  => 'Domain_Configuration_Load_Balancing',
                   header => [{col1 => 'Balancers',
                               col2 => 'Default destinations',
-                              col3 => 'User affliation',
+                              col3 => 'User affiliation',
                               col4 => 'Overrides'},
                             ],
                  },
@@ -407,8 +407,6 @@ sub handler {
                            };
     }
 
-
-
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -436,22 +434,25 @@ sub handler {
         my ($configuserok,$author_ok,$switchserver) =
             &config_check($dom,$confname,$servadm);
         unless ($configuserok eq 'ok') {
-            &Apache::lonconfigsettings::print_header($r,$phase,$context).
-            &mt('The domain configuration user "[_1]" has yet to be created.',
-                $confname).
-            '<br />';
+            &Apache::lonconfigsettings::print_header($r,$phase,$context);
+            $r->print(&mt('The domain configuration user "[_1]" has yet to be created.',
+                           $confname).
+                      '<br />'
+            );
             if ($switchserver) {
-                &mt('Ordinarily, that domain configuration user is created when the ./UPDATE script is run to install LON-CAPA for the first time.').
-                '<br />'.
-                &mt('However, that does not apply when new domains are added to a multi-domain server, and ./UPDATE has not been run recently.').
-                '<br />'.
-                &mt('The "[_1]" user can be created automatically when a Domain Coordinator visits the web-based "Set domain configuration" screen, in a session hosted on the primary library server.',$confname).
-                '<br />'.
-                &mt("To do that now, use the following link: [_1],$switchserver);
+                $r->print(&mt('Ordinarily, that domain configuration user is created when the ./UPDATE script is run to install LON-CAPA for the first time.').
+                          '<br />'.
+                          &mt('However, that does not apply when new domains are added to a multi-domain server, and ./UPDATE has not been run recently.').
+                          '<br />'.
+                          &mt('The "[_1]" user can be created automatically when a Domain Coordinator visits the web-based "Set domain configuration" screen, in a session hosted on the primary library server.',$confname).
+                          '<br />'.
+                          &mt('To do that now, use the following link: [_1]',$switchserver)
+                );
             } else {
-                &mt('To create that user from the command line run the ./UPDATE script found in the top level directory of the extracted LON-CAPA tarball.').
-                '<br />'.
-                &mt('Once that is done, you will be able to use the web-based "Set domain configuration" to configure the domain');
+                $r->print(&mt('To create that user from the command line run the ./UPDATE script found in the top level directory of the extracted LON-CAPA tarball.').
+                          '<br />'.
+                          &mt('Once that is done, you will be able to use the web-based "Set domain configuration" to configure the domain')
+                );
             }
             $r->print(&Apache::loncommon::end_page());
             return OK;
@@ -489,7 +490,6 @@ sub handler {
                 }
             }
         }
-
         &Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs);
     }
     return OK;
@@ -551,7 +551,6 @@ sub print_config_box {
     my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_;
     my $rowtotal = 0;
     my $output;
-
     if ($action eq 'coursecategories') {
         $output = &coursecategories_javascript($settings);
     }
@@ -840,7 +839,7 @@ sub print_login {
                           '<td><select name="'.$lonhost.'_server">'.
                           '<option value=""'.$direct.'>'.$choices{'directlogin'}.
                           '</option>';
-            foreach my $hostid (sort keys(%servers)) {
+            foreach my $hostid (sort(keys(%servers))) {
                 next if ($servers{$hostid} eq $servers{$lonhost});
                 my $selected = '';
                 if (ref($disallowed{$lonhost}) eq 'HASH') {
@@ -1370,9 +1369,7 @@ sub display_color_options {
     $datatable .= '<td class="LC_right_item">'.
                   '<table border="0"><tr>';
 
-
     foreach my $item (@{$bgs}) {
-#        my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item});
         $datatable .= '<td align="center">';
 	my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
         if ($designs->{'bgs'}{$item}) {
@@ -2789,7 +2786,10 @@ sub spares_row {
             $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
             $datatable .= '<tr'.$css_class.'>
                            <td rowspan="2">
-                            <span class="LC_nobreak"><b>'.$server.'</b> when busy, offloads to:</span></td>'."\n";
+                            <span class="LC_nobreak">'.
+                          &mt('[_1] when busy, offloads to:'
+                              ,'<b>'.$server.'</b>').
+                          "\n";
             my (%current,%canselect);
             my @choices = 
                 &possible_newspares($server,$spareid->{$server},$serverhomes,$altids);
@@ -3038,7 +3038,6 @@ sub print_loadbalancing {
                                '<table><tr>'.$targettable.'</tr></table><br />';
             }
         }
-        my $cssidx = $balnum%2; 
         $datatable .= '</div></td></tr>'.
                       &loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
                                            $othertitle,$usertypes,$types,\%servers,
@@ -5611,7 +5610,7 @@ sub write_metadata {
         print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
         my $mfh;
         if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
-            foreach (sort keys %metadatafields) {
+            foreach (sort(keys(%metadatafields))) {
                 unless ($_=~/\./) {
                     my $unikey=$_;
                     $unikey=~/^([A-Za-z]+)/;