[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface domainprefs.pm

[raeburn]

raeburn		Mon Dec 23 14:34:36 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - Backport 1.214, 1.215.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.28 loncom/interface/domainprefs.pm:1.160.6.29
--- loncom/interface/domainprefs.pm:1.160.6.28	Thu Dec 19 08:25:48 2013
+++ loncom/interface/domainprefs.pm	Mon Dec 23 14:34:35 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.28 2013/12/19 08:25:48 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.29 2013/12/23 14:34:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4137,7 +4137,7 @@
                             }
                             $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                         }
-                        $datatable .= '</select></td><td>';
+                        $datatable .= '</select></span></td><td>';
                         if ($parent eq 'instcode' || $parent eq 'communities') {
                             $datatable .=  '<span class="LC_nobreak">'
                                            .$default_names{$parent}.'</span>';
@@ -4167,7 +4167,8 @@
                             $datatable .= '</td>';
                         } else {
                             $datatable .= $parent
-                                          .' <label><input type="checkbox" name="deletecategory" '
+                                          .' <span class="LC_nobreak"><label>'
+                                          .'<input type="checkbox" name="deletecategory" '
                                           .'value="'.$item.'" />'.&mt('Delete').'</label></span></td>';
                         }
                         my $depth = 1;
@@ -8666,7 +8667,7 @@
                                 }
                             }
                         }
-                        my $cachekey = &scape('loadbalancing').':'.&escape($dom);
+                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
                         &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
                     }
                 }