--- loncom/interface/courseprefs.pm	2023/09/02 12:51:32	1.126
+++ loncom/interface/courseprefs.pm	2025/03/15 01:03:33	1.134
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.126 2023/09/02 12:51:32 raeburn Exp $
+# $Id: courseprefs.pm,v 1.134 2025/03/15 01:03:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -372,6 +372,12 @@ sub handler {
 
     my %values=&Apache::lonnet::dump('environment',$cdom,$cnum);
     my %linkprot=&Apache::lonnet::dump('lti',$cdom,$cnum,undef,undef,undef,1);
+    my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+    unless ($phase eq 'process') {
+        if (ref($domdefs{'linkprotsuggested'}) eq 'HASH') {
+            $values{'suggested'} = $domdefs{'linkprotsuggested'};
+        }
+    }
     my %ltienc = &Apache::lonnet::dump('nohist_ltienc',$cdom,$cnum,undef,undef,undef,1);
     my %ltitools = &Apache::lonnet::dump('ltitools',$cdom,$cnum,undef,undef,undef,1);
     my %ltitoolsenc = &Apache::lonnet::dump('nohist_toolsenc',$cdom,$cnum,undef,undef,undef,1);
@@ -793,9 +799,38 @@ sub print_config_box {
           <tr>
            <td>
             <table class="LC_nested">';
+        if ($action eq 'linkprot') {
+            if ((ref($settings) eq 'HASH') && (ref($settings->{'suggested'}) eq 'HASH')) {
+                my $hints;
+                my $hintcount = 0;
+                foreach my $key (sort { $a <=> $b } keys(%{$settings->{'suggested'}})) {
+                    if ((ref($settings->{'suggested'}->{$key}) eq 'HASH')) {
+                        if (($settings->{'suggested'}->{$key}-{'name'} ne '') &&
+                            ($settings->{'suggested'}->{$key}-{'info'} ne '')) {
+                            my $css_class = $hintcount%2?' class="LC_odd_row"':' class="LC_even_row"';
+                            $hints .= '<tr '.$css_class.'><td class="LC_left_item">'.
+                                      $settings->{'suggested'}->{$key}->{'name'}.'</td>'.
+                                      '<td class="LC_right_item"><pre>'.
+                                      $settings->{'suggested'}->{$key}->{'info'}.
+                                      '</pre></td></tr>';
+                            $hintcount ++;
+                        }
+                    }
+                }
+                if ($hintcount) {
+                    $output .= '<tr class="LC_info_row">'.
+                               '<td colspan="2" class="LC_left_item">'.&mt('Recommendation(s) for specific launcher application(s)').'</td>'.
+                               '</tr>'."\n".
+                               '<tr class="LC_info_row">'.
+                               '<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Launcher Application').'</span></td>'.
+                               '<td class="LC_right_item">'.&mt('Recommendation(s)').'</td></tr>'."\n".
+                               $hints;
+                }
+            }
+        }
         if (exists $item->{'header'}->[0]->{'col1'} || 
             exists $item->{'header'}->[0]->{'col2'}) {
-			$output .= '          
+	    $output .= '          
           	<tr class="LC_info_row">
               <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
             if (($action eq 'courseinfo') || ($action eq 'localization') ||
@@ -822,7 +857,7 @@ sub print_config_box {
     } elsif ($action eq 'appearance') {
         $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'grading') {
-        $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+        $output .= &print_grading($cdom,$cnum,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'printouts') {
         $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'spreadsheet') {
@@ -1550,6 +1585,33 @@ sub process_changes {
                             } elsif ($values->{$entry}) {
                                 $changes->{$entry} = '';
                             }
+                        } elsif ($entry eq 'grading') {
+                            if ($env{'form.'.$entry} eq 'standard') {
+                                if ($env{'form.hidetotals'}) {
+                                    my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+                                    if (keys(%sections)) {
+                                        my @secs = &Apache::loncommon::get_env_multiple('form.hidetotals_sections');
+                                        if (grep(/^all$/,@secs)) {
+                                            $newvalues{'hidetotals'} = 'all';
+                                        } elsif (@secs) {
+                                            $newvalues{'hidetotals'} = '';
+                                            foreach my $sec (sort {$a <=> $b} @secs) {
+                                                if (exists($sections{$sec})) {
+                                                    $newvalues{'hidetotals'} .= $sec.','
+                                                }
+                                            }
+                                            $newvalues{'hidetotals'} =~ s/,$//;
+                                        }
+                                    } else {
+                                        $newvalues{'hidetotals'} = 'all';
+                                    }
+                                }
+                            }
+                            if ($newvalues{'hidetotals'} ne $values->{'hidetotals'}) {
+                                $changes->{'hidetotals'} = $newvalues{'hidetotals'};
+                                $changes->{'grading'} = $env{'form.'.$entry};
+                            }
+                            $newvalues{$entry} = $env{'form.'.$entry};
                         } else {
                             $newvalues{$entry} = $env{'form.'.$entry};
                         }
@@ -1964,10 +2026,14 @@ sub process_ltitools {
             } else {
                 $ltitools{$newid}{'display'}{'target'} = 'iframe';
             }
-            foreach my $item ('passback','roster') {
+            foreach my $item ('passback','roster','returnurl') {
                 if ($env{'form.ltitools_'.$item.'_add'}) {
                     $ltitools{$newid}{$item} = 1;
-                    if ($env{'form.ltitools_'.$item.'valid_add'} ne '') {
+                    if ($item eq 'returnurl') {
+                        if ($env{'form.ltitools_crs'.$item.'_add'}) {
+                            $ltitools{$newid}{'crsconf'}{$item} = 1;
+                        }
+                    } elsif ($env{'form.ltitools_'.$item.'valid_add'} ne '') {
                         my $lifetime = $env{'form.ltitools_'.$item.'valid_add'};
                         $lifetime =~ s/^\s+|\s+$//g;
                         if ($lifetime =~ /^\d+\.?\d*$/) {
@@ -2151,10 +2217,21 @@ sub process_ltitools {
                     } else {
                         $haschanges{$itemid} = 1;
                     }
-                    foreach my $extra ('passback','roster') {
+                    foreach my $extra ('passback','roster','returnurl') {
                         if ($env{'form.ltitools_'.$extra.'_'.$i}) {
                             $ltitools{$itemid}{$extra} = 1;
-                            if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') {
+                            if ($extra eq 'returnurl') {
+                                if ($env{'form.ltitools_crs'.$extra.'_'.$i}) {
+                                    $ltitools{$itemid}{'crsconf'}{$extra} = 1;
+                                    if (ref($values->{$itemid}{'crsconf'}) eq 'HASH') {
+                                        if (!$values->{$itemid}{'crsconf'}{$extra}) {
+                                            $haschanges{$itemid} = 1;
+                                        }
+                                    } else {
+                                        $haschanges{$itemid} = 1;
+                                    }
+                                }
+                            } elsif ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') {
                                 my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i};
                                 $lifetime =~ s/^\s+|\s+$//g;
                                 if ($lifetime =~ /^\d+\.?\d*$/) {
@@ -2631,6 +2708,40 @@ sub store_changes {
                                     unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts') || ($key eq 'extresource')) {
                                         $displayval = $changes->{$item}{$key};
                                     }
+                                    if (($item eq 'grading') && ($key eq 'grading')) {
+                                        if ($displayval eq 'standard') {
+                                            my $hidetotals;
+                                            if (exists($changes->{$item}{'hidetotals'})) {
+                                                if ($changes->{$item}{'hidetotals'} eq '') {
+                                                    if (exists($values->{'hidetotals'})) {
+                                                        push(@delkeys,'hidetotals');
+                                                    }
+                                                } else {
+                                                    $hidetotals = $changes->{$item}{'hidetotals'};
+                                                }
+                                            } elsif (exists($values->{'hidetotals'})) {
+                                                $hidetotals = $values->{'hidetotals'};
+                                            }
+                                            if ($hidetotals eq '') {
+                                                $displayval = &mt('standard with "hide course totals" set to "No"');
+                                                if (exists($values->{'hidetotals'})) {
+                                                    push(@delkeys,'hidetotals');
+                                                }
+                                            } elsif ($hidetotals =~ /^([\w,]+)$/) {
+                                                my $secstr = $1;
+                                                my @secs = split(/,/,$secstr);
+                                                if (grep(/^all$/,@secs)) {
+                                                    $displayval = &mt('standard with "hide course totals" set to "Yes" for all users');
+                                                    $hidetotals = 'all';
+                                                } else {
+                                                    $displayval = &mt('standard with "hide course totals" set to "Yes" for users in section(s): [_1]',join(', ',@secs));
+                                                }
+                                                $storehash{'hidetotals'} = $hidetotals;
+                                            }
+                                        } elsif (exists($values->{'hidetotals'})) {
+                                            push(@delkeys,'hidetotals');
+                                        }
+                                    }
                                     if ($item eq 'feedback') {
                                         if ($key =~ /^(question|policy|comment)(\.email)\.text$/) {
                                             $text = $prefs->{$item}->{'itemtext'}{$1.$2};
@@ -2639,14 +2750,14 @@ sub store_changes {
                                             $displayname = &mt('Recipients of '.$text.' questions');
                                         }
                                     } elsif ($item eq 'discussion') {
-                                        if ($key =~ /^p(lc|ch)\.roles\.denied/) {
+                                        if ($key =~ /^p(lc|ch|ac)\.roles\.denied/) {
                                             $displayname = &mt("$text (role-based)");
                                             if ($displayval ne '') {
                                                 my @roles = split(',',$displayval);
                                                 @roles = map { &Apache::lonnet::plaintext($_); } @roles;
                                                 $displayval = join(', ',@roles);
                                             } 
-                                        } elsif ($key =~ /^p(lc|ch)\.users\.denied/) {
+                                        } elsif ($key =~ /^p(lc|ch|ac)\.users\.denied/) {
                                             $displayname = &mt("$text (specific user(s))");
                                         } else {
                                             if ($key eq 'allow_discussion_post_editing') {
@@ -3224,7 +3335,13 @@ sub store_ltitools {
                             }
                         }
                     }
-                    $output .= '<li>'.&mt('Configurable in course:');
+                    $output .= '<li>';
+                    if ($context eq 'domain') {
+                        $output .= &mt('Configurable in course');
+                    } else {
+                        $output .= &mt('Configurable for each instance of tool in course');
+                    }
+                    $output .= ':';
                     my @possconfig = ('label','title','target','linktext','explanation','append');
                     my $numconfig = 0;
                     if (ref($changes->{$itemid}{'crsconf'}) eq 'HASH') {
@@ -3239,11 +3356,21 @@ sub store_ltitools {
                         $output .= '&nbsp;'.&mt('None');
                     }
                     $output .= '</li>';
-                    foreach my $item ('passback','roster') {
+                    foreach my $item ('passback','roster','returnurl') {
                         $output .= '<li>'.$lt{$item}.'&nbsp;';
                         if ($changes->{$itemid}{$item}) {
                             $output .= &mt('Yes');
-                            if ($changes->{$itemid}{$item.'valid'}) {
+                            if ($item eq 'returnurl') {
+                                if (ref($changes->{$itemid}{'crsconf'}) eq 'HASH') {
+                                    $output .= ' ['.&mt('Configurable in course').': ';
+                                    if ($changes->{$itemid}{'crsconf'}{$item}) {
+                                        $output .= &mt('Yes');
+                                    } else {
+                                        $output .= &mt('No');
+                                    }
+                                    $output .= ']';
+                                }
+                            } elsif ($changes->{$itemid}{$item.'valid'}) {
                                 if ($item eq 'passback') {
                                     $output .= ' '.&mt('valid for at least [quant,_1,day] after launch',
                                                        $changes->{$itemid}{$item.'valid'});
@@ -3591,7 +3718,7 @@ function syllabusinfo() {
     }
 }
 ENDSCRIPT
-    my $menuitems_js;
+    my ($menuitems_js,$grading_js);
     unless ($noedit) {
         my $collections;
         my $next = 1;
@@ -3673,6 +3800,48 @@ function toggleAddmenucoll() {
     }
 }
 ENDSCRIPT
+        $grading_js = <<"ENDSCRIPT";
+function toggleGrading(form) {
+    if (document.getElementById('hidetotalsdiv')) {
+        var totalsdivid = document.getElementById('hidetotalsdiv');
+        var selname = form.elements['grading'];
+        if (selname) {
+            var current = selname.options[selname.selectedIndex].value
+            if (current == 'standard') {
+                totalsdivid.style.display = 'inline-block';
+            } else {
+                totalsdivid.style.display = 'none';
+            }
+        }
+    }
+    return;
+}
+
+function toggleHiddenTotalsSec(form) {
+    if (document.getElementById('sectotalsdiv')) {
+        var sectotalsdivid = document.getElementById('sectotalsdiv');
+        var radioname = form.elements['hidetotals'];
+        if (radioname) {
+            if (radioname.length > 0) {
+                var setvis;
+                for (var i=0; i<radioname.length; i++) {
+                    if (radioname[i].checked == true) {
+                        if (radioname[i].value == 1) {
+                            sectotalsdivid.style.display = 'inline-block';
+                            setvis = 1;
+                        }
+                        break;
+                    }
+                }
+                if (!setvis) {
+                    sectotalsdivid.style.display = 'none';
+                }
+            }
+        }
+    }
+    return;
+}
+ENDSCRIPT
     }
     $extresource_js = <<"ENDSCRIPT";
 function toggleExtRes() {
@@ -3721,7 +3890,7 @@ ENDSCRIPT
                $browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
                $cloners_js."\n".$instcode_js."\n".$localization_js."\n".
                $syllabus_js."\n".$menuitems_js."\n".$extresource_js."\n".
-               &linkprot_javascript()."\n".'//]]>'."\n".
+               $grading_js."\n".&linkprot_javascript()."\n".'//]]>'."\n".
                '</script>'."\n".$stubrowse_js."\n".$ltitools_js."\n";
     return $jscript;
 }
@@ -5154,8 +5323,7 @@ sub update_releasereq {
         }
         $modified_courses = [];
     }
-    undef($registered_cleanup);
-    return;
+    return OK;
 }
 
 sub show_autocoowners {
@@ -5570,7 +5738,7 @@ sub select_recipient {
 }
 
 sub select_sections {
-    my ($item,$num,$sections,$selected,$noedit) = @_;
+    my ($item,$num,$sections,$selected,$noedit,$allval) = @_;
     my ($output,@currsecs,$allsec,$disabled);
     if (ref($selected) eq 'ARRAY') {
         @currsecs = @{$selected};
@@ -5586,16 +5754,24 @@ sub select_sections {
             my $mult;
             if (@{$sections} > 1) {
                 $mult = ' multiple="multiple"';
+                my $size;
                 if (@{$sections} > 3) {
-                    $mult .= ' size="4"';
+                    $size = 4;
+                } else {
+                    $size = 1 + scalar(@{$sections});
                 }
+                $mult .= ' size="'.$size.'"';
+            }
+            my $name = $item.'_sections';
+            unless ($item eq 'hidetotals') {
+                $name .= '_'.$num;
             }
-            $output = '<select name="'.$item.'_sections_'.$num.'"'.$mult.$disabled.'>'.
-                      ' <option value=""'.$allsec.'>'.&mt('All').'</option>';
+            $output = '<select name="'.$name.'"'.$mult.$disabled.'>'.
+                      ' <option value="'.$allval.'"'.$allsec.'>'.&mt('All').'</option>';
             foreach my $sec (@{$sections}) {
                 my $is_sel;
                 if ((@currsecs) && (grep(/^\Q$sec\E$/,@currsecs))) {
-                    $is_sel = 'selected="selected"';
+                    $is_sel = ' selected="selected"';
                 }
                 $output .= '<option value="'.$sec.'"'.$is_sel.'>'.$sec.'</option>';
             }
@@ -6079,7 +6255,7 @@ sub print_appearance {
 }
 
 sub print_grading {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+    my ($cdom,$cnum,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -6099,7 +6275,7 @@ sub print_grading {
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
-                           '<span class="LC_warning">'.'<br />'.
+                           '<br /><span class="LC_warning LC_nobreak">'.
                            &mt('Modifying this will make problems have different numbers and answers!').
                            '</span>',
                    input => 'selectbox',
@@ -6131,7 +6307,7 @@ sub print_grading {
                    input => 'radio',
                  },
     );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit,$cnum);
 }
 
 sub print_printouts {
@@ -6476,22 +6652,35 @@ sub print_ltitools {
                           '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
                           '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></div>'.
                           '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
-                          '<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}.
+                          '<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="30">'.$currdisp{'explanation'}.
                           '</textarea></div><div style=""></div><br />';
             my %units = (
                           'passback' => 'days',
                           'roster'   => 'seconds',
                         );
-            foreach my $extra ('passback','roster') {
+            my %courseconfig;
+            if (ref($settings->{$item}) eq 'HASH') {
+                if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') {
+                    %courseconfig = %{$settings->{$item}->{'crsconf'}};
+                }
+            }
+            foreach my $extra ('passback','roster','returnurl') {
                 my $validsty = 'none';
                 my $currvalid;
                 my $checkedon = '';
                 my $checkedoff = ' checked="checked"';
+                my $crscheckedon = '';
+                my $crscheckedoff = ' checked="checked"';
                 if ($settings->{$item}->{$extra}) {
                     $checkedon = $checkedoff;
                     $checkedoff = '';
                     $validsty = 'inline-block';
-                    if ($settings->{$item}->{$extra.'valid'} =~ /^\d+\.?\d*$/) {
+                    if ($extra eq 'returnurl') {
+                        if ($courseconfig{$extra}) {
+                            $crscheckedon = ' checked="checked"';
+                            $crscheckedoff = '';
+                        }
+                    } elsif ($settings->{$item}->{$extra.'valid'} =~ /^\d+\.?\d*$/) {
                         $currvalid = $settings->{$item}->{$extra.'valid'};
                     }
                 }
@@ -6500,12 +6689,21 @@ sub print_ltitools {
                               '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.$onclick.' />'.
                               &mt('No').'</label>'.('&nbsp;'x2).
                               '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.$onclick.' />'.
-                              &mt('Yes').'</label></span></div>'.
-                              '<div class="LC_floatleft" style="display:'.$validsty.';" id="ltitools_'.$extra.'time_'.$i.'">'.
-                              '<span class="LC_nobreak">'.
-                              &mt("until at least [_1] $units{$extra} after launch",
-                                  '<input type="text" name="ltitools_'.$extra.'valid_'.$i.'" value="'.$currvalid.'" />').
-                              '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+                              &mt('Yes').'</label></span></div>';
+                if ($extra eq 'returnurl') {
+                    $datatable .= '<div class="LC_floatleft" style="display:'.$validsty.';" id="ltitools_course'.$extra.'_'.$i.'">'.
+                                  '<span class="LC_nobreak"> -- '.&mt('configurable in course').':&nbsp;'.
+                                  '<label><input type="radio" name="ltitools_crs'.$extra.'_'.$i.'" value="0"'.$crscheckedoff.' />'.
+                                  &mt('No').'</label>'.('&nbsp;'x2).
+                                  '<label><input type="radio" name="ltitools_crs'.$extra.'_'.$i.'" value="1"'.$crscheckedon.' />'.
+                                  &mt('Yes').'</label>';
+                } else {
+                    $datatable .= '<div class="LC_floatleft" style="display:'.$validsty.';" id="ltitools_'.$extra.'time_'.$i.'">'.
+                                  '<span class="LC_nobreak">'.
+                                  &mt("until at least [_1] $units{$extra} after launch",
+                                      '<input type="text" name="ltitools_'.$extra.'valid_'.$i.'" value="'.$currvalid.'" />');
+                }
+                $datatable .= '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
             }
             $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;';
             if ($imgsrc) {
@@ -6591,14 +6789,14 @@ sub print_ltitools {
                 }
                 $datatable .= '</select></td>';
             }
-            $datatable .= '</tr></table></fieldset>';
-            my %courseconfig;
-            if (ref($settings->{$item}) eq 'HASH') {
-                if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') {
-                    %courseconfig = %{$settings->{$item}->{'crsconf'}};
-                }
+            $datatable .= '</tr></table></fieldset>'."\n".
+                          '<fieldset><legend>';
+            if ($context eq 'domain') {
+                $datatable .= &mt('Configurable in course');
+            } else {
+                $datatable .= &mt('Configurable for each instance of tool in course');
             }
-            $datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
+            $datatable .= '</legend><span class="LC_nobreak">';
             foreach my $item ('label','title','target','linktext','explanation','append') {
                 my $checked;
                 if ($courseconfig{$item}) {
@@ -6619,14 +6817,14 @@ sub print_ltitools {
                                       '<label><input type="checkbox" name="ltitools_customdel_'.$i.'" value="'.
                                       $key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'.
                                       '<td><input type="text" name="ltitools_customval_'.$key.'_'.$i.'"'.
-                                      ' value="'.$custom{$key}.'" /></td></tr>';
+                                      ' value="'.$custom{$key}.'" size="35" /></td></tr>';
                     }
                 }
             }
             $datatable .= '<tr><td><span class="LC_nobreak">'.
                           '<label><input type="checkbox" name="ltitools_customadd" value="'.$i.'" />'.
                           &mt('Add').'</label></span></td><td><input type="text" name="ltitools_custom_name_'.$i.'" />'.
-                          '</td><td><input type="text" name="ltitools_custom_value_'.$i.'" /></td></tr>';
+                          '</td><td><input type="text" name="ltitools_custom_value_'.$i.'" size="35" /></td></tr>';
             $datatable .= '</table></fieldset></td></tr>'."\n";
             $itemcount ++;
         }
@@ -6700,18 +6898,27 @@ sub print_ltitools {
                      'passback' => '7',
                      'roster'   => '300',
                    );
-    foreach my $extra ('passback','roster') {
+    foreach my $extra ('passback','roster','returnurl') {
         my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','add'".');"';
         $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.'&nbsp;'.
                       '<label><input type="radio" name="ltitools_'.$extra.'_add" value="0" checked="checked"'.$onclick.' />'.
                       &mt('No').'</label></span>'.('&nbsp;'x2).'<span class="LC_nobreak">'.
                       '<label><input type="radio" name="ltitools_'.$extra.'_add" value="1"'.$onclick.' />'.
-                      &mt('Yes').'</label></span></div>'.
-                      '<div class="LC_floatleft" style="display:none;" id="ltitools_'.$extra.'time_add">'.
-                      '<span class="LC_nobreak">'.
-                      &mt("until at least [_1] $units{$extra} after launch",
-                          '<input type="text" name="ltitools_'.$extra.'valid_add" value="'.$defaulttimes{$extra}.'" />').
-                      '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+                      &mt('Yes').'</label></span></div>';
+        if ($extra eq 'returnurl') {
+            $datatable .= '<div class="LC_floatleft" style="display:none;" id="ltitools_course'.$extra.'_add">'.
+                          '<span class="LC_nobreak"> -- '.&mt('configurable in course').':&nbsp;'.
+                          '<label><input type="radio" name="ltitools_crs'.$extra.'_add" value="0" checked="checked" />'.
+                          &mt('No').'</label>'.('&nbsp;'x2).
+                          '<label><input type="radio" name="ltitools_crs'.$extra.'_add" value="1" />'.
+                          &mt('Yes').'</label>';
+        } else {
+            $datatable .= '<div class="LC_floatleft" style="display:none;" id="ltitools_'.$extra.'time_add">'.
+                          '<span class="LC_nobreak">'.
+                          &mt("until at least [_1] $units{$extra} after launch",
+                              '<input type="text" name="ltitools_'.$extra.'valid_add" value="'.$defaulttimes{$extra}.'" />');
+        }
+        $datatable .= '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
     }
     $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;'.
                   '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
@@ -6756,7 +6963,13 @@ sub print_ltitools {
         $datatable .= '</select></td>';
     }
     $datatable .= '</tr></table></fieldset>'.
-                  '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
+                  '<fieldset><legend>';
+    if ($context eq 'domain') {
+        $datatable .= &mt('Configurable in course');
+    } else {
+        $datatable .= &mt('Configurable for each instance of tool in course');
+    }
+    $datatable .= '</legend><span class="LC_nobreak">';
     foreach my $item ('label','title','target','linktext','explanation','append') {
         $datatable .= '<label>'.
                       '<input type="checkbox" name="ltitools_add_courseconfig" value="'.$item.'" checked="checked" />'.
@@ -6802,6 +7015,7 @@ sub ltitools_names {
                                           'explanation'    => 'Default Explanation',
                                           'passback'       => 'Tool can return grades:',
                                           'roster'         => 'Tool can retrieve roster:',
+                                          'returnurl'      => 'Return URL sent on launch:',
                                           'crstarget'      => 'Display target',
                                           'crslabel'       => 'Course label',
                                           'crstitle'       => 'Course title',
@@ -7090,7 +7304,7 @@ sub menuitems_categories {
                        shown => ['top','inline','foot','main'],
                        text  => ['name','role','crs','disc','fdbk'],
                        links => ['pers','logo','menu','comm','roles','help','logout'],
-                       list => ['about','prefs','port','wish','anno','rss'],
+                       list => ['about','prefs','port','wish','anno','rss','srch','brse'],
                        inline => ['cont','grades','chat','people','groups','resv','syll','feeds'],
                      );
     return (\@order,\%categories);
@@ -7130,6 +7344,8 @@ sub menuitems_fields {
                wish => 'Stored Links',
                anno => 'Calendar',
                rss => 'RSS Feeds',
+               srch => 'Search Library',
+               brse => 'Browse Library',
                cont => 'Contents',
                grades => 'Grades',
                chat => 'Chat',
@@ -7401,7 +7617,7 @@ sub print_linkprotection {
                               $onclickreturnurl.$checkedreturnurl{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
                               '<label><input type="radio" name="linkprot_returnurl_'.$i.'" value="1"'.
                               $onclickreturnurl.$checkedreturnurl{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
-                              '&nbsp;&nbsp;</span><div id="linkprot_divurlparam_'.$i.'" style="display:none" />'.
+                              '&nbsp;&nbsp;<div id="linkprot_divurlparam_'.$i.'" style="display:none">'.
                               '<span class="LC_nobreak">'.&mt('Parameter name').':'.
                               '<input type="text" size="15" name="linkprot_urlparam_'.$i.'" value="'.$values{'returnurl'}.'" autocomplete="off"'.$disabled.' />'.
                               '</span></div> ';
@@ -7473,7 +7689,7 @@ sub print_linkprotection {
                   $onclickpassback.$checkedpassback{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
                   '<label><input type="radio" name="linkprot_passback_add" value="1"'.
                   $onclickpassback.$checkedpassback{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
-                  '<br /><div id="linkprot_passbackparam_add" class="LC_floatleft" style="display:none" />'.
+                  '<br /><div id="linkprot_passbackparam_add" class="LC_floatleft" style="display:none">'.
                   '<span class="LC_nobreak">'.&mt('Grade format').
                   '<label><input type="radio" name="linkprot_passbackformat_add" value="1.1"'.$checkedpassbackfmt{'1p1'}.$disabled.' />'.
                   &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
@@ -7486,7 +7702,7 @@ sub print_linkprotection {
                   $onclickreturnurl.$checkedreturnurl{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
                   '<label><input type="radio" name="linkprot_returnurl_add" value="1"'.
                   $onclickreturnurl.$checkedreturnurl{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
-                  '&nbsp;&nbsp;</span><div id="linkprot_divurlparam_add" style="display:none" />'.
+                  '&nbsp;&nbsp;<div id="linkprot_divurlparam_add" style="display:none">'.
                   '<span class="LC_nobreak">'.&mt('Parameter name').':'.
                   '<input type="text" size="15" name="linkprot_urlparam_add" value="" autocomplete="off"'.$disabled.' />'.
                   '</span></div> ';
@@ -7710,7 +7926,7 @@ sub item_table_row_end {
 }
 
 sub yesno_radio {
-    my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit) = @_;
+    my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit,$onclick,$reverse) = @_;
     my $itemon = ' ';
     my $itemoff = ' checked="checked" ';
     if (($valueyes eq '') && ($valueno eq '')) {
@@ -7732,12 +7948,22 @@ sub yesno_radio {
     my $disabled;
     if ($noedit) {
         $disabled = ' disabled="disabled"';
+    } elsif ($onclick) {
+        $onclick = ' onclick="'.$onclick.'"';
+    }
+    if ($reverse) {
+        return '<span class="LC_nobreak"><label>'.
+               '<input type="radio" name="'.$item.'"'.
+               $itemoff.' value="'.$valueno.'"'.$disabled.$onclick.' />'.&mt('No').'</label>&nbsp;'.
+               '<label><input type="radio" name="'.$item.'"'.
+               $itemon.' value="'.$valueyes.'"'.$disabled.$onclick.' />'.&mt('Yes').'</label></span>';
+    } else {
+        return '<span class="LC_nobreak"><label>'.
+               '<input type="radio" name="'.$item.'"'.
+               $itemon.' value="'.$valueyes.'"'.$disabled.$onclick.' />'.&mt('Yes').'</label>&nbsp;'.
+               '<label><input type="radio" name="'.$item.'"'.
+               $itemoff.' value="'.$valueno.'"'.$disabled.$onclick.' />'.&mt('No').'</label></span>';
     }
-    return '<span class="LC_nobreak"><label>'.
-           '<input type="radio" name="'.$item.'"'.
-           $itemon.' value="'.$valueyes.'"'.$disabled.' />'.&mt('Yes').'</label>&nbsp;'.
-           '<label><input type="radio" name="'.$item.'"'.
-           $itemoff.' value="'.$valueno.'"'.$disabled.' />'.&mt('No').'</label></span>';
 }
 
 sub select_from_options {
@@ -7793,7 +8019,7 @@ sub select_from_options {
 }
 
 sub make_item_rows {
-    my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit) = @_;
+    my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit,$cnum) = @_;
     my $datatable;
     if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
         my $count = 0;
@@ -7856,16 +8082,65 @@ sub make_item_rows {
                 }
                 $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
             } elsif ($items->{$item}{input} eq 'selectbox') {
-                my $id;
+                my ($id,$onchange);
                 if ($caller eq 'menuitems') {
                     $id = $item;
+                } elsif ($caller eq 'grading') {
+                    if ($item eq 'grading') {
+                        $onchange = ' onchange="javascript:toggleGrading(this.form);"';
+                        $id = $item;
+                    }
                 }
                 my $curr = $settings->{$item};
                 $datatable .=
                     &select_from_options($item,$items->{$item}{'order'},
                                          $items->{$item}{'options'},$curr,
                                          $items->{$item}{'nullval'},
-                                         undef,undef,undef,$noedit,$id);
+                                         undef,undef,$onchange,$noedit,$id);
+                if ($item eq 'grading') {
+                    my ($unsetdefault,$valueyes,$valueno,$sectionbox);
+                    my $gradingsty = 'none';
+                    my $gradingsecsty = 'none';
+                    $unsetdefault = 0;
+                    my (@selsec,@sections,%current);
+                    if ($curr eq 'standard') {
+                        $gradingsty = 'inline-block';
+                        if (ref($settings) eq 'HASH') {
+                            $current{'hidetotals'} = $settings->{'hidetotals'};
+                            if ($settings->{'hidetotals'} =~ /^([\w,]+)$/) {
+                                my $secstr = $1;
+                                unless ($secstr eq 'all') {
+                                    @selsec = split(/,/,$secstr);
+                                }
+                                $current{'hidetotals'} = 1;
+                            }
+                        }
+                    }
+                    $valueyes = "1";
+                    $valueno = "0";
+                    my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+                    if (keys(%sections)) {
+                        @sections = sort( { $a <=> $b } keys(%sections));
+                    }
+                    my $onclick = 'javascript:toggleHiddenTotalsSec(this.form);';
+                    my $sectionbox = '<div id="sectotalsdiv" style="display:'.$gradingsecsty.'; float:right">';
+                    my $reverse = 1;
+                    if (@sections) {
+                        $sectionbox .= '&nbsp;...&nbsp;'.&mt('hidden in sections').':&nbsp;'.
+                                       '<div style="position: relative; top: 0%;">'.
+                                       &select_sections('hidetotals','',\@sections,\@selsec,$noedit,'all').
+                                       '</div>';
+                    }
+                    $sectionbox .= '</div>';
+                    $datatable .= '<fieldset id="hidetotalsdiv" style="display:'.$gradingsty.';">'.
+                                  '<legend style="font-weight: normal;">'.
+                                  &mt('Hide Course Points Totals').'</legend>'.
+                                  '<div style="position: relative; top: 0%; float:left">'.
+                                  &yesno_radio('hidetotals',\%current,$unsetdefault,$valueyes,$valueno,$noedit,
+                                               $onclick,$reverse).'</div>'.
+                                  $sectionbox.
+                                  '</fieldset><div style="padding:0;clear:both;margin:0;border:0"></div>';
+                }
             } elsif ($items->{$item}{input} eq 'textbox') {
                 my $disabled;
                 if ($noedit) {