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

[raeburn]

raeburn		Fri Jan  3 19:53:47 2014 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - Backport 1.219, 1.220, 1.221.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.30 loncom/interface/domainprefs.pm:1.160.6.31
--- loncom/interface/domainprefs.pm:1.160.6.30	Fri Dec 27 16:40:08 2013
+++ loncom/interface/domainprefs.pm	Fri Jan  3 19:53:47 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.30 2013/12/27 16:40:08 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.31 2014/01/03 19:53:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4526,7 +4526,8 @@
 sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
             'checksums','clusterstatus','metadata_keywords','metadata_harvest',
-            'takeoffline','takeonline','showenv','toggledebug','ping','domconf');
+            'takeoffline','takeonline','showenv','toggledebug','ping','domconf',
+            'uniquecodes');
 }
 
 sub coursecategories_javascript {
@@ -9278,20 +9279,28 @@
                       ' value="'.$domcoord[$i].'"'.$check.' />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')'.
-                           '</label></span></td>';
             }
+            $table .= '</label></span></td>'; 
         }
         $table .= '</tr></table>';
     } elsif ($numdcs == 1) {
         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.')';
+            }
+            $table .= '</label></span>';
             $rows ++;
         }
     }