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

raeburn raeburn at source.lon-capa.org
Sat May 31 00:00:03 EDT 2014


raeburn		Sat May 31 04:00:03 2014 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Alternating background colors for rows in domain configuration tables.
  - Include a row for cases where Domain Coordinator is selected to receive
    messages, in cases where domain has only one DC.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.246 loncom/interface/domainprefs.pm:1.247
--- loncom/interface/domainprefs.pm:1.246	Fri May 30 01:39:48 2014
+++ loncom/interface/domainprefs.pm	Sat May 31 04:00:02 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.246 2014/05/30 01:39:48 raeburn Exp $
+# $Id: domainprefs.pm,v 1.247 2014/05/31 04:00:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -762,8 +762,9 @@
                 $output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
             }
         } elsif ($action eq 'requestcourses') {
-            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal).
-                       &print_studentcode($settings,\$rowtotal).'
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+            $rowtotal ++;
+            $output .= &print_studentcode($settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -798,6 +799,7 @@
             &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+            $rowtotal ++;
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -2074,7 +2076,6 @@
         $datatable .= &mt('There are no active Domain Coordinators');
     }
     $datatable .='</td></tr>';
-    $$rowtotal += $rows;
     return $datatable;
 }
 
@@ -2519,13 +2520,15 @@
                   $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
     my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                    'autocreate_xmldc',%currhash);
+    $datatable .= '</td></tr><tr class="LC_odd_row"><td>';
     if ($numdc > 1) {
-        $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
-                      &mt('Course creation processed as: (choose Dom. Coord.)').
-                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+        $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)').
+                      '</td><td class="LC_left_item">';
     } else {
-        $datatable .= $dctable.'</td></tr>';
+        $datatable .= &mt('Course creation processed as:').
+                      '</td><td class="LC_right_item">';
     }
+    $datatable .= $dctable.'</td></tr>';
     $$rowtotal += $rows;
     return $datatable;
 }
@@ -3125,13 +3128,14 @@
         my $numinrow = 2;
         my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                        'validationdc',%currhash);
+        my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '</td></tr><tr'.$css_class.'><td>';
         if ($numdc > 1) {
-            $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
-                          &mt('Course creation processed as: (choose Dom. Coord.)').
-                          '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+            $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
         } else {
-            $datatable .= $dctable.'</td></tr>';
+            $datatable .=  &mt('Course creation processed as: ');
         }
+        $datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
         $itemcount ++;
     }
     if (ref($rowtotal)) {
@@ -10985,7 +10989,7 @@
         my ($dcname,$dcdom) = split(':',$domcoord[0]);
         my $user = &Apache::loncommon::plainname($dcname,$dcdom);
         if ($inputtype eq 'radio') {
-            $table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
+            $table = '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')';
             }
@@ -10994,9 +10998,9 @@
             if (exists($currhash{$domcoord[0]})) {
                 $check = ' checked="checked"';
             }
-            $table .= '<span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="'.$name.'" '.
-                      'value="'.$domcoord[0].'"'.$check.' />'.$user;
+            $table = '<span class="LC_nobreak"><label>'.
+                     '<input type="checkbox" name="'.$name.'" '.
+                     'value="'.$domcoord[0].'"'.$check.' />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')';
             }




More information about the LON-CAPA-cvs mailing list