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

[raeburn]

raeburn		Thu Aug  4 17:59:20 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	courseprefs.pm 
  Log:
  - For 2.11
    - Backport 1.72, 1.73
  
  
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.49.2.18 loncom/interface/courseprefs.pm:1.49.2.19
--- loncom/interface/courseprefs.pm:1.49.2.18	Fri May 22 16:39:43 2015
+++ loncom/interface/courseprefs.pm	Thu Aug  4 17:59:19 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.18 2015/05/22 16:39:43 raeburn Exp $
+# $Id: courseprefs.pm,v 1.49.2.19 2016/08/04 17:59:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2430,6 +2430,7 @@
         } else {
             $alert = &mt("Use 'Save' in the main window to save course categories");
         }
+        &js_escape(\$alert);
         $catwin_js = <<ENDSCRIPT;
 <script type="text/javascript">
 
@@ -3025,8 +3026,13 @@
 sub releases_by_map {
     my ($r,$bymap,$url,$scopeorder,$lt) = @_;
     return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
+    my $newrow = 0;
     if (ref($bymap->{$url}) eq 'HASH') {
         foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
+            if ($newrow) {
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::continue_data_table_row());
+            }
             $r->print('<td valign="middle">'.$rev.'</td><td>');
             if (ref($bymap->{$url}{$rev}) eq 'HASH') {
                 $r->print('<table border="0">');
@@ -3048,6 +3054,7 @@
                 $r->print('</table>');
             }
             $r->print('</td>');
+            $newrow = 1;
         }
     } else {
         $r->print('<td colspan="2"> </td>');