--- loncom/interface/lonparmset.pm	2014/02/26 03:34:01	1.522.2.13
+++ loncom/interface/lonparmset.pm	2013/12/05 16:08:40	1.542
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.13 2014/02/26 03:34:01 raeburn Exp $
+# $Id: lonparmset.pm,v 1.542 2013/12/05 16:08:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,7 +149,7 @@ Input: See list below
 
 =back
 
-Outputs: See list below
+Outputs: See list below:
 
 =over 4
 
@@ -323,6 +323,31 @@ use HTML::Entities;
 use LONCAPA qw(:DEFAULT :match);
 
 
+sub startSettingsScreen {
+    my ($r,$mode,$crstype)=@_;
+
+    my $tabtext = &mt('Course Settings');
+    if ($crstype eq 'Community') {
+        $tabtext = &mt('Community Settings');
+    } 
+    $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
+    $r->print("\n".'<li'.($mode eq 'coursepref'?' class="active"':'').'><a href="/adm/courseprefs"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
+                                          $tabtext.
+                                          '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+
+    $r->print("\n".'<li'.($mode eq 'parmset'?' class="active"':'').' id="tabbededitor"><a href="/adm/parmset"><b>'.
+                                                                 &mt('Content and Problem Settings').'</b></a></li>');
+    $r->print("\n".'</ul>'."\n");
+    $r->print('<div class="LC_Box" style="clear:both;margin:0;" id="parameditor"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+}
+
+sub endSettingsScreen {
+   my ($r)=@_;
+   $r->print('</div></div></div>');
+}
+
+
+
 sub parmval {
     my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
     return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
@@ -878,7 +903,9 @@ sub page_js {
         var newWin = window.open(url, wdwName, options);
         newWin.focus();
     }
+
 // ]]>
+
 </script>
 $selscript
 ENDJS
@@ -906,7 +933,7 @@ COURSECONTENTSCRIPT
 }
 
 sub startpage {
-    my ($r,$psymb) = @_;
+    my ($r,$psymb,$crstype) = @_;
 
     my %loaditems = (
                       'onload'   => "group_or_section('cgroup')",
@@ -933,13 +960,14 @@ sub startpage {
 </script>
 ';
     my $start_page =
-    &Apache::loncommon::start_page('Set/Modify Course Parameters',$js,
-                       {'add_entries' => \%loaditems,});
+        &Apache::loncommon::start_page('Set/Modify Course Parameters',$js,
+                                       {'add_entries' => \%loaditems,});
     my $breadcrumbs =
     &Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
     my $escfilter=&Apache::lonhtmlcommon::entity_encode($env{'form.filter'});
     my $escpart=&Apache::lonhtmlcommon::entity_encode($env{'form.part'});
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDHEAD);
 <form method="post" action="/adm/parmset?action=settable" name="parmform">
 <input type="hidden" value="" name="pres_value" />
@@ -1418,7 +1446,7 @@ sub lookUpTableParameter {
         'lenient' => 'grading',
         'retrypartial' => 'tries',
         'discussvote'  => 'misc',
-        'examcode' => 'high_level_randomization',
+        'examcode' => 'high_level_randomization', 
     );    
 }
 
@@ -1491,30 +1519,25 @@ sub parmboxes {
         &whatIsMyCategory($tempparameter, \%categoryList);
     }
     #part to print the parm-list
-    $r->print('<div class="LC_columnSection">'."\n");
-
-    #Print parameters
-    for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
-        next if(@{$categoryList{$key}} == 0);
+    foreach my $key (sort { $category_order{$a} <=> $category_order{$b} } keys(%categoryList)) {
+        next if (@{$categoryList{$key}} == 0);
+        next if ($key eq '');
         $r->print('<div class="LC_Box LC_400Box">'
-                  .'<h4 class="LC_hcell">'
-                  .&mt($categories{$key})
-                  .'</h4>'."\n");
-        foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+                 .'<h4 class="LC_hcell">'.&mt($categories{$key}).'</h4>'."\n");
+        foreach my $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
             $r->print('<span class="LC_nobreak">'
                      .'<label><input type="checkbox" name="pscat" '
                      .'value="'.$tempkey.'" ');
             if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
-                $r->print(' checked="checked"');
+                $r->print( ' checked="checked"');
             }
             $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
                                                       : $tempkey)
                      .'</label></span><br />'."\n");
         }
-        $r->print("</div>\n");
+        $r->print('</div>');
     }
-
-    $r->print("</div>\n");
+    $r->print("\n");
 }
 #
 # This function offers some links on the parameter section to get with one click a group a parameters
@@ -2036,7 +2059,7 @@ sub assessparms {
 
 
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
-    if (!@psprt) { $psprt[0]='0'; }
+    if (!@psprt) { $psprt[0]='all'; }
     if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }
 
     my $pssymb='';
@@ -2074,8 +2097,10 @@ sub assessparms {
             $id='';
         } else {
             $message=
-            '<span class="LC_error">'.&mt("Unknown ID")." '$id' ".
-            &mt('at domain')." '$udom'</span>";
+                '<p class="LC_warning">'.
+                &mt('Unknown ID [_1] at domain [_2]',
+                    "'".$id."'","'".$udom."'").
+                '</p>';
         }
     } else {
         $uname=$env{'form.uname'};
@@ -2086,16 +2111,20 @@ sub assessparms {
         $uhome=&Apache::lonnet::homeserver($uname,$udom);
         if ($uhome eq 'no_host') {
             $message=
-            '<span class="LC_error">'.&mt("Unknown user")." '$uname' ".
-            &mt("at domain")." '$udom'</span>";
+                '<p class="LC_warning">'.
+                &mt('Unknown user [_1] at domain [_2]',
+                    "'".$uname."'","'".$udom."'").
+                '</p>';
             $uname='';
         } else {
             $csec=&Apache::lonnet::getsection($udom,$uname,
                           $env{'request.course.id'});
             if ($csec eq '-1') {
-                $message='<span class="LC_error">'.
-                &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
-                &mt("not in this course")."</span>";
+                $message=
+                    '<p class="LC_warning">'.
+                    &mt('User [_1] at domain [_2] not in this course',
+                        "'".$uname."'","'".$udom."'").
+                    '</p>';
                 $uname='';
                 $csec=$env{'form.csec'};
                 $cgroup=$env{'form.cgroup'};
@@ -2177,7 +2206,7 @@ sub assessparms {
                 my $val = $values[$i];
                 if ($name eq 'examcode') {
                    if (&Apache::lonnet::validCODE($values[$i])) {
-                       $val = 'valid';
+                       $val = 'valid';    
                    }
                 }
                 $needsrelease =
@@ -2218,7 +2247,8 @@ sub assessparms {
     if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
 # ------------------------------------------------------------------ Start page
 
-    &startpage($r,$pssymb);
+    my $crstype = &Apache::loncommon::course_type();
+    &startpage($r,$pssymb,$crstype);
 
     foreach ('tolerance','date_default','date_start','date_end',
         'date_interval','int','float','string') {
@@ -2298,7 +2328,6 @@ ENDPARMSELSCRIPT
              .'</a>'
              .'</p>');
     } else {
-        $r->print();
         # parameter screen for a single resource. 
         my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);
         my $title = &Apache::lonnet::gettitle($pssymb);
@@ -2308,12 +2337,6 @@ ENDPARMSELSCRIPT
                   '<br />');
         $r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')).
-                  '<label>'.
-                  '<input type="checkbox" name="psprt" value="all"'.
-                  ($env{'form.psprt'}?' checked="checked"':'').' />'.
-                  &mt('Show all parts').
-                  '</label></td></tr>');
         &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
@@ -2365,7 +2388,7 @@ ENDPARMSELSCRIPT
                        $userspan ++;
                    }
                    $r->print('<th colspan="'.$userspan.'" rowspan="2">');
-                   $r->print(&mt("User")." $uname ".&mt('at Domain')." $udom</th>");
+                   $r->print(&mt('User [_1] at Domain [_2]',"'".$uname."'","'".$udom."'").'</th>');
                }
                my %lt=&Apache::lonlocal::texthash(
                 'pie'    => "Parameter in Effect",
@@ -2428,9 +2451,8 @@ ENDTABLEHEADFOUR
                my $defbgtwo='';
                my $defbgthree = '';
 
-               foreach (@ids) {
+               foreach my $rid (@ids) {
 
-                my $rid=$_;
                 my ($inmapid)=($rid=~/\.(\d+)$/);
 
                 if ((!$pssymb &&
@@ -2751,6 +2773,7 @@ ENDMAPONE
         } # end of $parmlev eq general
     }
     $r->print('</form>');
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 } # end sub assessparms
 
@@ -2836,7 +2859,7 @@ sub storedata {
             } elsif ($typeof eq 'string_discussvote') {
                 $name = 'discussvote';
             } elsif ($typeof eq 'string_examcode') {
-                $name = 'examcode';
+                $name = 'examcode'; 
             } elsif ($typeof eq 'string_yesno') {
                 if ($thiskey =~ /\.retrypartial$/) {
                     $name = 'retrypartial';
@@ -3161,7 +3184,7 @@ my %strings =
              => [[ 'problem', 'Standard Problem'],
                  [ 'survey', 'Survey'],
                  [ 'anonsurveycred', 'Anonymous Survey (credit for submission)'],
-                 [ 'exam', 'Exam'],
+                 [ 'exam', 'Bubblesheet Exam'],
                  [ 'anonsurvey', 'Anonymous Survey'],
                  [ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],
                  [ 'practice', 'Practice'],
@@ -3306,6 +3329,7 @@ sub newoverview {
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype =  $env{'course.'.$env{'request.course.id'}.'.type'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
         text=>"Overview Mode"});
 
@@ -3325,6 +3349,7 @@ sub newoverview {
                                                     {'add_entries' => \%loaditems,});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDOVER);
 <form method="post" action="/adm/parmset?action=newoverview" name="parmform">
 ENDOVER
@@ -3353,7 +3378,7 @@ ENDOVER
     my $pschp=$env{'form.pschp'};
 
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
-    if (!@psprt) { $psprt[0]='0'; }
+    if (!@psprt) { $psprt[0]='all'; }
 
     my @selected_sections =
     &Apache::loncommon::get_env_multiple('form.Section');
@@ -3450,6 +3475,7 @@ ENDOVER
     $r->print(&tableend().
          ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
           '</form>');
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3492,12 +3518,14 @@ sub overview {
     my ($r) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
 
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
     text=>"Overview Mode"});
     my $start_page=&Apache::loncommon::start_page('Modify Parameters');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');
 
 # Store modified
@@ -3595,8 +3623,8 @@ ENDOVER
         my ($map,$resid,$url) =
             &Apache::lonnet::decode_symb($data{'realm'});
         $r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',
-                  $url.' <br />&nbsp;&nbsp;&nbsp;',
-                  $resid.' <br />&nbsp;&nbsp;&nbsp;',$map));
+                      $url.' <br />&nbsp;&nbsp;&nbsp;',
+                      $resid.' <br />&nbsp;&nbsp;&nbsp;',$map));
         }
         $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
         $r->print('</td></tr>');
@@ -3606,6 +3634,7 @@ ENDOVER
     $r->print(&Apache::loncommon::end_data_table().'<p>'.
           '<input type="submit" value="'.&mt('Delete Selected').'" />'.
           '</p></form>');
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3613,12 +3642,14 @@ sub date_shift_one {
     my ($r) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
 
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print('<form name="shiftform" method="post" action="">'.
               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
@@ -3631,6 +3662,7 @@ sub date_shift_one {
               '<input type="hidden" name="action" value="dateshift2" />'.
               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
               '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3638,23 +3670,20 @@ sub date_shift_two {
     my ($r) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
-    $r->print('<h2>'.&mt('Shift Dates').'</h2>'.
-              '<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
+    $r->print(&mt('Shifting all dates such that [_1] becomes [_2]',
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
-              &Apache::lonlocal::locallocaltime($timeshifted)).'</p>');
+              &Apache::lonlocal::locallocaltime($timeshifted)));
     my $delta=$timeshifted-$env{'form.timebase'};
     &dateshift($delta);
-    $r->print(
-        &Apache::lonhtmlcommon::confirm_success(&mt('Done')).
-        '<br /><br />'.
-        &Apache::lonhtmlcommon::actionbox(
-            ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3699,7 +3728,7 @@ sub parse_key {
 
 
 sub header {
-    return &Apache::loncommon::start_page('Content and Problem Settings');
+    return &Apache::loncommon::start_page('Settings');
 }
 
 
@@ -3709,6 +3738,10 @@ sub print_main_menu {
     #
     $r->print(&header());
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content and Problem Settings'));
+    my $crstype = &Apache::loncommon::course_type();
+    my $lc_crstype = lc($crstype);
+
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -3724,9 +3757,6 @@ ENDMAINFORMHEAD
                                         '/'.$env{'request.course.sec'});
     }
 
-    my $crstype = &Apache::loncommon::course_type();
-    my $lc_crstype = lc($crstype);
-
     my @menu =
         ( { categorytitle=>"Content Settings for this $crstype",
         items => [
@@ -3794,7 +3824,9 @@ ENDMAINFORMHEAD
             }]}
           );
     $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
-    $r->print('</form>'.&Apache::loncommon::end_page());
+    $r->print('</form>');
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -3862,6 +3894,7 @@ sub order_meta_fields {
     my $idx = 1;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};;
     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
         text=>"Add Metadata Field"});
@@ -3870,6 +3903,7 @@ sub order_meta_fields {
               text=>"Restrict Metadata"},
              {text=>"Order Metadata"});
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+    &startSettingsScreen($r,'parmset',$crstype);
     if ($env{'form.storeorder'}) {
         my $newpos = $env{'form.newpos'} - 1;
         my $currentpos = $env{'form.currentpos'} - 1;
@@ -3939,6 +3973,7 @@ sub order_meta_fields {
         $idx ++;
     }
     $r->print('</table>');
+    &endSettingsScreen($r);
     return 'ok';
 }
 
@@ -3960,6 +3995,8 @@ sub addmetafield {
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    &startSettingsScreen($r,'parmset',$crstype);
     if (exists($env{'form.undelete'})) {
         my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
         foreach my $meta_field(@meta_fields) {
@@ -3999,6 +4036,7 @@ sub addmetafield {
         $r->print('<input type="submit" value="Add Metadata Field" />');
     }
     $r->print('</form>');
+    &endSettingsScreen($r);
 }
 
 
@@ -4015,6 +4053,8 @@ sub setrestrictmeta {
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    &startSettingsScreen($r,'parmset',$crstype);
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
     my $save_field = '';
     if ($env{'form.restrictmeta'}) {
@@ -4085,6 +4125,7 @@ ENDButtons
         $buttons
         </form>
 ENDenv
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
 }
@@ -4125,14 +4166,16 @@ sub defaultsetter {
 
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
         text=>"Set Defaults"});
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
     my $start_page =
-    &Apache::loncommon::start_page('Parameter Setting Default Actions');
+        &Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');
 
-    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my @ids=();
     my %typep=();
     my %keyp=();
@@ -4186,8 +4229,8 @@ sub defaultsetter {
     foreach my $key (keys %allparms) {
         $newrules{$key.'_triggers'}=$triggers{$key};
     }
-    &Apache::lonnet::put('parmdefactions',\%newrules,$dom,$crs);
-    &Apache::lonnet::del('parmdefactions',\@delrules,$dom,$crs);
+    &Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
+    &Apache::lonnet::del('parmdefactions',\@delrules,$cdom,$cnum);
     &resetrulescache();
     }
     my %lt=&Apache::lonlocal::texthash('days' => 'Days',
@@ -4275,6 +4318,7 @@ ENDYESNO
     $r->print(&Apache::loncommon::end_data_table().
           "\n".'<input type="submit" name="storerules" value="'.
           &mt('Save').'" /></form>'."\n");
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
     return;
 }
@@ -4363,6 +4407,9 @@ sub standard_parameter_types {
 
 sub parm_change_log {
     my ($r)=@_;
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
     text=>"Parameter Change Log"});
     my $js = '<script type="text/javascript">'."\n".
@@ -4372,9 +4419,8 @@ sub parm_change_log {
              '</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
-    my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
-                      $env{'course.'.$env{'request.course.id'}.'.domain'},
-                      $env{'course.'.$env{'request.course.id'}.'.num'});
+    &startSettingsScreen($r,'parmset',$crstype);
+    my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',$cdom,$cnum);
 
     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
 
@@ -4392,8 +4438,7 @@ sub parm_change_log {
               '<input type="submit" value="'.&mt('Display').'" />'.
               '</form></fieldset></div><br clear="all" />');
 
-    my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
-                             $env{'course.'.$env{'request.course.id'}.'.domain'});
+    my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
           '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
           &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
@@ -4540,6 +4585,7 @@ sub parm_change_log {
           || $shown<=$env{'form.show'})) { last; }
     }
     $r->print(&Apache::loncommon::end_data_table());
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -4588,10 +4634,10 @@ sub update_slots {
                           context => 'parameter',
                         );
         &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
-                                        '',$uname,$udom,$cnum,$cdom);
+                                   '',$uname,$udom,$cnum,$cdom);
 
         &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                        '',$uname,$udom,$uname,$udom);
+                                   '',$uname,$udom,$uname,$udom);
     }
     return $success;
 }
@@ -4622,9 +4668,9 @@ sub delete_slots {
                                   context => 'parameter',
                                 );
                 &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
-                                                1,$uname,$udom,$cnum,$cdom);
+                                           1,$uname,$udom,$cnum,$cdom);
                 &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                                1,$uname,$udom,$uname,$udom);
+                                           1,$uname,$udom,$uname,$udom);
             }
         }
     }