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

[raeburn]

raeburn		Sun Dec 29 03:32:18 2013 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Display the Domain Coordinator's name in cases where a DC needs to be 
    selected, and there is only one active DC defined for the domain.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.218 loncom/interface/domainprefs.pm:1.219
--- loncom/interface/domainprefs.pm:1.218	Wed Dec 25 20:43:46 2013
+++ loncom/interface/domainprefs.pm	Sun Dec 29 03:32:17 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.218 2013/12/25 20:43:46 raeburn Exp $
+# $Id: domainprefs.pm,v 1.219 2013/12/29 03:32:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9297,21 +9297,31 @@
                       '<input type="'.$inputtype.'" name="'.$name.'"'.
                       ' value="'.$domcoord[$i].'"'.$check.' />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
-                $table .=  ' ('.$dcname.':'.$dcdom.')'.
-                           '</label></span></td>';
+                $table .=  ' ('.$dcname.':'.$dcdom.')';
             }
+            $table .= '</label></span></td>';
         }
         $table .= '</tr></table>';
     } elsif ($numdcs == 1) {
+        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].'" />';
+            $table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
+            if ($user ne $dcname.':'.$dcdom) {
+                $table .=  ' ('.$dcname.':'.$dcdom.')';
+            }
         } else {
             my $check;
             if (exists($currhash{$domcoord[0]})) {
                 $check = ' checked="checked"';
             }
-            $table .= '<input type="checkbox" name="'.$name.'" '.
-                      'value="'.$domcoord[0].'"'.$check.' />';
+            $table .= '<span class="LC_nobreak"><label>'.
+                      '<input type="checkbox" name="'.$name.'" '.
+                      'value="'.$domcoord[0].'"'.$check.' />'.$user;
+            if ($user ne $dcname.':'.$dcdom) {
+                $table .=  ' ('.$dcname.':'.$dcdom.')'.
+            }
+            '</label></span>';
             $rows ++;
         }
     }