--- loncom/interface/domainprefs.pm	2013/12/24 19:15:10	1.216
+++ loncom/interface/domainprefs.pm	2014/01/05 21:24:12	1.222
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.216 2013/12/24 19:15:10 raeburn Exp $
+# $Id: domainprefs.pm,v 1.222 2014/01/05 21:24:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -420,7 +420,7 @@ sub handler {
     if ($phase eq 'process') {
         my $result = &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
                                                               \%prefs,\%domconfig,$confname,\@roles);
-        if (ref($result) eq 'HASH') {
+        if ((ref($result) eq 'HASH') && (keys(%{$result}))) { 
             $r->rflush();
             &devalidate_remote_domconfs($dom,$result);
         }
@@ -2022,14 +2022,28 @@ sub print_requestmail {
 sub print_studentcode {
     my ($settings,$rowtotal) = @_;
     my $rownum = 0; 
-    my %choices;
-    $choices{'uniquecode'} = &mt('Generate unique six character code as course identifier?');
-    my @toggles = ('uniquecode');
-    my %defaultchecked = ('uniquecode'  => 'off');
-    (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                               \%choices,$rownum);
-    $$rowtotal += $rownum;
-    return $reports;
+    my ($output,%current);
+    my @crstypes = ('official','unofficial','community','textbook');
+    if (ref($settings->{'uniquecode'}) eq 'HASH') {
+        foreach my $type (@crstypes) {
+            $current{$type} = $settings->{'uniquecode'}{$type};
+        }
+    }
+    $output .= '<tr>'.
+               '<td class="LC_left_item">'.&mt('Generate unique six character code as course identifier?').'</td>'.
+               '<td class="LC_left_item">';
+    foreach my $type (@crstypes) {
+        my $check = ' ';
+        if ($current{$type}) {
+            $check = ' checked="checked" ';
+        }
+        $output .= '<span class="LC_nobreak"><label>'.
+                   '<input type="checkbox" name="uniquecode" value="'.$type.'"'.$check.'/>'.
+                   &mt($type).'</label></span>'.('&nbsp;'x2).' ';
+    }
+    $output .= '</td></tr>';
+    $$rowtotal ++;
+    return $output;
 }
 
 sub print_textbookcourses {
@@ -2054,7 +2068,7 @@ sub print_textbookcourses {
     my $confname = $dom.'-domainconfig';
     my $switchserver = &check_switchserver($dom,$confname);
     my $maxnum = scalar(keys(%ordered));
-    my $datatable;
+    my $datatable = &textbookcourses_javascript(\%ordered);
     if (keys(%ordered)) {
         my @items = sort { $a <=> $b } keys(%ordered);
         for (my $i=0; $i<@items; $i++) {
@@ -2074,7 +2088,7 @@ sub print_textbookcourses {
                     $imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />';
                 }
             }
-            my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'','$key','$i'".');"';
+            my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$key'".');"';
             $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
                          .'<select name="'.$key.'"'.$chgstr.'>';
             for (my $k=0; $k<=$maxnum; $k++) {
@@ -2115,7 +2129,7 @@ sub print_textbookcourses {
         }
     }
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'','addbook_pos','$maxnum'".');"';
+    my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'addbook_pos'".');"';
     $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
                   '<input type="hidden" name="book_maxnum" value="'.$maxnum.'" />'."\n".
                   '<select name="addbook_pos"'.$chgstr.'>';
@@ -2154,6 +2168,67 @@ sub print_textbookcourses {
     return $datatable;
 }
 
+sub textbookcourses_javascript {
+    my ($textbooks) = @_;
+    return unless(ref($textbooks) eq 'HASH');
+    my $num = scalar(keys(%{$textbooks}));
+    my @jsarray;
+    foreach my $item (sort {$a <=> $b } (keys(%{$textbooks}))) {
+        push(@jsarray,$textbooks->{$item});
+    }
+    my $jstext = '    var textbooks = Array('."'".join("','",@jsarray)."'".');'."\n";
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function reorderBooks(form,item) {
+    var changedVal;
+$jstext 
+    var newpos = 'addbook_pos';
+    var current = new Array;
+    var maxh = 1 + $num;
+    var current = new Array;
+    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
+    if (item == newpos) {
+        changedVal = newitemVal;
+    } else {
+        changedVal = form.elements[item].options[form.elements[item].selectedIndex].value;
+        current[newitemVal] = newpos;
+    }
+    for (var i=0; i<textbooks.length; i++) {
+        var elementName = textbooks[i];
+        if (elementName != item) {
+            if (form.elements[elementName]) {
+                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                current[currVal] = elementName;
+            }
+        }
+    }
+    var oldVal;
+    for (var j=0; j<maxh; j++) {
+        if (current[j] == undefined) {
+            oldVal = j;
+        }
+    }
+    if (oldVal < changedVal) {
+        for (var k=oldVal+1; k<=changedVal ; k++) {
+           var elementName = current[k];
+           form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
+        }
+    } else {
+        for (var k=changedVal; k<oldVal; k++) {
+            var elementName = current[k];
+            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+
+ENDSCRIPT
+}
+
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
@@ -4471,7 +4546,8 @@ sub print_serverstatuses {
 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 {
@@ -6048,10 +6124,12 @@ sub modify_quotas {
         my @approvalnotify = &Apache::loncommon::get_env_multiple('form.reqapprovalnotify');
         @approvalnotify = sort(@approvalnotify);
         $confhash{'notify'}{'approval'} = join(',',@approvalnotify);
-        if ($env{'form.uniquecode'}) {
-            $confhash{'uniquecode'} = 1;
-        } else {
-            $confhash{'uniquecode'} = '';
+        my @crstypes = ('official','unofficial','community','textbook');
+        my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode');
+        foreach my $type (@hasuniquecode) {
+            if (grep(/^\Q$type\E$/,@crstypes)) {
+                $confhash{'uniquecode'}{$type} = 1;
+            }
         }
         my ($newbook,@allpos);
         if ($context eq 'requestcourses') {
@@ -6086,14 +6164,25 @@ sub modify_quotas {
                     $changes{'notify'}{'approval'} = 1;
                 }
             }
-            if ($domconfig{$action}{'uniquecode'}) {
-                unless ($confhash{'uniquecode'}) {
-                    $changes{'uniquecode'} = 1;
-                }
-            } else {
-                if ($confhash{'uniquecode'}) {
-                    $changes{'uniquecode'} = 1;
-                }
+            if (ref($domconfig{$action}{'uniquecode'}) eq 'HASH') {
+                if (ref($confhash{'uniquecode'}) eq 'HASH') {
+                    foreach my $crstype (keys(%{$domconfig{$action}{'uniquecode'}})) {
+                        unless ($confhash{'uniquecode'}{$crstype}) {
+                            $changes{'uniquecode'} = 1;
+                        }
+                    }
+                    unless ($changes{'uniquecode'}) {
+                        foreach my $crstype (keys(%{$confhash{'uniquecode'}})) {
+                            unless ($domconfig{$action}{'uniquecode'}{$crstype}) {
+                                $changes{'uniquecode'} = 1;
+                            }
+                        }
+                    }
+               } else {
+                   $changes{'uniquecode'} = 1;
+               }
+            } elsif (ref($confhash{'uniquecode'}) eq 'HASH') {
+                $changes{'uniquecode'} = 1;
             }
             if ($context eq 'requestcourses') {
                 if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') {
@@ -6155,7 +6244,7 @@ sub modify_quotas {
             if ($confhash{'notify'}{'approval'}) {
                 $changes{'notify'}{'approval'} = 1;
             }
-            if ($confhash{'uniquecode'}) {
+            if (ref($confhash{'uniquecode'} eq 'HASH')) {
                 $changes{'uniquecode'} = 1;
             }
         }
@@ -6483,10 +6572,15 @@ sub modify_quotas {
             if ($action eq 'requestcourses') {
                 my @offon = ('off','on');
                 if ($changes{'uniquecode'}) {
-                    $resulttext .= '<li>'.
-                                   &mt('Generation of six character code as course identifier for distribution to students set to '.
-                                       $offon[$env{'form.uniquecode'}]).
-                                   '</li>';
+                    if (ref($confhash{'uniquecode'}) eq 'HASH') {
+                        my $codestr = join(' ',map{ &mt($_); } sort(keys(%{$confhash{'uniquecode'}})));
+                        $resulttext .= '<li>'.
+                                       &mt('Generation of six character code as course identifier for distribution to students set to on for: [_1].','<b>'.$codestr.'</b>').
+                                       '</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Generation of six character code as course identifier for distribution to students set to off.').
+                                       '</li>';
+                    }
                 }
                 if (ref($changes{'textbooks'}) eq 'HASH') {
                     $resulttext .= '<li>'.&mt('Available textbooks updated').'<ul>';
@@ -9204,21 +9298,31 @@ sub active_dc_picker {
                       '<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.')';
+            }
+            $table .= '</label></span>';
             $rows ++;
         }
     }