--- loncom/interface/lonparmset.pm	2022/07/26 03:04:14	1.522.2.28.2.2
+++ loncom/interface/lonparmset.pm	2012/05/09 19:46:30	1.523
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.28.2.2 2022/07/26 03:04:14 raeburn Exp $
+# $Id: lonparmset.pm,v 1.523 2012/05/09 19:46:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,8 +36,7 @@ lonparmset - Handler to set parameters f
 
 =head1 SYNOPSIS
 
-lonparmset provides an interface to setting content parameters in a 
-course.
+lonparmset provides an interface to setting course parameters. 
 
 =head1 DESCRIPTION
 
@@ -47,6 +46,8 @@ This module sets coursewide and assessme
 
 =over
 
+=pod
+
 =item parmval()
 
 Figure out a cascading parameter.
@@ -130,7 +131,7 @@ javascript function 'pjump'.
 
 =item print_td()
 
-=item check_other_groups()
+=item print_usergroups()
 
 =item parm_control_group()
 
@@ -138,21 +139,15 @@ javascript function 'pjump'.
 
  extractResourceInformation extracts lots of information about all of the the course's resources into a variety of hashes.
 
-Input: See list below
-
-=over 4
+Input: See list below:
 
 =item * B<env{'user.name'}> : Current username
 
 =item * B<env{'user.domain'}> : Domain of current user.
 
-=item * B<env{"request.course.fn"}> : Course
-
-=back
-
-Outputs: See list below
+=item * b<env{"request.course.fn"} : Course
 
-=over 4
+Outputs: See list below:
 
 =item * B<ids> (out) : An array that will contain all of the ids in the course.
 
@@ -178,8 +173,6 @@ Outputs: See list below
 
 =item * B<defkeytype>
 
-=back
-
 =item isdateparm()
 
 =item parmmenu()
@@ -217,8 +210,6 @@ Returns: nothing
 
 Variables used (guessed by Jeremy):
 
-=over
-
 =item * B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
 
 =item * B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
@@ -231,8 +222,6 @@ Variables used (guessed by Jeremy):
         When storing information, store as part 0
         When requesting information, request from full part
 
-=back
-
 =item tablestart()
 
 =item tableend()
@@ -299,6 +288,7 @@ Set portfolio metadata
 
 Main handler.  Calls &assessparms subroutine.
 
+
 =back
 
 =cut
@@ -324,6 +314,27 @@ use HTML::Entities;
 use LONCAPA qw(:DEFAULT :match);
 
 
+sub startSettingsScreen {
+    my ($r,$mode)=@_;
+
+    $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;'.
+                                          &mt('Course Settings').
+                                          '&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,
@@ -650,7 +661,7 @@ sub storeparm_by_symb {
 }
 
 sub log_parmset {
-    return &Apache::lonnet::write_log('course','parameterlog',@_);
+    return &Apache::lonnet::instructor_log('parameterlog',@_);
 }
 
 sub storeparm_by_symb_inner {
@@ -757,27 +768,14 @@ sub valout {
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
-        if ($editable) {
-            $result =
-                '<img src="/res/adm/pages/editmap.png"'
-               .' alt="'.&mt('Change').'"'
-               .' title="'.&mt('Change').'" style="border:0;" />';
-        } else {
-            $result='&nbsp;';
-        }
+    if ($editable) {
+        $result = '<span class="LC_clickhere">*</span>';
+    } else {
+        $result='&nbsp;';
+    }
     } else {
         if ($type eq 'date_interval') {
-            my ($totalsecs,$donesuffix) = split(/_/,$value,2);
-            my ($usesdone,$donebuttontext,$proctor,$secretkey);
-            if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
-                $donebuttontext = $1;
-                (undef,$proctor,$secretkey) = split(/_/,$2);
-                $usesdone = 'done';
-            } elsif ($donesuffix =~ /^done(|_.+)$/) {
-                $donebuttontext = &mt('Done');
-                ($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix);
-            }
-            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
+            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
             my @timer;
             $year=$year-70;
             $mday--;
@@ -810,13 +808,6 @@ sub valout {
                 push(@timer,&mt('[quant,_1,sec]',0));
             }
             $result.=join(", ",@timer);
-            if ($usesdone eq 'done') {
-                if ($secretkey) {
-                    $result .= ' '.&mt('+ "[_1]" with proctor key: [_2]',$donebuttontext,$secretkey);
-                } else {
-                    $result .= ' + "'.$donebuttontext.'"';
-                }
-            }
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
         &date_sanity_info($value);
@@ -834,12 +825,8 @@ sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-        if ((&isdateparm($type)) || (&is_specialstring($type))) {
+    if (&isdateparm($type)) {
             $winvalue=$env{'form.recent_'.$type};
-        } elsif ($type eq 'string_yesno') {
-            if ($env{'form.recent_string'} =~ /^(yes|no)$/i) {
-                $winvalue=$env{'form.recent_string'};
-            }
         } else {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
@@ -872,22 +859,20 @@ sub page_js {
     $pjump_def
 
     function psub() {
-        var specstring = /^string_!(yesno|any)/i;
         if (document.parmform.pres_marker.value!='') {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
             typedef=document.parmform.pres_type.value.split('_');
-            if (document.parmform.pres_type.value!='') {
-                if ((typedef[0]=='date') ||
-                    (specstring.test(document.parmform.pres_type.value)))  {
-                    eval('document.parmform.recent_'+
-                        document.parmform.pres_type.value+
-                        '.value=document.parmform.pres_value.value;');
-                } else {
-                    eval('document.parmform.recent_'+typedef[0]+
-                        '.value=document.parmform.pres_value.value;');
-                }
+           if (document.parmform.pres_type.value!='') {
+            if (typedef[0]=='date') {
+                eval('document.parmform.recent_'+
+                     document.parmform.pres_type.value+
+             '.value=document.parmform.pres_value.value;');
+            } else {
+                eval('document.parmform.recent_'+typedef[0]+
+             '.value=document.parmform.pres_value.value;');
             }
+       }
             document.parmform.submit();
         } else {
             document.parmform.pres_value.value='';
@@ -902,7 +887,9 @@ sub page_js {
         var newWin = window.open(url, wdwName, options);
         newWin.focus();
     }
+
 // ]]>
+
 </script>
 $selscript
 ENDJS
@@ -929,98 +916,6 @@ function showHide_courseContent() {
 COURSECONTENTSCRIPT
 }
 
-sub validateparms_js {
-    return <<'ENDSCRIPT';
-
-function validateParms() {
-    var ipallowRegExp = /^setipallow_/;
-    var ipdenyRegExp = /^setipdeny_/;
-    var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
-    if ((document.parmform.elements.length != 'undefined')  && (document.parmform.elements.length) != 'null') {
-        if (document.parmform.elements.length) {
-            for (i=0; i<document.parmform.elements.length; i++) {
-                var name=document.parmform.elements[i].name;
-                if (ipallowRegExp.test(name)) {
-                    var identifier = name.replace(ipallowRegExp,'');
-                    var possallow = document.parmform.elements[i].value;
-                    possallow = possallow.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possallow)) {
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possallow = ','+possallow;
-                        }
-                        document.parmform.elements['set_'+identifier].value += possallow;
-                    }
-                } else if (ipdenyRegExp.test(name)) {
-                    var identifier = name.replace(ipdenyRegExp,'');
-                    var possdeny = document.parmform.elements[i].value;
-                    possdeny = possdeny.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possdeny)) {
-                        possdeny = '!'+possdeny;
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possdeny = ','+possdeny;
-                        }
-                        document.parmform.elements['set_'+identifier].value += possdeny;
-                    }
-                }
-            }
-        }
-    }
-    return true;
-}
-
-ENDSCRIPT
-}
-
-# Javascript initialization, for overview mode
-sub ipacc_boxes_js  {
-    my $remove = &mt('Remove');
-    return <<"END";
-\$(document).ready(function() {
-    var wrapper         = \$(".LC_string_ipacc_wrap");
-    var add_button      = \$(".LC_add_ipacc_button");
-    var ipaccRegExp     = /^LC_string_ipacc_/;
-
-    \$(add_button).click(function(e){
-        e.preventDefault();
-        var identifier = \$(this).closest("div").attr("id");
-        identifier = identifier.replace(ipaccRegExp,'');
-        \$(this).closest('div').find('.LC_string_ipacc_inner').append('<div><input type="text" name="setip'+identifier+'" /><a href="#" class="LC_remove_ipacc">$remove</a></div>');
-    });
-
-    \$(wrapper).delegate(".LC_remove_ipacc","click", function(e){
-        e.preventDefault(); \$(this).closest("div").remove();
-    })
-});
-
-
-END
-}
-
-sub done_proctor_js {
-    return <<"END";
-function toggleSecret(form,radio,key) {
-    var radios = form[radio+key];
-    if (radios.length) {
-        for (var i=0; i<radios.length; i++) {
-            if (radios[i].checked) {
-                if (radios[i].value == '_done_proctor') {
-                    if (document.getElementById('done_'+key+'_proctorkey')) {
-                        document.getElementById('done_'+key+'_proctorkey').type='text';
-                    }
-                } else {
-                    if (document.getElementById('done_'+key+'_proctorkey')) {
-                        document.getElementById('done_'+key+'_proctorkey').type='hidden';
-                        document.getElementById('done_'+key+'_proctorkey').value='';
-                    }
-                }
-            }
-        }
-    }
-}
-END
-
-}
-
 sub startpage {
     my ($r,$psymb) = @_;
 
@@ -1049,13 +944,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');
     $r->print(<<ENDHEAD);
 <form method="post" action="/adm/parmset?action=settable" name="parmform">
 <input type="hidden" value="" name="pres_value" />
@@ -1070,8 +966,7 @@ ENDHEAD
 
 sub print_row {
     my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
-    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp,
-    $readonly)=@_;
+    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups)=@_;
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
@@ -1116,31 +1011,31 @@ sub print_row {
     if ($parmlev eq 'general') {
 
         if ($uname) {
-            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } elsif ($csec) {
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } else {
-            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         }
     } elsif ($parmlev eq 'map') {
 
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } elsif ($csec) {
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } else {
-            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         }
     } else {
         if ($uname) {
             if (@{$usersgroups} > 1) {
                 my ($coursereply,$grp_parm,$controlgrp);
                 ($coursereply,$othergrp,$grp_parm,$controlgrp) =
-                    &check_other_groups($$part{$which}.'.'.$$name{$which},
+                    &print_usergroups($r,$$part{$which}.'.'.$$name{$which},
                        $rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);
                 if ($coursereply && $result > 3) {
                     if (defined($controlgrp)) {
@@ -1153,32 +1048,32 @@ sub print_row {
             }
         }
 
-        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
 
-    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
 
     if ($csec) {
-        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
     }
 
         if ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
-            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         }
 
     if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
-        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
     }
 
     } # end of $parmlev if/else
@@ -1198,27 +1093,15 @@ sub print_row {
 }
 
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly)=@_;
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
               ';" align="center">');
     my $nolink = 0;
-    if ($readonly) {
+    if ($which == 11 || $which == 12) {
         $nolink = 1;
-    } else {
-        if ($which == 11 || $which == 12) {
+    } elsif ($mprefix =~ /availablestudent\&$/) {
+        if ($which > 3) {
             $nolink = 1;
-        } elsif (($env{'request.course.sec'} ne '') && ($which > 9)) {
-            $nolink = 1;
-        } elsif ($which == 4 || $which ==  5 || $which == 6) {
-            if ($noeditgrp) {
-                $nolink = 1;
-            }
-        } elsif ($mprefix =~ /availablestudent\&$/) {
-            $nolink = 1;
-        } elsif ($mprefix =~ /examcode\&$/) {
-            unless ($which == 2) {
-                $nolink = 1;
-            }
         }
     }
     if ($nolink) {
@@ -1231,8 +1114,8 @@ sub print_td {
     $r->print('</td>'."\n");
 }
 
-sub check_other_groups {
-    my ($what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
+sub print_usergroups {
+    my ($r,$what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
     my $courseid = $env{'request.course.id'};
     my $output;
     my $symb = &symbcache($rid);
@@ -1247,6 +1130,7 @@ sub check_other_groups {
     if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
+            $grp_parm = &valout($coursereply,$resulttype);
         }
         $grp_parm = &valout($coursereply,$resulttype);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
@@ -1372,7 +1256,7 @@ sub extractResourceInformation {
             $$mapp{$mapid}=$$mapp{$id};
             $$allmaps{$mapid}=$$mapp{$id};
             if ($mapid eq '1') {
-                $$maptitles{$mapid}=&mt('Main Content');
+                $$maptitles{$mapid}=&mt('Main Course Documents');
             } else {
                 $$maptitles{$mapid}=&Apache::lonnet::gettitle($$mapp{$id});
             }
@@ -1392,21 +1276,14 @@ sub isdateparm {
     return (($type=~/^date/) && (!($type eq 'date_interval')));
 }
 
-# Determine if parameter type is specialized string type (i.e.,
-# not just string or string_yesno.
-
-sub is_specialstring {
-    my $type=shift;
-    return (($type=~/^string_/) && (($type ne 'string_yesno')));
-}
-
 #
 # parmmenu displays a list of the selected parameters.
 # It also offers a link to show/hide the complete parameter list
 # from which you can select all desired parameters.
 #
 sub parmmenu {
-    my ($r)=@_;
+    my ($r,$allparms,$pscat,$keyorder)=@_;
+    my $tempkey;
     $r->print(<<ENDSCRIPT);
 <script type="text/javascript">
 // <![CDATA[
@@ -1485,7 +1362,7 @@ sub parmmenu {
 ENDSCRIPT
 
     $r->print('<hr />');
-    &shortCuts($r);
+    &shortCuts($r,$allparms,$pscat,$keyorder);
     $r->print('<hr />');
 }
 # return a hash
@@ -1513,8 +1390,8 @@ sub lookUpTableParameter {
         'contentopen' => 'time_settings',
         'contentclose' => 'time_settings',
         'discussend' => 'time_settings',
-	'printstartdate' => 'time_settings',
-	'printenddate' => 'time_settings',
+	'printopendate' => 'time_settings',
+	'printclosedate' => 'time_settings',
         'weight' => 'grading',
         'handgrade' => 'grading',
         'maxtries' => 'tries',
@@ -1549,8 +1426,8 @@ sub lookUpTableParameter {
         'lenient' => 'grading',
         'retrypartial' => 'tries',
         'discussvote'  => 'misc',
-        'examcode' => 'high_level_randomization',
-    );
+
+    );    
 }
 
 sub whatIsMyCategory {
@@ -1626,24 +1503,26 @@ sub parmboxes {
 
     #Print parameters
     for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
-        next if(@{$categoryList{$key}} == 0);
-        $r->print('<div class="LC_Box LC_400Box">'
-                  .'<h4 class="LC_hcell">'
-                  .&mt($categories{$key})
-                  .'</h4>'."\n");
-        foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
-            next if ($tempkey eq '');
-            $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(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+        if(@{$categoryList{$key}} == 0) {
+            next;
+        } else { 
+            $r->print('<div class="LC_Box LC_400Box">'
+                     .'<h4 class="LC_hcell">'
+                     .&mt($categories{$key})
+                     .'</h4>'."\n");
+            foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+                    $r->print('<span class="LC_nobreak">'
+                             .'<label><input type="checkbox" name="pscat" ');
+                $r->print('value="'.$tempkey.'" ');
+                if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+                    $r->print(' checked="checked"');
+                }
+                $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
                                                       : $tempkey)
-                     .'</label></span><br />'."\n");
+                        .'</label></span><br />'."\n");
+            }
+            $r->print("</div>\n");
         }
-        $r->print("</div>\n");
     }
 
     $r->print("</div>\n");
@@ -1652,7 +1531,7 @@ sub parmboxes {
 # This function offers some links on the parameter section to get with one click a group a parameters
 #
 sub shortCuts {
-    my ($r)=@_;
+    my ($r,$allparms,$pscat,$keyorder)=@_;
 
     # Parameter Selection
     $r->print(
@@ -1711,60 +1590,21 @@ sub partmenu {
 }
 
 sub usermenu {
-    my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups,$pssymb)=@_;
+    my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups)=@_;
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
-                  &Apache::loncommon::selectstudent_link('parmform','uname','udom','condition').
-                  &Apache::lonhtmlcommon::scripttag(<<ENDJS);
-function setCourseadv(form,caller) {
-    if (caller.value == 'st') {
-        form.courseadv.value = 'none';
-    } else {
-        form.courseadv.value = '';
-    }
-    return;
-}
-ENDJS
+        &Apache::loncommon::selectstudent_link('parmform','uname','udom');
+    my $selscript=&Apache::loncommon::studentbrowser_javascript();
 
-    my (%chkroles,$stuonly,$courseadv);
-    if ($env{'form.userroles'} eq 'any') {
-        $chkroles{'any'} = ' checked="checked"';
-    } else {
-        $chkroles{'st'} = ' checked="checked"';
-        $courseadv = 'none';
-    }
-    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
-    if ($crstype eq 'Community') {
-        $stuonly = &mt('member only');
-    } else {
-        $stuonly = &mt('student only');
-    }
-    $chooseopt .= '<br /><span class="LC_cusr_subheading">'.
-                  &mt("User's role").':&nbsp;'.
-                  '<label><input type="radio" name="userroles" value="st"'.$chkroles{'st'}.' onclick="setCourseadv(this.form,this);" />'.
-                  $stuonly.'</label>&nbsp;&nbsp;'.
-                  '<label><input type="radio" name="userroles" value="any"'.$chkroles{'any'}.' onclick="setCourseadv(this.form,this);" />'.
-                  &mt('any role').'</label><input type="hidden" id="courseadv" name="courseadv" value="'.$courseadv.'" /></span>';
     my $sections='';
     my %sectionhash = &Apache::loncommon::get_sections();
 
     my $groups;
-    my %grouphash;
-    if (($pssymb) || &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
-        %grouphash = &Apache::longroup::coursegroups();
-    } elsif ($env{'request.course.groups'} ne '') {
-        map { $grouphash{$_} = 1; } split(/:/,$env{'request.course.groups'});
-    }
+    my %grouphash = &Apache::longroup::coursegroups();
 
     my $g_s_header='';
     my $g_s_footer='';
 
-    my $currsec = $env{'request.course.sec'};
-    if ($currsec) {
-        $sections=&mt('Section:').' '.$currsec;
-        if (%grouphash) {
-            $sections .= ';'.('&nbsp;' x2);
-        }
-    } elsif (%sectionhash && $currsec eq '') {
+    if (%sectionhash) {
         $sections=&mt('Section:').' <select name="csec"';
         if (%grouphash && $parmlev ne 'full') {
             $sections .= qq| onchange="group_or_section('csec')" |;
@@ -1778,7 +1618,7 @@ ENDJS
         $sections.='</select>';
     }
 
-    if (%sectionhash && %grouphash && $parmlev ne 'full' && $currsec eq '') {
+    if (%sectionhash && %grouphash && $parmlev ne 'full') {
         $sections .= '&nbsp;'.&mt('or').'&nbsp;';
         $sections .= qq|
 <script type="text/javascript">
@@ -1797,7 +1637,7 @@ function group_or_section(caller) {
 // ]]>
 </script>
 |;
-    } elsif ($currsec eq '') {
+    } else {
         $sections .= qq|
 <script type="text/javascript">
 // <![CDATA[
@@ -1811,7 +1651,7 @@ function group_or_section(caller) {
 
     if (%grouphash) {
         $groups=&mt('Group:').' <select name="cgroup"';
-        if (%sectionhash && $env{'form.action'} eq 'settable' && $currsec eq '') {
+        if (%sectionhash && $env{'form.action'} eq 'settable') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
         $groups .= '>';
@@ -1850,13 +1690,13 @@ function group_or_section(caller) {
 # This function shows on table Mode the available Parameters for the selected Resources
 #
 sub displaymenu {
-    my ($r,$allparms,$pscat,$keyorder,$divid)=@_;
+    my ($r,$allparms,$pscat,$psprt,$keyorder)=@_;
 
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
 
-    &parmmenu($r);
-    $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
+    &parmmenu($r,$allparms,$pscat,$keyorder);
+    $r->print(&Apache::loncommon::start_scrollbox());
     &parmboxes($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::loncommon::end_scrollbox());
 
@@ -1930,7 +1770,7 @@ sub mapmenu {
            .'</div>'
         );
 
-        $r->print(&Apache::loncommon::start_scrollbox('700px','680px','400px','mapmenuscroll'));
+        $r->print(&Apache::loncommon::start_scrollbox(undef,undef,undef,'mapmenuscroll'));
         $r->print(&Apache::loncommon::start_data_table(undef,'mapmenuinner'));
 
         # Display row: "All Maps or Folders"
@@ -1949,7 +1789,7 @@ sub mapmenu {
            .&Apache::loncommon::end_data_table_row()
         );
 
-        # Display row: "Main Content"
+        # Display row: "Main Course Documents"
         if (exists($$allmaps{1})) {
             $r->print(
                 &Apache::loncommon::start_data_table_row()
@@ -2035,52 +1875,44 @@ sub levelmenu {
 
 
 sub sectionmenu {
-    my ($selectedsections)=@_;
+    my ($r,$selectedsections)=@_;
     my %sectionhash = &Apache::loncommon::get_sections();
-    return '' if (!%sectionhash);
+    return if (!%sectionhash);
 
-    my (@possibles,$disabled);
-    if ($env{'request.course.sec'} ne '') {
-        @possibles = ($env{'request.course.sec'});
-        $selectedsections = [$env{'request.course.sec'}];
-        $disabled = ' disabled="disabled"';
-    } else {
-        @possibles = ('all',sort(keys(%sectionhash)));
-    }
-    my $output = '<select name="Section" multiple="multiple" size="8"'.$disabled.'>';
-    foreach my $s (@possibles) {
-        $output .= '    <option value="'.$s.'"';
-        if ((@{$selectedsections}) && (grep(/^\Q$s\E$/,@{$selectedsections}))) {
-            $output .= ' selected="selected"';
+    $r->print('<select name="Section" multiple="multiple" size="8">');
+    foreach my $s ('all',sort keys %sectionhash) {
+    $r->print('    <option value="'.$s.'"');
+    foreach (@{$selectedsections}) {
+        if ($s eq $_) {
+        $r->print(' selected="selected"');
+        last;
         }
-        $output .= '>'."$s</option>\n";
     }
-    $output .= "</select>\n";
-    return $output;
+    $r->print('>'.$s."</option>\n");
+    }
+    $r->print("</select>\n");
 }
 
 sub groupmenu {
-    my ($selectedgroups)=@_;
-    my %grouphash;
-    if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
-        %grouphash = &Apache::longroup::coursegroups();
-    } elsif ($env{'request.course.groups'} ne '') {
-        map { $grouphash{$_} = 1; } split(/:/,$env{'request.course.groups'});
-    }
-    return '' if (!%grouphash);
+    my ($r,$selectedgroups)=@_;
+    my %grouphash = &Apache::longroup::coursegroups();
+    return if (!%grouphash);
 
-    my $output = '<select name="Group" multiple="multiple" size="8">';
+    $r->print('<select name="Group" multiple="multiple" size="8">');
     foreach my $group (sort(keys(%grouphash))) {
-        $output .= '    <option value="'.$group.'"';
-        if ((@{$selectedgroups}) && (grep(/^\Q$group\E$/,\@{$selectedgroups}))) {
-            $output .= ' selected="selected"';
+    $r->print('    <option value="'.$group.'"');
+    foreach (@{$selectedgroups}) {
+        if ($group eq $_) {
+        $r->print(' selected="selected"');
+        last;
         }
-        $output .= '>'.$group."</option>\n";
     }
-    $output .= "</select>\n";
-    return $output;
+    $r->print('>'.$group."</option>\n");
+    }
+    $r->print("</select>\n");
 }
 
+
 sub keysplit {
     my $keyp=shift;
     return (split(/\,/,$keyp));
@@ -2149,14 +1981,15 @@ sub standardkeyorder {
         'parameter_0_discussend' => 19,
         'parameter_0_discusshide' => 20,
         'parameter_0_discussvote' => 21,
-	'parameter_0_printstartdate'  =>  22,
-	'parameter_0_printenddate' =>  23);
+	'parameter_0_printopendate'  =>  22,
+	'parameter_0_printclosedate' =>  23);
 }
 
 
 sub assessparms {
 
-    my ($r,$parm_permission) = @_;
+    my $r=shift;
+
 
 
 # -------------------------------------------------------- Variable declaration
@@ -2199,21 +2032,7 @@ sub assessparms {
     my $message='';
 
     $csec=$env{'form.csec'};
-    if ($env{'request.course.sec'} ne '') {
-        $csec = $env{'request.course.sec'};    
-    }
-
-# Check group privs.
     $cgroup=$env{'form.cgroup'};
-    my $noeditgrp;
-    if ($cgroup ne '') {
-        unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
-            if (($env{'request.course.groups'} eq '') ||
-                (!grep(/^\Q$cgroup\E$/,split(/:/,$env{'request.course.groups'})))) {
-                $noeditgrp = 1;
-            }
-        }
-    }
 
     if      ($udom=$env{'form.udom'}) {
     } elsif ($udom=$env{'request.role.domain'}) {
@@ -2228,7 +2047,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='';
@@ -2285,124 +2104,25 @@ sub assessparms {
             $csec=&Apache::lonnet::getsection($udom,$uname,
                           $env{'request.course.id'});
             if ($csec eq '-1') {
-                my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
-                if ($env{'form.userroles'} eq 'any') {
-                    if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
-                        $csec = $env{'request.course.sec'};
-                        $message = '<span class="LC_info">';
-                        if ($crstype eq 'Community') {
-                            $message .= &mt('User [_1] at domain [_2] has a non-member role in this community',
-                                            $uname,$udom);
-                        } else {
-                            $message .= &mt('User [_1] at domain [_2] has a non-student role in this course',
-                                            $uname,$udom);
-                        }
-                        $message .= '</span>';
-                    } else {
-                        my @possroles = ('in','ep','ta','cr');
-                        if ($crstype eq 'Community') {
-                            unshift(@possroles,'co');
-                        } else {
-                            unshift(@possroles,'cc');
-                        }
-                        my %not_student_roles =
-                            &Apache::lonnet::get_my_roles($uname,$udom,'userroles',['active'],
-                                                          \@possroles,[$udom],1,1);
-                        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                        my %sections_by_role;
-                        foreach my $role (keys(%not_student_roles)) {
-                            if ($role =~ /^\Q$cnum:$cdom:\E([^:]+):(|[^:]+)$/) {
-                                my ($rolename,$sec) = ($1,$2);
-                                if ($rolename =~ m{^cr/}) {
-                                    $rolename = 'cr';
-                                }
-                                push(@{$sections_by_role{$rolename}},$sec);
-                            }
-                        }
-                        my $numroles = scalar(keys(%sections_by_role));
-                        if ($numroles) {
-                            foreach my $role (@possroles) {
-                                if (ref($sections_by_role{$role}) eq 'ARRAY') {
-                                    my @secs = sort { $a <=> $b } @{$sections_by_role{$role}};
-                                    $csec = $secs[0];
-                                    last;
-                                }
-                            }
-                        }
-                        if ($csec eq '-1') {
-                            $message = '<span class="LC_warning">';
-                            if ($crstype eq 'Community') {
-                                $message .= &mt('User [_1] at domain [_2] does not have a role in this community',
-                                                $uname,$udom);
-                            } else {
-                                $message .= &mt('User [_1] at domain [_2] does not have a role in this course',
-                                                $uname,$udom);
-                            }
-                            $message .= '</span>';
-                            $uname='';
-                            if ($env{'request.course.sec'} ne '') {
-                                $csec=$env{'request.course.sec'};
-                            } else {
-                                $csec=$env{'form.csec'};
-                            }
-                            $cgroup=$env{'form.cgroup'};
-                        } else {
-                            $message = '<span class="LC_info">';
-                            if ($crstype eq 'Community') {
-                                $message .= &mt('User [_1] at domain [_2] has a non-member role in this community',
-                                         $uname,$udom);
-                            } else {
-                                $message .= &mt('User [_1] at domain [_2] has a non-student role in this course',
-                                                $uname,$udom);
-                            }
-                            $message .= '</span>';
-                        }
-                    }
-                } else {
-                    $message = '<span class="LC_warning">';
-                    if ($crstype eq 'Community') {
-                        $message .= &mt('User [_1] at domain [_2] does not have a member role in this community',
-                                         $uname,$udom);
-                    } else {
-                         $message .= &mt('User [_1] at domain [_2] does not have a student role in this course',
-                                         $uname,$udom);
-                    }
-                    $message .= '</span>';
-                    $uname='';
-                    if ($env{'request.course.sec'} ne '') {
-                        $csec=$env{'request.course.sec'};
-                    } else {
-                        $csec=$env{'form.csec'};
-                    }
-                    $cgroup=$env{'form.cgroup'};
-                }
-            } elsif ($env{'request.course.sec'} ne '') {
-                if ($csec ne $env{'request.course.sec'}) {
-                    $message='<span class="LC_warning">'.
-                              &mt("User '[_1]' at domain '[_2]' not in section '[_3]'",
-                                  $uname,$udom,$env{'request.course.sec'}).
-                              '</span>';
-                    $uname='';
-                    $csec=$env{'request.course.sec'};
-                }
+                $message='<span class="LC_error">'.
+                &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
+                &mt("not in this course")."</span>";
+                $uname='';
+                $csec=$env{'form.csec'};
                 $cgroup=$env{'form.cgroup'};
-            }
-            if ($uname ne '') {
+            } else {
                 my %name=&Apache::lonnet::userenvironment($udom,$uname,
                   ('firstname','middlename','lastname','generation','id'));
-                $message .= "\n<p>\n".&mt('Full Name').': '
-                            .$name{'firstname'}.' '.$name{'middlename'}.' '
-                            .$name{'lastname'}.' '.$name{'generation'}
-                            ."<br />\n".&mt('Student/Employee ID').': '.$name{'id'}.'</p>';
-                @usersgroups = &Apache::lonnet::get_users_groups(
-                                   $udom,$uname,$env{'request.course.id'});
-                if (@usersgroups > 0) {
-                    unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
-                        $cgroup = $usersgroups[0];
-                    }
-                } else {
-                    $cgroup = '';
+                $message="\n<p>\n".&mt("Full Name").": ".
+                $name{'firstname'}.' '.$name{'middlename'}.' '
+                .$name{'lastname'}.' '.$name{'generation'}.
+                "<br />\n".&mt('Student/Employee ID').": ".$name{'id'}.'<p>';
+            }
+            @usersgroups = &Apache::lonnet::get_users_groups(
+                                       $udom,$uname,$env{'request.course.id'});
+            if (@usersgroups > 0) {
+                unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
+                    $cgroup = $usersgroups[0];
                 }
             }
         }
@@ -2420,7 +2140,7 @@ sub assessparms {
     $symbp{'0.0'} = '';
 
 # ---------------------------------------------------------- Anything to store?
-    if ($env{'form.pres_marker'} && $parm_permission->{'edit'}) {
+    if ($env{'form.pres_marker'}) {
         my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
         my @values=split(/\&\&\&/,$env{'form.pres_value'});
         my @types=split(/\&\&\&/,$env{'form.pres_type'});
@@ -2429,15 +2149,10 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
-        my $now = time;
+
+
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer,$name);
-            if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(7|8|9)$/)) {
-                next if ($csec ne $env{'request.course.sec'});
-            }
-            if ($markers[$i] =~ /\&(6|5|4)$/) {
-                next if ($noeditgrp);
-            }
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
@@ -2468,35 +2183,18 @@ sub assessparms {
                         }
                     }
                 }
-            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate)\&\d+$/) {
+            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote)\&\d+$/) {
                 $name = $1;
-                my $val = $values[$i];
-                if ($name eq 'examcode') {
-                    if (&Apache::lonnet::validCODE($values[$i])) {
-                        $val = 'valid';
-                    }
-                } elsif ($name eq 'printstartdate') {
-                    if ($val =~ /^\d+$/) {
-                        if ($val > $now) {
-                            $val = 'future';
-                        }
-                    }
-                } elsif ($name eq 'printenddate') {
-                    if ($val =~ /^\d+$/) {
-                        if ($val < $now) {
-                            $val = 'past';
-                        }
-                    }
-                }
                 $needsrelease =
-                    $Apache::lonnet::needsrelease{"parameter:$name:$val"};
+                    $Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"};
                 if ($needsrelease) {
                     unless ($got_chostname) {
                         ($chostname,$cmajor,$cminor) = &parameter_release_vars();
                         $got_chostname = 1;
                     }
-                    $needsnewer = &parameter_releasecheck($name,$val,
+                    $needsnewer = &parameter_releasecheck($name,$values[$i],
                                                           $needsrelease,
+                                                          $chostname,
                                                           $cmajor,$cminor);
                 }
             }
@@ -2527,14 +2225,11 @@ sub assessparms {
 
     &startpage($r,$pssymb);
 
-    foreach my $item ('tolerance','date_default','date_start','date_end',
-                      'date_interval','int','float','string','string_lenient',
-                      'string_examcode','string_deeplink','string_discussvote',
-                      'string_useslots','string_problemstatus','string_ip',
-                      'string_questiontype') {
+    foreach ('tolerance','date_default','date_start','date_end',
+        'date_interval','int','float','string') {
         $r->print('<input type="hidden" value="'.
-          &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
-          '" name="recent_'.$item.'" />');
+          &HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').
+          '" name="recent_'.$_.'" />');
     }
 
     # ----- Start Parameter Selection
@@ -2580,12 +2275,12 @@ ENDPARMSELSCRIPT
 
         # Step 2
         $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
-        &displaymenu($r,\%allparms,\@pscat,\%keyorder,'parmmenuscroll');
+        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder);
 
         # Step 3
         $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
 
@@ -2618,13 +2313,7 @@ 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,$pssymb);
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
         $r->print('<p>'
@@ -2653,10 +2342,6 @@ ENDPARMSELSCRIPT
         my @catmarker=map { tr|.|_|; 'parameter_'.$_; } @pscat;
         my $csuname=$env{'user.name'};
         my $csudom=$env{'user.domain'};
-        my $readonly = 1;
-        if ($parm_permission->{'edit'}) {
-            undef($readonly);
-        }
 
         if ($parmlev eq 'full') {
 #
@@ -2842,7 +2527,7 @@ ENDTABLEHEADFOUR
                             &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
                                        $defbgthree,$parmlev,$uname,$udom,$csec,
-                                       $cgroup,\@usersgroups,$noeditgrp,$readonly);
+                                                            $cgroup,\@usersgroups);
                         }
                     }
                 }
@@ -2965,8 +2650,7 @@ ENDTABLEHEADFOUR
                     $r->print(&Apache::loncommon::start_data_table_row());
                     &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
-                           $readonly);
+                           $parmlev,$uname,$udom,$csec,$cgroup);
                 }
                 $r->print(&Apache::loncommon::end_data_table().'</p>'
                          .'</div>'
@@ -3056,9 +2740,8 @@ ENDMAPONE
             foreach (&keysinorder(\%name,\%keyorder)) {
                 $r->print(&Apache::loncommon::start_data_table_row());
                 &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
-                           \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
-                           $readonly);
+                       \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
+                                   $parmlev,$uname,$udom,$csec,$cgroup);
             }
             $r->print(&Apache::loncommon::end_data_table()
                      .'</p>'
@@ -3067,6 +2750,7 @@ ENDMAPONE
         } # end of $parmlev eq general
     }
     $r->print('</form>');
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 } # end sub assessparms
 
@@ -3076,19 +2760,12 @@ ENDMAPONE
 my $tableopen;
 
 sub tablestart {
-    my ($readonly) = @_;
     if ($tableopen) {
-        return '';
+    return '';
     } else {
-        $tableopen=1;
-        my $output = &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th>';
-        if ($readonly) {
-            $output .= '<th>'.&mt('Current value').'</th>';
-        } else {
-            $output .= '<th>'.&mt('Delete').'</th><th>'.&mt('Set to ...').'</th>';
-        }
-        $output .= '</tr>';
-        return $output;
+    $tableopen=1;
+    return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.
+        &mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';
     }
 }
 
@@ -3121,11 +2798,7 @@ sub readdata {
         }
     }
     }
-    if (wantarray) {
-        return ($resourcedata,$classlist);
-    } else {
-        return $resourcedata;
-    }
+    return $resourcedata;
 }
 
 
@@ -3141,22 +2814,19 @@ sub storedata {
     my @deldata=();
     undef @deldata;
     my ($got_chostname,$chostname,$cmajor,$cminor);
-    my $now = time;
     foreach my $key (keys(%env)) { 
     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
-        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny');
         my ($tuname,$tudom)=&extractuser($thiskey);
         my $tkey=$thiskey;
             if ($tuname) {
         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
         }
         if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
-        my ($data, $typeof, $text, $name, $valchk);
+        my ($data, $typeof, $text, $name);
         if ($cmd eq 'set') {
             $data=$env{$key};
-            $valchk = $data;
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified parameter for');
             if ($typeof eq 'string_questiontype') {
@@ -3165,51 +2835,24 @@ sub storedata {
                 $name = 'lenient';
             } elsif ($typeof eq 'string_discussvote') {
                 $name = 'discussvote';
-            } elsif ($typeof eq 'string_examcode') {
-                $name = 'examcode';
-                if (&Apache::lonnet::validCODE($data)) {
-                    $valchk = 'valid';
-                }
             } elsif ($typeof eq 'string_yesno') {
                 if ($thiskey =~ /\.retrypartial$/) {
                     $name = 'retrypartial';
                 }
             }
-        } elsif ($cmd eq 'datepointer') {
-            $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
-            $typeof=$env{'form.typeof_'.$thiskey};
-            $text = &mt('Saved modified date for');
-            if ($typeof eq 'date_start') {
-                if ($thiskey =~ /\.printstartdate$/) {
-                    $name = 'printstartdate';
-                    if (($data) && ($data > $now)) {
-                        $valchk = 'future';
-                    }
-                }
-            } elsif ($typeof eq 'date_end') {
-                if ($thiskey =~ /\.printenddate$/) {
-                    $name = 'printenddate';
-                    if (($data) && ($data < $now)) {
-                        $valchk = 'past';
+            if ($name ne '') {
+                my ($needsrelease,$needsnewer);
+                $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$data"};
+                if ($needsrelease) {
+                    unless ($got_chostname) {
+                        ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                        $got_chostname = 1;
                     }
+                    $needsnewer = &parameter_releasecheck($name,$data,
+                                                          $needsrelease,
+                                                          $chostname,$cmajor,
+                                                          $cminor);
                 }
-            }
-        } elsif ($cmd eq 'dateinterval') {
-            $data=&get_date_interval_from_form($thiskey);
-            $typeof=$env{'form.typeof_'.$thiskey};
-            $text = &mt('Saved modified date for');
-        }
-        if ($name ne '') {
-            my ($needsrelease,$needsnewer);
-            $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk"};
-            if ($needsrelease) {
-                unless ($got_chostname) {
-                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
-                    $got_chostname = 1;
-                }
-                $needsnewer = &parameter_releasecheck($name,$valchk,
-                                                      $needsrelease,
-                                                      $cmajor,$cminor);
                 if ($needsnewer) {
                     $r->print('<br />'.&oldversion_warning($name,$data,
                                                            $chostname,$cmajor,
@@ -3217,6 +2860,14 @@ sub storedata {
                     next;
                 }
             }
+        } elsif ($cmd eq 'datepointer') {
+            $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
+            $typeof=$env{'form.typeof_'.$thiskey};
+            $text = &mt('Saved modified date for');
+        } elsif ($cmd eq 'dateinterval') {
+            $data=&get_date_interval_from_form($thiskey);
+            $typeof=$env{'form.typeof_'.$thiskey};
+            $text = &mt('Saved modified date for');
         }
         if (defined($data) and $$olddata{$thiskey} ne $data) {
             if ($tuname) {
@@ -3260,7 +2911,7 @@ sub storedata {
     if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
         my %loghash=map { $_ => '' } @deldata;
         &log_parmset(\%loghash,1);
-        $r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
+        $r->print('<h2>'.&mt('Deleted [_1] parameter(s)</h2>',$delentries));
     } else {
         $r->print('<div class="LC_error">'.
               &mt('Error deleting parameters').'</div>');
@@ -3270,7 +2921,7 @@ sub storedata {
     if ($putentries) {
     if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
                 &log_parmset(\%newdata,0);
-        $r->print('<h3>'.&mt('Saved [quant,_1,parameter]',$putentries/2).'</h3>');
+        $r->print('<h3>'.&mt('Saved [_1] parameter(s)',$putentries/2).'</h3>');
     } else {
         $r->print('<div class="LC_error">'.
               &mt('Error saving parameters').'</div>');
@@ -3305,7 +2956,7 @@ sub parse_listdata_key {
 }
 
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder)=@_;
 # Start list output
 
     my $oldsection='';
@@ -3315,17 +2966,6 @@ sub listdata {
     $tableopen=0;
     my $foundkeys=0;
     my %keyorder=&standardkeyorder();
-    my $readonlyall = $readonly;
-
-    my ($secidx,%grouphash);
-    if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
-        $secidx = &Apache::loncoursedata::CL_SECTION();
-        if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
-            %grouphash = &Apache::longroup::coursegroups();
-        } elsif ($env{'request.course.groups'} ne '') {
-            map { $grouphash{$_} = 1; } split(/:/,$env{'request.course.groups'});
-        }
-    }
 
     foreach my $thiskey (sort {
     my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
@@ -3369,50 +3009,25 @@ sub listdata {
     } keys %{$listdata}) {
 
     if ($$listdata{$thiskey.'.type'}) {
-        my $thistype=$$listdata{$thiskey.'.type'};
-        if ($$resourcedata{$thiskey.'.type'}) {
-            $thistype=$$resourcedata{$thiskey.'.type'};
+            my $thistype=$$listdata{$thiskey.'.type'};
+            if ($$resourcedata{$thiskey.'.type'}) {
+        $thistype=$$resourcedata{$thiskey.'.type'};
         }
         my ($middle,$part,$name)=
         ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
         my $section=&mt('All Students');
-        $readonly = $readonlyall;
-        my $userscope;
-        my $showval = $$resourcedata{$thiskey};
         if ($middle=~/^\[(.*)\]/) {
-            my $issection=$1;
-            if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
-                my ($stuname,$studom) = ($1,$2);
-                if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
-                    if (ref($classlist) eq 'HASH') {
-                        if (ref($classlist->{$stuname.':'.$studom}) eq 'ARRAY') {
-                            next unless ($classlist->{$stuname.':'.$studom}->[$secidx] eq $env{'request.course.sec'});
-                        }
-                    }
-                }
-                $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
-                $userscope = 1;
-            } else {
-                if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
-                    if (exists($grouphash{$issection})) {
-                        $section=&mt('Group').': '.$issection;
-                    } elsif ($issection eq $env{'request.course.sec'}) {
-                        $section = &mt('Section').': '.$issection;
-                    } else {
-                        next;
-                    }
-                } else {
-                    $section=&mt('Group/Section').': '.$issection;
-                }
-            }
-            $middle=~s/^\[(.*)\]//;
-        } elsif (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
-            $readonly = 1;
+        my $issection=$1;
+        if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
+            $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
+        } else {
+            $section=&mt('Group/Section').': '.$issection;
+        }
+        $middle=~s/^\[(.*)\]//;
         }
         $middle=~s/\.+$//;
         $middle=~s/^\.+//;
         my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
-
         if ($middle=~/^(.+)\_\_\_\(all\)$/) {
         $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
         } elsif ($middle) {
@@ -3451,57 +3066,36 @@ sub listdata {
 # Ready to print
 #
             my $parmitem = &standard_parameter_names($name);
-        $r->print(&tablestart($readonly).
+        $r->print(&tablestart().
               &Apache::loncommon::start_data_table_row().
               '<td><b>'.&mt($parmitem).
-              '</b></td>');
-        unless ($readonly) {
-            my $disabled;
-            if (($name eq 'availablestudent') &&
-                (($showval eq '') || ($userscope))) {
-                $disabled = ' disabled="disabled"';
-            }
-            $r->print('<td><input type="checkbox" name="del_'.
-                      $thiskey.'"'.$disabled.' /></td>');
-        }
-        $r->print('<td>');
+              '</b></td><td><input type="checkbox" name="del_'.
+              $thiskey.'" /></td><td>');
         $foundkeys++;
         if (&isdateparm($thistype)) {
-            my $jskey='key_'.$pointer;
-            my $state;
-            $pointer++;
-            if ($readonly) {
-                $state = 'disabled';
-            }
-            $r->print(
-                &Apache::lonhtmlcommon::date_setter('parmform',
-                                                    $jskey,
-                                                    $$resourcedata{$thiskey},
-                                                    '',1,$state));
-            unless ($readonly) {
-                $r->print(
+        my $jskey='key_'.$pointer;
+        $pointer++;
+        $r->print(
+              &Apache::lonhtmlcommon::date_setter('parmform',
+                                  $jskey,
+                              $$resourcedata{$thiskey},
+                                  '',1,'','').
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
 (($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
 &mt('Shift all dates based on this date').'</a></span>':'').
 &date_sanity_info($$resourcedata{$thiskey})
               );
-            }
         } elsif ($thistype eq 'date_interval') {
-            $r->print(&date_interval_selector($thiskey,$name,
-                      $$resourcedata{$thiskey},$readonly));
+        $r->print(&date_interval_selector($thiskey,
+                          $$resourcedata{$thiskey}));
         } elsif ($thistype =~ m/^string/) {
-            if ($name eq 'availablestudent') {
-                $readonly = 1;
-            }
-            $r->print(&string_selector($thistype,$thiskey,
-                      $$resourcedata{$thiskey},$name,$readonly));
+        $r->print(&string_selector($thistype,$thiskey,
+                       $$resourcedata{$thiskey},$name));
         } else {
-            $r->print(&default_selector($thiskey,$$resourcedata{$thiskey},$readonly));
-        }
-        unless ($readonly) {
-            $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
-                      $thistype.'" />');
+        $r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
         }
+        $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
+              $thistype.'" />');
         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
     }
     }
@@ -3510,9 +3104,8 @@ sub listdata {
 
 
 sub date_interval_selector {
-    my ($thiskey, $pname, $showval, $readonly) = @_;
-    my ($result,%skipval);
-    my $currval = $showval;
+    my ($thiskey, $showval) = @_;
+    my $result;
     foreach my $which (['days', 86400, 31],
                ['hours', 3600, 23],
                ['minutes', 60, 59],
@@ -3523,57 +3116,10 @@ sub date_interval_selector {
     my %select = ((map {$_ => $_} (0..$max)),
               'select_form_order' => [0..$max]);
     $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
-                           \%select,'',$readonly);
+                           \%select);
     $result .= ' '.&mt($name);
     }
-    if ($pname eq 'interval') {
-        unless ($skipval{'done'}) {
-            my $checkedon = '';
-            my $checkedproc = '';
-            my $currproctorkey = '';
-            my $currprocdisplay = 'hidden';
-            my $currdonetext = &mt('Done');
-            my $checkedoff = ' checked="checked"';
-            if ($currval =~ /^(?:\d+)_done$/) {
-                $checkedon = ' checked="checked"';
-                $checkedoff = '';
-            } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
-                $currdonetext = $1;
-                $checkedon = ' checked="checked"';
-                $checkedoff = '';
-            } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
-                $currproctorkey = $1;
-                $checkedproc = ' checked="checked"';
-                $checkedoff = '';
-                $currprocdisplay = 'text';
-            } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
-                $currdonetext = $1;
-                $currproctorkey = $2;
-                $checkedproc = ' checked="checked"';
-                $checkedoff = '';
-                $currprocdisplay = 'text';
-            }
-            my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
-            my $disabled;
-            if ($readonly) {
-                $disabled = ' disabled="disabled"';
-            }
-            $result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
-                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.$disabled.' />'.
-                       &mt('No').'</label>'.('&nbsp;'x2).
-                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.$disabled.' />'.
-                       &mt('Yes').'</label>'.('&nbsp;'x2).
-                       '<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.$disabled.' />'.
-                       &mt('Yes, with proctor key').'</label>'.
-                       '<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
-                       'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'"'.$disabled.' /></span><br />'.
-                       '<span class="LC_nobreak">'.&mt('Button text').': '.
-                       '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
-        }
-    }
-    unless ($readonly) {
-        $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
-    }
+    $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
     return $result;
 
 }
@@ -3595,76 +3141,10 @@ sub get_date_interval_from_form {
 
 
 sub default_selector {
-    my ($thiskey, $showval, $readonly) = @_;
-    my $disabled;
-    if ($readonly) {
-        $disabled = ' disabled="disabled"';
-    }
-    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';
-}
-
-sub string_ip_selector {
-    my ($thiskey, $showval, $readonly) = @_;
-    my %access = (
-                   allow => [],
-                   deny  => [],
-                 );
-    if ($showval ne '') {
-        my @current;
-        if ($showval =~ /,/) {
-            @current = split(/,/,$showval);
-        } else {
-            @current = ($showval);
-        }
-        foreach my $item (@current) {
-            if ($item =~ /^\!([\[\]a-zA-Z\.\d\*\-]+)$/) {
-                push(@{$access{'deny'}},$1);
-            } elsif ($item =~ /^([\[\]a-zA-Z\.\d\*\-]+)$/) {
-                push(@{$access{'allow'}},$item);
-            }
-        }
-    }
-    if (!@{$access{'allow'}}) {
-        @{$access{'allow'}} = ('');
-    }
-    if (!@{$access{'deny'}}) {
-        @{$access{'deny'}} = ('');
-    }
-    my ($disabled,$addmore);
-    if ($readonly) {
-        $disabled=' disabled="disabled"';
-    } else {
-        $addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
-    }
-    my $output = '<input type="hidden" name="set_'.$thiskey.'" />
-<table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';
-    foreach my $acctype ('allow','deny') {
-        $output .= '
-<td valign="top">
-<div class="LC_string_ipacc_wrap" id="LC_string_ipacc_'.$acctype.'_'.$thiskey.'">
-  <div class="LC_string_ipacc_inner">'."\n";
-        my $num = 0;
-        foreach my $curr (@{$access{$acctype}}) {
-            $output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'"'.$disabled.' />';
-            if ($num > 0) {
-                $output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>';
-            }
-            $output .= '</div>'."\n";
-            $num ++;
-        }
-        $output .= '
-  </div>'.$addmore.'
-</div>
-</td>';
-   }
-   $output .= '
-</tr>
-</table>'."\n";
-    return $output;
+    my ($thiskey, $showval) = @_;
+    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
 }
 
-{
-
 my %strings =
     (
      'string_yesno'
@@ -3692,9 +3172,6 @@ my %strings =
              => [['yes','Yes'],
                  ['notended','Yes, unless discussion ended'],
                  ['no','No']],
-     'string_ip'
-             => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
-                 ['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']],
      );
 
 sub standard_string_options {
@@ -3706,10 +3183,10 @@ sub standard_string_options {
 }
 
 sub string_selector {
-    my ($thistype, $thiskey, $showval, $name, $readonly) = @_;
+    my ($thistype, $thiskey, $showval, $name) = @_;
 
     if (!exists($strings{$thistype})) {
-    return &default_selector($thiskey,$showval,$readonly);
+    return &default_selector($thiskey,$showval);
     }
 
     my %skiptype;
@@ -3728,23 +3205,17 @@ sub string_selector {
                     $got_chostname = 1;
                 }
                 my $needsnewer=&parameter_releasecheck($name,$parmval,$needsrelease,
-                                                       $cmajor,$cminor);
+                                                       $chostname,$cmajor,
+                                                       $cminor);
                 if ($needsnewer) {
                     $skiptype{$parmval} = 1;
                 }
             }
         }
     }
+    
 
-    if ($thistype eq 'string_ip') {
-        return &string_ip_selector($thiskey,$showval,$readonly);
-    }
- 
-    my ($result,$disabled);
-
-    if ($readonly) {
-        $disabled = ' disabled="disabled"';
-    }
+    my $result;
     my $numinrow = 3;
     if ($thistype eq 'string_problemstatus') {
         $numinrow = 2;
@@ -3770,7 +3241,7 @@ sub string_selector {
             $result .= '<td class="LC_left_item">'.
                        '<span class="LC_nobreak"><label>'.
                        '<input type="radio" name="set_'.$thiskey.
-                       '" value="'.$name.'"'.$disabled;
+                       '" value="'.$name.'"';
             if ($showval eq $name) {
                 $result .= ' checked="checked"';
             }
@@ -3793,76 +3264,14 @@ sub string_selector {
     return $result;
 }
 
-sub oldversion_warning {
-    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
-    my $desc;
-    my %stringtypes = (
-                        type         => 'string_questiontype',
-                        lenient      => 'string_lenient',
-                        retrypartial => 'string_yesno',
-                        discussvote  => 'string_discussvote',
-                        examcode     => 'string_examcode',
-                      );
-    if (exists($stringtypes{$name})) {
-        if ($name eq 'examcode') {
-            $desc = $value;
-        } elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
-            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
-                next unless (ref($possibilities) eq 'ARRAY');
-                my ($parmval, $description) = @{ $possibilities };
-                if ($parmval eq $value) {
-                    $desc = $description;
-                    last;
-                }
-            }
-        }
-    } elsif (($name eq 'printstartdate') || ($name eq 'printenddate')) {
-        my $now = time;
-        if ($value =~ /^\d+$/) {
-            if ($name eq 'printstartdate') {
-                if ($value > $now) {
-                    $desc = &Apache::lonlocal::locallocaltime($value);
-                }
-            } elsif ($name eq 'printenddate') {
-                if ($value < $now) {
-                    $desc = &Apache::lonlocal::locallocaltime($value);
-                }
-            }
-        }
-    }
-    my $standard_name = &standard_parameter_names($name);
-    return '<p class="LC_warning">'.
-           &mt('[_1] was [_2]not[_3] set to [_4].',
-               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
-           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
-           $cmajor.'.'.$cminor,$chostname,
-           $needsrelease).
-           '</p>';
-}
-
-}
-
 #
 # Shift all start and end dates by $shift
 #
 
 sub dateshift {
-    my ($shift,$numchanges)=@_;
+    my ($shift)=@_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $sec = $env{'request.course.sec'};
-    my $secgrpregex;
-    if ($sec ne '') {
-        my @groups;
-        if ($env{'request.course.groups'} ne '') {
-            @groups = split(/:/,$env{'request.course.groups'});
-        }
-        if (@groups) {
-            $secgrpregex = '(?:'.join('|',($sec,@groups)).')';
-        } else {
-            $secgrpregex = $sec;
-        }
-    }
     my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
 # ugly retro fix for broken version of types
     foreach my $key (keys %data) {
@@ -3877,11 +3286,7 @@ sub dateshift {
 # go through all parameters and look for dates
     foreach my $key (keys %data) {
        if ($data{$key.'.type'}=~/^date_(start|end)$/) {
-          if ($sec ne '') {
-              next unless ($key =~ /^$env{'request.course.id'}\.\[$secgrpregex\]\./);
-          }
           my $newdate=$data{$key}+$shift;
-          $$numchanges ++;
           $storecontent{$key}=$newdate;
        }
     }
@@ -3895,14 +3300,10 @@ sub dateshift {
 }
 
 sub newoverview {
-    my ($r,$parm_permission) = @_;
+    my ($r) = @_;
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $readonly = 1;
-    if ($parm_permission->{'edit'}) {
-        undef($readonly);
-    }
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
         text=>"Overview Mode"});
 
@@ -3915,9 +3316,6 @@ sub newoverview {
 '.
             &Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
             &showhide_js()."\n".
-            &validateparms_js()."\n".
-            &ipacc_boxes_js()."\n".
-            &done_proctor_js()."\n".
 '// ]]>
 </script>
 ';
@@ -3925,8 +3323,9 @@ sub newoverview {
                                                     {'add_entries' => \%loaditems,});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset');
     $r->print(<<ENDOVER);
-<form method="post" action="/adm/parmset?action=newoverview" name="parmform" onsubmit="return validateParms();>
+<form method="post" action="/adm/parmset?action=newoverview" name="parmform">
 ENDOVER
     my @ids=();
     my %typep=();
@@ -3953,7 +3352,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');
@@ -3963,9 +3362,6 @@ ENDOVER
             @selected_sections = ('all');
         }
     }
-    if ($env{'request.course.sec'} ne '') {
-        @selected_sections = ($env{'request.course.sec'});
-    }
     my @selected_groups =
         &Apache::loncommon::get_env_multiple('form.Group');
 
@@ -4005,26 +3401,16 @@ ENDOVER
     &displaymenu($r,\%allparms,\@pscat,\%keyorder);
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
-    my $sectionselector = &sectionmenu(\@selected_sections);
-    my $groupselector = &groupmenu(\@selected_groups);
     $r->print('<table>'.
-              '<tr><th>'.&mt('Parts').'</th>');
-    if ($sectionselector) {
-        $r->print('<th>'.&mt('Section(s)').'</th>');
-    }
-    if ($groupselector) {
-        $r->print('<th>'.&mt('Group(s)').'</th>');
-    }
-    $r->print('</tr><tr><td>');
+              '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
+              '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
     &partmenu($r,\%allparts,\@psprt);
-    $r->print('</td>');
-    if ($sectionselector) {
-        $r->print('<td>'.$sectionselector.'</td>');
-    }
-    if ($groupselector) {
-        $r->print('<td>'.$groupselector.'</td>');
-    }
-    $r->print('</tr></table>');
+    $r->print('</td><td>');
+    &sectionmenu($r,\@selected_sections);
+    $r->print('</td><td>');
+    &groupmenu($r,\@selected_groups);
+    $r->print('</td></tr></table>');
+    #$r->print('</td></tr></table>');
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
@@ -4058,13 +3444,12 @@ ENDOVER
 
 # List data
 
-        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly);
-    }
-    $r->print(&tableend());
-    unless ($readonly) {
-        $r->print(((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':''));
+        &listdata($r,$resourcedata,$listdata,$sortorder);
     }
-    $r->print('</form>');
+    $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());
 }
 
@@ -4104,62 +3489,38 @@ sub secgroup_lister {
 }
 
 sub overview {
-    my ($r,$parm_permission) = @_;
+    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'};
-    my $js = '<script type="text/javascript">'."\n".
-             '// <![CDATA['."\n".
-             &done_proctor_js()."\n".
-             &validateparms_js()."\n".
-             &ipacc_boxes_js()."\n".
-             '// ]]>'."\n".
-             '</script>'."\n";
-    my $readonly = 1;
-    if ($parm_permission->{'edit'}) {
-        undef($readonly);
-    }
+
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
     text=>"Overview Mode"});
-    my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js);
+    my $start_page=&Apache::loncommon::start_page('Modify Parameters');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
-    $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform" onsubmit="return validateParms();">');
+    &startSettingsScreen($r,'parmset');
+    $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');
 
 # Store modified
-    unless ($readonly) {
-        &storedata($r,$crs,$dom);
-    }
+
+    &storedata($r,$crs,$dom);
 
 # Read modified data
 
-    my ($resourcedata,$classlist)=&readdata($crs,$dom);
+    my $resourcedata=&readdata($crs,$dom);
 
 
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
     &sortmenu($r,$sortorder);
 
-    my $submitbutton = '<input type="submit" value="'.&mt('Save').'" />';
-
-    if ($readonly) {
-        $r->print('<p>'.$submitbutton.'</p>');
-    }
-
-
 # List data
 
-    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder,'overview',$classlist,$readonly);
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
 
-    $r->print(&tableend().'<p>');
-    if ($foundkeys) {
-        unless ($readonly) {
-            $r->print('<p>'.$submitbutton.'</p>');
-        }
-    } else {
-        $r->print('<p class="LC_info">'.&mt('There are no parameters.').'</p>');
-    }
-    $r->print('</form>'.&Apache::loncommon::end_page());
+    $r->print(&tableend().'<p>'.
+    ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':&mt('There are no parameters.')).'</p></form>'.
+          &Apache::loncommon::end_page());
 }
 
 sub clean_parameters {
@@ -4221,8 +3582,10 @@ ENDOVER
         $r->print(&mt('All users'));
         } elsif ($data{'scope_type'} eq 'user') {
         $r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
-        } elsif ($data{'scope_type'} eq 'secgroup') {
-        $r->print(&mt('Group/Section: [_1]',$data{'scope'}));
+        } elsif ($data{'scope_type'} eq 'section') {
+        $r->print(&mt('Section: [_1]',$data{'scope'}));
+        } elsif ($data{'scope_type'} eq 'group') {
+        $r->print(&mt('Group: [_1]',$data{'scope'}));
         }
         $r->print('<br />');
         if ($data{'realm_type'} eq 'all') {
@@ -4232,9 +3595,8 @@ ENDOVER
         } elsif ($data{'realm_type'} eq 'symb') {
         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));
+        $r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
+                  $url,$resid,$map));
         }
         $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
         $r->print('</td></tr>');
@@ -4244,6 +3606,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());
 }
 
@@ -4251,36 +3614,27 @@ 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 $sec = $env{'request.course.sec'};
+
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
-    my $submit_text = &mt('Shift all dates accordingly');
-    if ($sec ne '') {
-        my @groups;
-        if ($env{'request.course.groups'} ne '') {
-            @groups = split(/:/,$env{'request.course.groups'});
-        }
-        if (@groups) {
-            $submit_text = &mt("Shift dates set just for your section/group(s), accordingly");
-        } else {
-            $submit_text = &mt("Shift dates set just for your section, accordingly");
-        }
-    }
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
-    $r->print('<form name="shiftform" method="post" action="">'.
+    &startSettingsScreen($r,'parmset');
+    $r->print('<form name="shiftform" method="post">'.
               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
               '<tr><td>'.&mt('Shifted date:').'</td><td>'.
-                    &Apache::lonhtmlcommon::date_setter('shiftform',
+                    &Apache::lonhtmlcommon::dshowerfuck.net
+ate_setter('shiftform',
                                                         'timeshifted',
                                                         $env{'form.timebase'},,
                                                         '').
               '</td></tr></table>'.
               '<input type="hidden" name="action" value="dateshift2" />'.
               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
-              '<input type="submit" value="'.$submit_text.'" /></form>');
+              '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -4288,57 +3642,19 @@ 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 $sec = $env{'request.course.sec'};
     &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');
     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
-    $r->print('<h2>'.&mt('Shift Dates').'</h2>');
-    if ($sec ne '') {
-        my @groups;
-        if ($env{'request.course.groups'} ne '') {
-            @groups = split(/:/,$env{'request.course.groups'});
-        }
-        if (@groups) {
-            $r->print('<p>'.
-                      &mt("Shift dates set just for your section/group(s), such that [_1] becomes [_2]",
-                          &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
-                          &Apache::lonlocal::locallocaltime($timeshifted)).
-                      '</p>');
-        } else {
-            $r->print('<p>'.
-                      &mt("Shift dates set just for your section, such that [_1] becomes [_2]",
-                          &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
-                          &Apache::lonlocal::locallocaltime($timeshifted)).
-                      '</p>');
-        }
-    } else {
-        $r->print('<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
-                            &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
-                            &Apache::lonlocal::locallocaltime($timeshifted)).
-                  '</p>');
-    }
+    $r->print(&mt('Shifting all dates such that [_1] becomes [_2]',
+              &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+              &Apache::lonlocal::locallocaltime($timeshifted)));
     my $delta=$timeshifted-$env{'form.timebase'};
-    my $numchanges = 0;
-    my $result = &dateshift($delta,\$numchanges);
-    if ($result eq 'ok') {
-        $r->print(
-            &Apache::lonhtmlcommon::confirm_success(&mt('Completed shifting of [quant,_1,date setting]',
-                                                    $numchanges)));
-    } elsif ($result eq 'con_delayed') {
-        $r->print(
-            &Apache::lonhtmlcommon::confirm_success(&mt('Queued shifting of [quant,_1,date setting]',
-                                                        $numchanges)));
-    } else {
-        $r->print(
-            &Apache::lonhtmlcommon::confirm_success(&mt('An error occurred attempting to shift dates'),1));
-    }
-    $r->print(
-        '<br /><br />'.
-        &Apache::lonhtmlcommon::actionbox(
-            ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
+    &dateshift($delta);
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -4354,7 +3670,8 @@ sub parse_key {
         $data{'scope_type'} = 'user';
         $data{'scope'} = [$1,$2];
     } else {
-        $data{'scope_type'} = 'secgroup';
+        #FIXME check for group scope
+        $data{'scope_type'} = 'section';
     }
     $middle=~s/^\[(.*)\]//;
     }
@@ -4382,7 +3699,7 @@ sub parse_key {
 
 
 sub header {
-    return &Apache::loncommon::start_page('Content and Problem Settings');
+    return &Apache::loncommon::start_page('Settings');
 }
 
 
@@ -4392,9 +3709,7 @@ 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');
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -4405,73 +3720,38 @@ ENDMAINFORMHEAD
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr  = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
     my $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'});
-    my $vcb = &Apache::lonnet::allowed('vcb',$env{'request.course.id'});
-    my $vpa = &Apache::lonnet::allowed('vpa',$env{'request.course.id'});
     if ((!$dcm) && ($env{'request.course.sec'} ne '')) {
         $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
                                         '/'.$env{'request.course.sec'});
     }
-    if ((!$vcb) && ($env{'request.course.sec'} ne '')) {
-        $vcb = &Apache::lonnet::allowed('vcb',$env{'request.course.id'}.
-                                        '/'.$env{'request.course.sec'});
-    }
-    my (%linktext,%linktitle,%url);
-    if ($parm_permission->{'edit'}) {
-        %linktext = (
-                     newoverview     => 'Edit Resource Parameters - Overview Mode',
-                     settable        => 'Edit Resource Parameters - Table Mode',
-                     setoverview     => 'Modify Resource Parameters - Overview Mode',
-                    );
-        %linktitle = (
-                     newoverview     => 'Set/Modify resource parameters in overview mode.',
-                     settable        => 'Set/Modify resource parameters in table mode.',
-                     setoverview     => 'Set/Modify existing resource parameters in overview mode.',
-                     );
-    } else {
-        %linktext = (
-                     newoverview     => 'View Resource Parameters - Overview Mode',
-                     settable        => 'View Resource Parameters - Table Mode',
-                     setoverview     => 'View Resource Parameters - Overview Mode',
-                   );
-        %linktitle = (
-                     newoverview     => 'Display resource parameters in overview mode.',
-                     settable        => 'Display resource parameters in table mode.',
-                     setoverview     => 'Display existing resource parameters in overview mode.',
-                     );
-    }
-    if ($mgr) {
-        $linktext{'resettimes'} = 'Reset Student Access Times';
-        $linktitle{'resettimes'} = "Reset access times for folders/maps, resources or the $lc_crstype.";
-        $url{'resettimes'} = '/adm/helper/resettimes.helper';
-    } elsif ($vgr) {
-        $linktext{'resettimes'} = 'Display Student Access Times',
-        $linktitle{'resettimes'} = "Display access times for folders/maps, resources or the $lc_crstype.",
-        $url{'resettimes'} = '/adm/accesstimes';
-    }
+
+    my $crstype = &Apache::loncommon::course_type();
+    my $lc_crstype = lc($crstype);
+
     my @menu =
         ( { categorytitle=>"Content Settings for this $crstype",
         items => [
           { linktext => 'Portfolio Metadata',
             url => '/adm/parmset?action=setrestrictmeta',
-            permission => $parm_permission->{'setrestrictmeta'},
+            permission => $parm_permission,
             linktitle => "Restrict metadata for this $lc_crstype." ,
             icon =>'contact-new.png'   ,
             },
-          { linktext => $linktext{'resettimes'},
-            url => $url{'resettimes'},
-            permission => ($vgr || $mgr),
-            linktitle => $linktitle{'resettimes'},
-            icon => 'start-here.png',
+          { linktext => 'Reset Student Access Times',
+            url => '/adm/helper/resettimes.helper',
+            permission => $mgr,
+            linktitle => "Reset access times for folders/maps, resources or the $lc_crstype."  ,
+            icon => 'start-here.png'  ,
             },
           { linktext => 'Blocking Communication/Resource Access',
             url => '/adm/setblock',
-            permission => ($vcb || $dcm),
+            permission => $dcm,
             linktitle => 'Configure blocking of communication/collaboration and access to resources during an exam',
             icon => 'comblock.png',
             },
           { linktext => 'Set Parameter Setting Default Actions',
             url => '/adm/parmset?action=setdefaults',
-            permission => $parm_permission->{'setdefaults'},
+            permission => $parm_permission,
             linktitle =>'Set default actions for parameters.'  ,
             icon => 'folder-new.png'  ,
             }]},
@@ -4479,43 +3759,43 @@ ENDMAINFORMHEAD
         items => [
           { linktext => 'Edit Resource Parameters - Helper Mode',
             url => '/adm/helper/parameter.helper',
-            permission => $parm_permission->{'helper'},
+            permission => $parm_permission,
             linktitle =>'Set/Modify resource parameters in helper mode.'  ,
             icon => 'dialog-information.png'  ,
             #help => 'Parameter_Helper',
             },
-          { linktext => $linktext{'newoverview'},
+          { linktext => 'Edit Resource Parameters - Overview Mode',
             url => '/adm/parmset?action=newoverview',
-            permission => $parm_permission->{'newoverview'},
-            linktitle => $linktitle{'newoverview'},
-            icon => 'edit-find.png',
+            permission => $parm_permission,
+            linktitle =>'Set/Modify resource parameters in overview mode.'  ,
+            icon => 'edit-find.png'  ,
             #help => 'Parameter_Overview',
             },
-          { linktext => $linktext{'settable'},
+          { linktext => 'Edit Resource Parameters - Table Mode',
             url => '/adm/parmset?action=settable',
-            permission => $parm_permission->{'settable'},
-            linktitle => $linktitle{'settable'},
-            icon => 'edit-copy.png',
+            permission => $parm_permission,
+            linktitle =>'Set/Modify resource parameters in table mode.'  ,
+            icon => 'edit-copy.png'  ,
             #help => 'Table_Mode',
             }]},
            { categorytitle => 'Existing Parameter Settings for Resources',
          items => [
-          { linktext => $linktext{'setoverview'},
+          { linktext => 'Modify Resource Parameters - Overview Mode',
             url => '/adm/parmset?action=setoverview',
-            permission => $parm_permission->{'setoverview'},
-            linktitle => $linktitle{'setoverview'},
-            icon => 'preferences-desktop-wallpaper.png',
+            permission => $parm_permission,
+            linktitle =>'Set/Modify existing resource parameters in overview mode.'  ,
+            icon => 'preferences-desktop-wallpaper.png'  ,
             #help => 'Parameter_Overview',
             },
           { linktext => 'Change Log',
             url => '/adm/parmset?action=parameterchangelog',
-            permission => $parm_permission->{'parameterchangelog'},
+            permission => $parm_permission,
             linktitle =>"View parameter and $lc_crstype blog posting/user notification change log."  ,
             icon => 'document-properties.png',
             }]}
           );
     $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
-    $r->print('</form>'.&Apache::loncommon::end_page());
+    &endSettingsScreen($r);
     return;
 }
 
@@ -4591,6 +3871,7 @@ sub order_meta_fields {
               text=>"Restrict Metadata"},
              {text=>"Order Metadata"});
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+    &startSettingsScreen($r,'parmset');
     if ($env{'form.storeorder'}) {
         my $newpos = $env{'form.newpos'} - 1;
         my $currentpos = $env{'form.currentpos'} - 1;
@@ -4644,7 +3925,7 @@ sub order_meta_fields {
     foreach my $key (@fields_in_order) {
         $r->print('<tr><td>');
         $r->print('<form method="post" action="">');
-        $r->print('<select name="newpos" onchange="this.form.submit()">');
+        $r->print('<select name="newpos" onChange="this.form.submit()">');
         for (my $i = 1;$i le $num_fields;$i ++) {
             if ($i eq $idx) {
                 $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');
@@ -4660,6 +3941,7 @@ sub order_meta_fields {
         $idx ++;
     }
     $r->print('</table>');
+    &endSettingsScreen($r);
     return 'ok';
 }
 
@@ -4668,7 +3950,7 @@ sub continue {
     my $output;
     $output .= '<form action="" method="post">';
     $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
-    $output .= '<input type="submit" value="'.&mt('Continue').'" />';
+    $output .= '<input type="submit" value="Continue" />';
     return ($output);
 }
 
@@ -4679,6 +3961,7 @@ sub addmetafield {
         text=>"Add Metadata Field"});
     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
+    &startSettingsScreen($r,'parmset');
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (exists($env{'form.undelete'})) {
@@ -4690,10 +3973,7 @@ sub addmetafield {
             my $put_result = &Apache::lonnet::put('environment',
                                         {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
 
-            $r->print(&mt('Undeleted Metadata Field [_1] with result [_2]',
-                          '<strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}.
-                          '</strong>',$put_result).
-                      '<br />');
+            $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
         }
         $r->print(&continue());
     } elsif (exists($env{'form.fieldname'})) {
@@ -4705,17 +3985,12 @@ sub addmetafield {
                             {'metadata.'.$meta_field.'.values'=>"",
                              'metadata.'.$meta_field.'.added'=>"$display_field",
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
-        $r->print(&mt('Added new Metadata Field [_1] with result [_2]',
-                      '<strong>'.$env{'form.fieldname'}.'</strong>',$put_result).
-                  '<br />');
+        $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
         $r->print(&continue());
     } else {
         my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
         if ($fields) {
-            $r->print(&mt('You may undelete previously deleted fields.').
-                      '<br />'.
-                      &mt('Check those you wish to undelete and click Undelete.').
-                      '<br />');
+            $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
             $r->print('<form method="post" action="">');
             foreach my $key(keys(%$fields)) {
                 $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
@@ -4723,14 +3998,12 @@ sub addmetafield {
             $r->print('<input type="submit" name="undelete" value="Undelete" />');
             $r->print('</form>');
         }
-        $r->print('<hr />'.
-                  &mt('[_1]Or[_2] you may enter a new metadata field name.',
-                      '<strong>','</strong>').
-                 '<form method="post" action="/adm/parmset?action=addmetadata">');
+        $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
         $r->print('<input type="text" name="fieldname" /><br />');
-        $r->print('<input type="submit" value="'.&mt('Add Metadata Field').'" />');
+        $r->print('<input type="submit" value="Add Metadata Field" />');
     }
     $r->print('</form>');
+    &endSettingsScreen($r);
 }
 
 
@@ -4745,15 +4018,11 @@ sub setrestrictmeta {
         text=>"Restrict Metadata"});
     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
+    &startSettingsScreen($r,'parmset');
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
     my $save_field = '';
-    my %lt = &Apache::lonlocal::texthash(
-                                           addm => 'Add Metadata Field',
-                                           ordm => 'Order Metadata Fields',
-                                           save => 'Save',
-                                        );
     if ($env{'form.restrictmeta'}) {
         foreach my $field (sort(keys(%env))) {
             if ($field=~m/^form.(.+)_(.+)$/) {
@@ -4792,25 +4061,28 @@ sub setrestrictmeta {
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     # Now get possible added metadata fields
     my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
+    my $row_alt = 1;
     $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {
         if ($field ne 'courserestricted') {
+            $row_alt = $row_alt ? 0 : 1;
         $output.= &output_row($r, $field, $metadata_fields{$field});
     }
     }
     my $buttons = (<<ENDButtons);
-        <input type="submit" name="restrictmeta" value="$lt{'save'}" />
+        <input type="submit" name="restrictmeta" value="Save" />
         </form><br />
         <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
-        <input type="submit" name="restrictmeta" value="$lt{'addm'}" />
+        <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
         </form>
         <br />
         <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
-        <input type="submit" name="restrictmeta" value="$lt{'ordm'}" />
+        <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
 ENDButtons
     my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {
-        $output.= &output_row($r,$field,$$added_metadata_fields{$field},$added_flag);
+        $row_alt = $row_alt ? 0 : 1;
+        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
     }
     $output .= &Apache::loncommon::end_data_table();
     $r->print(<<ENDenv);
@@ -4819,6 +4091,7 @@ ENDButtons
         $buttons
         </form>
 ENDenv
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
 }
@@ -4863,6 +4136,7 @@ sub defaultsetter {
     &Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset');
     $r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -5009,6 +4283,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;
 }
@@ -5055,7 +4330,7 @@ my %standard_parms;
 my %standard_parms_types;
 
 sub load_parameter_names {
-    open(my $config,"<","$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
+    open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
     while (my $configline=<$config>) {
     if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
     chomp($configline);
@@ -5070,7 +4345,6 @@ sub load_parameter_names {
     close($config);
     $standard_parms{'int_pos'}      = 'Positive Integer';
     $standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
-    $standard_parms{'scoreformat'}  = 'Format for display of score';
 }
 
 sub standard_parameter_names {
@@ -5097,7 +4371,7 @@ sub standard_parameter_types {
 }
 
 sub parm_change_log {
-    my ($r,$parm_permission)=@_;
+    my ($r)=@_;
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
     text=>"Parameter Change Log"});
     my $js = '<script type="text/javascript">'."\n".
@@ -5107,6 +4381,7 @@ sub parm_change_log {
              '</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
+    &startSettingsScreen($r,'parmset');
     my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
                       $env{'course.'.$env{'request.course.id'}.'.domain'},
                       $env{'course.'.$env{'request.course.id'}.'.num'});
@@ -5126,19 +4401,13 @@ sub parm_change_log {
     $r->print(&Apache::loncommon::display_filter('parmslog').'&nbsp;'."\n".
               '<input type="submit" value="'.&mt('Display').'" />'.
               '</form></fieldset></div><br clear="all" />');
-    my $readonly = 1;
-    if ($parm_permission->{'edit'}) {
-        undef($readonly);
-    }
+
     my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
                              $env{'course.'.$env{'request.course.id'}.'.domain'});
     $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>');
-    unless ($readonly) {
-        $r->print('<th>'.&mt('Announce').'</th>');
-    }
-    $r->print(&Apache::loncommon::end_data_table_header_row());
+          &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
+          &Apache::loncommon::end_data_table_header_row());
     my $shown=0;
     my $folder='';
     if ($env{'form.displayfilter'} eq 'currentfolder') {
@@ -5150,12 +4419,6 @@ sub parm_change_log {
     }
     if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
     }
-    my $numgroups = 0;
-    my @groups;
-    if ($env{'request.course.groups'} ne '') {
-        @groups = split(/:/,$env{'request.course.groups'});
-        $numgroups = scalar(@groups);
-    }
     foreach my $id (sort
             {
             if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
@@ -5177,8 +4440,7 @@ sub parm_change_log {
                            $parmlog{$id}{'exe_uname'},
                            $parmlog{$id}{'exe_udom'});
     my $send_msg_link='';
-    if ((!$readonly) && 
-        (($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
+    if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
          || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
         $send_msg_link ='<br />'.
         &Apache::loncommon::messagewrapper(&mt('Send message'),
@@ -5195,14 +4457,6 @@ sub parm_change_log {
                 !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
         &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
-        if ($env{'request.course.sec'} ne '') {
-            next if (($issection ne '') && (!(($issection eq $env{'request.course.sec'}) ||
-                                              ($numgroups && (grep(/^\Q$issection\E$/,@groups))))));
-            if ($uname ne '') {
-                my $stusection = &Apache::lonnet::getsection($uname,$udom,$env{'request.course.id'});
-                next if (($stusection ne '-1') && ($stusection ne $env{'request.course.sec'}));
-            }
-        }
         if ($env{'form.displayfilter'} eq 'currentfolder') {
         if ($folder) {
             if ($middle!~/^\Q$folder\E/) { next; }
@@ -5256,31 +4510,27 @@ sub parm_change_log {
             }
         }
         }
-        $output .= '</td>';
-
-            unless ($readonly) {
-                $output .= '<td>';
-                if ($stillactive) {
-                    my $parmitem = &standard_parameter_names($parmname);
-                    $parmitem = &mt($parmitem);
-                    my $title=&mt('Changed [_1]',$parmitem);
-                    my $description=&mt('Changed [_1] for [_2] to [_3]',
-                        $parmitem,$realmdescription,
-                        (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
-                    if (($uname) && ($udom)) {
-                        $output .=
-                            &Apache::loncommon::messagewrapper('Notify User',
-                                                               $uname,$udom,$title,
-                                                               $description);
-                    } else {
-                        $output .=
-                            &Apache::lonrss::course_blog_link($id,$title,
-                                                              $description);
-                    }
-                }
-                $output .= '</td>';
-            }
-        $output .= &Apache::loncommon::end_data_table_row();
+        $output .= '</td><td>';
+            
+        if ($stillactive) {
+                my $parmitem = &standard_parameter_names($parmname);
+                $parmitem = &mt($parmitem);
+        my $title=&mt('Changed [_1]',$parmitem);
+                my $description=&mt('Changed [_1] for [_2] to [_3]',
+                                    $parmitem,$realmdescription,
+                    (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
+        if (($uname) && ($udom)) {
+            $output .=
+            &Apache::loncommon::messagewrapper('Notify User',
+                               $uname,$udom,$title,
+                               $description);
+        } else {
+            $output .=
+            &Apache::lonrss::course_blog_link($id,$title,
+                              $description);
+        }
+        }
+        $output .= '</td>'.&Apache::loncommon::end_data_table_row();
     }
         if ($env{'form.displayfilter'} eq 'containing') {
         my $wholeentry=$about_me_link.':'.
@@ -5300,6 +4550,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());
 }
 
@@ -5347,10 +4598,10 @@ sub update_slots {
                           action  => 'reserve',
                           context => 'parameter',
                         );
-        &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
+        &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
                                         '',$uname,$udom,$cnum,$cdom);
 
-        &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
+        &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
                                         '',$uname,$udom,$uname,$udom);
     }
     return $success;
@@ -5381,9 +4632,9 @@ sub delete_slots {
                                   action  => 'release',
                                   context => 'parameter',
                                 );
-                &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
+                &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
                                                 1,$uname,$udom,$cnum,$cdom);
-                &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
+                &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
                                                 1,$uname,$udom,$uname,$udom);
             }
         }
@@ -5407,7 +4658,7 @@ sub parameter_release_vars {
 }
 
 sub parameter_releasecheck {
-    my ($name,$value,$needsrelease,$cmajor,$cminor) = @_;
+    my ($name,$value,$needsrelease,$chostname,$cmajor,$cminor) = @_;
     my $needsnewer;
     my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
     if (($cmajor < $needsmajor) || 
@@ -5419,44 +4670,35 @@ sub parameter_releasecheck {
     return $needsnewer;
 }
 
-sub get_permission {
-    my %permission;
-    my $allowed = 0;
-    return (\%permission,$allowed) unless ($env{'request.course.id'});
-    if ((&Apache::lonnet::allowed('opa',$env{'request.course.id'})) ||
-        (&Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
-                  $env{'request.course.sec'}))) {
-        %permission= (
-                       'edit'               => 1,
-                       'set'                => 1,
-                       'setoverview'        => 1,
-                       'addmetadata'        => 1,
-                       'ordermetadata'      => 1,
-                       'setrestrictmeta'    => 1,
-                       'newoverview'        => 1,
-                       'setdefaults'        => 1,
-                       'settable'           => 1,
-                       'parameterchangelog' => 1,
-                       'cleanparameters'    => 1,
-                       'dateshift1'         => 1,
-                       'dateshift2'         => 1,
-                       'helper'             => 1,
-         );
-    } elsif ((&Apache::lonnet::allowed('vpa',$env{'request.course.id'})) ||
-             (&Apache::lonnet::allowed('vpa',$env{'request.course.id'}.'/'.
-                  $env{'request.course.sec'}))) {
-        %permission = (
-                       'set'                => 1,
-                       'settable'           => 1,
-                       'newoverview'        => 1,
-                       'setoverview'        => 1,
-                       'parameterchangelog' => 1,
+sub oldversion_warning {
+    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my $desc;
+    my %stringtypes = (
+                        type         => 'string_questiontype',
+                        lenient      => 'string_lenient',
+                        retrypartial => 'string_yesno',
+                        discussvote  => 'string_discussvote',
                       );
+    if (exists($stringtypes{$name})) {
+        if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
+            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
+                next unless (ref($possibilities) eq 'ARRAY');
+                my ($parmval, $description) = @{ $possibilities };
+                if ($parmval eq $value) {
+                    $desc = $description;
+                    last;
+                }
+            }
+        }
     }
-    foreach my $perm (values(%permission)) {
-        if ($perm) { $allowed=1; last; }
-    }
-    return (\%permission,$allowed);
+    my $standard_name = &standard_parameter_names($name);
+    return '<p class="LC_warning">'.
+           &mt('[_1] was [_2]not[_3] set to [_4].',
+               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+           $cmajor.'.'.$cminor,$chostname,
+           $needsrelease).
+           '</p>';
 }
 
 sub handler {
@@ -5486,41 +4728,41 @@ sub handler {
                                             'Parameter_Manager,Course_Environment,Parameter_Helper,Parameter_Overview,Table_Mode'});
 
 # ----------------------------------------------------- Needs to be in a course
-    my ($parm_permission,$allowed) = &get_permission();
+    my $parm_permission =
+    (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
+     &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
+                  $env{'request.course.sec'}));
     my $exists = &check_for_course_info();
 
-    if ($env{'request.course.id'} && $allowed && $exists) {
+    if ($env{'request.course.id'} &&  $parm_permission && $exists) {
         #
         # Main switch on form.action and form.state, as appropriate
         #
         # Check first if coming from someone else headed directly for
         #  the table mode
-        if (($parm_permission->{'set'}) &&
-            ((($env{'form.command'} eq 'set') && ($env{'form.url'})
-               && (!$env{'form.dis'})) || ($env{'form.symb'}))) {
-            &assessparms($r,$parm_permission);
+        if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+         && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+        &assessparms($r);
         } elsif (! exists($env{'form.action'})) {
             &print_main_menu($r,$parm_permission);
-        } elsif (!$parm_permission->{$env{'form.action'}}) {
-            &print_main_menu($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'setoverview') {
-            &overview($r,$parm_permission);
-        } elsif ($env{'form.action'} eq 'addmetadata') {
-            &addmetafield($r);
-        } elsif ($env{'form.action'} eq 'ordermetadata') {
-            &order_meta_fields($r);
+        &overview($r);
+    } elsif ($env{'form.action'} eq 'addmetadata') {
+        &addmetafield($r);
+    } elsif ($env{'form.action'} eq 'ordermetadata') {
+        &order_meta_fields($r);
         } elsif ($env{'form.action'} eq 'setrestrictmeta') {
-            &setrestrictmeta($r);
+        &setrestrictmeta($r);
         } elsif ($env{'form.action'} eq 'newoverview') {
-            &newoverview($r,$parm_permission);
+        &newoverview($r);
         } elsif ($env{'form.action'} eq 'setdefaults') {
-            &defaultsetter($r);
-        } elsif ($env{'form.action'} eq 'settable') {
-            &assessparms($r,$parm_permission);
+        &defaultsetter($r);
+    } elsif ($env{'form.action'} eq 'settable') {
+        &assessparms($r);
         } elsif ($env{'form.action'} eq 'parameterchangelog') {
-            &parm_change_log($r,$parm_permission);
+        &parm_change_log($r);
         } elsif ($env{'form.action'} eq 'cleanparameters') {
-            &clean_parameters($r);
+        &clean_parameters($r);
         } elsif ($env{'form.action'} eq 'dateshift1') {
             &date_shift_one($r);
         } elsif ($env{'form.action'} eq 'dateshift2') {