--- loncom/interface/lonparmset.pm	2023/02/03 01:23:46	1.522.2.28.4.9
+++ loncom/interface/lonparmset.pm	2016/01/31 21:25:38	1.555
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.28.4.9 2023/02/03 01:23:46 raeburn Exp $
+# $Id: lonparmset.pm,v 1.555 2016/01/31 21:25:38 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
 
@@ -130,7 +129,7 @@ javascript function 'pjump'.
 
 =item print_td()
 
-=item check_other_groups()
+=item print_usergroups()
 
 =item parm_control_group()
 
@@ -150,7 +149,7 @@ Input: See list below
 
 =back
 
-Outputs: See list below
+Outputs: See list below:
 
 =over 4
 
@@ -324,6 +323,31 @@ use HTML::Entities;
 use LONCAPA qw(:DEFAULT :match);
 
 
+sub startSettingsScreen {
+    my ($r,$mode,$crstype)=@_;
+
+    my $tabtext = &mt('Course Settings');
+    if ($crstype eq 'Community') {
+        $tabtext = &mt('Community Settings');
+    } 
+    $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
+    $r->print("\n".'<li'.($mode eq 'coursepref'?' class="active"':'').'><a href="/adm/courseprefs"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
+                                          $tabtext.
+                                          '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+
+    $r->print("\n".'<li'.($mode eq 'parmset'?' class="active"':'').' id="tabbededitor"><a href="/adm/parmset"><b>'.
+                                                                 &mt('Content and Problem Settings').'</b></a></li>');
+    $r->print("\n".'</ul>'."\n");
+    $r->print('<div class="LC_Box" style="clear:both;margin:0;" id="parameditor"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+}
+
+sub endSettingsScreen {
+   my ($r)=@_;
+   $r->print('</div></div></div>');
+}
+
+
+
 sub parmval {
     my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
     return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
@@ -753,7 +777,7 @@ sub storeparm_by_symb_inner {
 
 
 sub valout {
-    my ($value,$type,$editable)=@_;
+    my ($value,$type,$name,$editable)=@_;
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
@@ -767,16 +791,7 @@ sub valout {
         }
     } 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 ($totalsecs,$donebutton) = split(/_/,$value);
             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
             my @timer;
             $year=$year-70;
@@ -810,12 +825,8 @@ 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.'"';
-                }
+            if ($donebutton eq 'done') {
+                $result .= ' '.&mt('+ "done"');
             }
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
@@ -831,15 +842,11 @@ sub valout {
 
 
 sub plink {
-    my ($type,$dis,$value,$marker,$return,$call,$extra)=@_;
+    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]};
         }
@@ -847,16 +854,16 @@ sub plink {
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
-    my $valout = &valout($value,$type,1);
+    my $valout = &valout($value,$type,$parmname,1);
     my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
-              \$hour, \$min, \$sec, \$extra) {
+              \$hour, \$min, \$sec) {
     $$item = &HTML::Entities::encode($$item,'"<>&');
     $$item =~ s/\'/\\\'/g;
     }
     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
     '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
-        .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."','".$extra."'".');">'.
+        .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
         $valout.'</a></td></tr></table>';
 }
 
@@ -872,22 +879,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 +907,9 @@ sub page_js {
         var newWin = window.open(url, wdwName, options);
         newWin.focus();
     }
+
 // ]]>
+
 </script>
 $selscript
 ENDJS
@@ -929,32 +936,104 @@ function showHide_courseContent() {
 COURSECONTENTSCRIPT
 }
 
+sub toggleparmtextbox_js {
+    return <<"ENDSCRIPT";
+
+if (!document.getElementsByClassName) {
+    function getElementsByClassName(node, classname) {
+        var a = [];
+        var re = new RegExp('(^| )'+classname+'( |$)');
+        var els = node.getElementsByTagName("*");
+        for(var i=0,j=els.length; i<j; i++)
+            if(re.test(els[i].className))a.push(els[i]);
+        return a;
+    }
+}
+
+function showHideLenient() {
+    var lenients;
+    var setRegExp = /^set_/;
+    if (document.getElementsByClassName) {
+        lenients = document.getElementsByClassName('LC_lenient_radio');
+    } else {
+        lenients = getElementsByClassName(document.body,'LC_lenient_radio');
+    }
+    if (lenients != 'undefined') {
+        for (var i=0; i<lenients.length; i++) {
+            if (lenients[i].checked) {
+                if (lenients[i].value == 'weighted') {
+                    if (setRegExp.test(lenients[i].name)) {
+                        var identifier = lenients[i].name.replace(setRegExp,'');
+                        toggleParmTextbox(document.parmform,identifier);
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function toggleParmTextbox(form,key) {
+    var divfortext = document.getElementById('LC_parmtext_'+key);
+    if (divfortext) {
+        var caller = form.elements['set_'+key];
+        if (caller.length) {
+            for (i=0; i<caller.length; i++) {
+                if (caller[i].checked) {
+                    if (caller[i].value == 'weighted') {
+                        divfortext.style.display = 'inline';
+                    } else {
+                        divfortext.style.display = 'none';
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+ENDSCRIPT
+}
+
 sub validateparms_js {
     return <<'ENDSCRIPT';
 
 function validateParms() {
     var textRegExp = /^settext_/;
-    var ipRegExp = /^setip/;
+    var tailLenient = /\.lenient$/;
+    var patternRelWeight = /^\-?[\d.]+$/;
+    var patternLenientStd = /^(yes|no|default)$/;
     var ipallowRegExp = /^setipallow_/;
-    var ipdenyRegExp = /^setipdeny_/;
-    var deeplinkRegExp = /^deeplink_/;
-    var dlListScopeRegExp = /^deeplink_(state|others|listing|scope)_/;
-    var dlLinkProtectRegExp = /^deeplink_protect_/;
-    var dlLtidRegExp = /^deeplink_ltid_/;
-    var dlLticRegExp = /^deeplink_ltic_/;
-    var dlKeyRegExp = /^deeplink_key_/;
-    var dlMenusRegExp = /^deeplink_menus_/;
-    var dlCollsRegExp = /^deeplink_colls_/;
-    var dlTargetRegExp = /^deeplink_target_/;
-    var dlExitRegExp = /^deeplink_exit_/;
-    var dlExitTextRegExp = /^deeplink_exittext_/;
+    var ipdenyRegExp = /^setipdeny_/; 
     var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
-    var numelements = document.parmform.elements.length;
-    if ((typeof(numelements) != 'undefined') && (numelements != null)) {
-        if (numelements) {
-            for (i=0; i<numelements; i++) {
+    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 (ipRegExp.test(name)) {
+                if (textRegExp.test(name)) { 
+                    var identifier = name.replace(textRegExp,'');
+                    if (tailLenient.test(identifier)) {
+                        if (document.parmform.elements['set_'+identifier].length) {
+                            for (var j=0; j<document.parmform.elements['set_'+identifier].length; j++) {
+                                if (document.parmform.elements['set_'+identifier][j].checked) {
+                                    if (!(patternLenientStd.test(document.parmform.elements['set_'+identifier][j].value))) {
+                                        var relweight = document.parmform.elements[i].value;
+                                        relweight = relweight.replace(/^\s+|\s+$/g,'');
+                                        if (!patternRelWeight.test(relweight)) {
+                                            relweight = '0.0';
+                                        }
+                                        if (document.parmform.elements['set_'+identifier][j].value == 'weighted') {
+                                            document.parmform.elements['set_'+identifier][j].value = relweight;
+                                        } else {
+                                            document.parmform.elements['set_'+identifier][j].value += ','+relweight;
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                } else {
                     if (ipallowRegExp.test(name)) {
                         var identifier = name.replace(ipallowRegExp,'');
                         var possallow = document.parmform.elements[i].value;
@@ -963,170 +1042,19 @@ function validateParms() {
                             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;
-                        }
-                    }
-                } else if (deeplinkRegExp.test(name)) {
-                    if (dlListScopeRegExp.test(name)) {
-                        var identifier =  name.replace(dlListScopeRegExp,'');
-                        var idx = document.parmform.elements[i].selectedIndex;
-                        if (idx > 0) {
-                            var possdeeplink = document.parmform.elements[i].options[idx].value
-                            possdeeplink = possdeeplink.replace(/^\s+|\s+$/g,'');
-                            if (document.parmform.elements['set_'+identifier].value) {
-                                possdeeplink = ','+possdeeplink;
-                            }
-                            document.parmform.elements['set_'+identifier].value += possdeeplink;
-                        }
-                    } else if (dlLinkProtectRegExp.test(name)) {
-                        if (document.parmform.elements[i].checked) {
-                            var identifier =  name.replace(dlLinkProtectRegExp,'');
-                            var posslinkurl = document.parmform.elements[i].value;
-                            posslinkurl = posslinkurl.replace(/^\s+|\s+$/g,'');
-                            if (document.parmform.elements['set_'+identifier].value) {
-                                posslinkurl = ','+posslinkurl;
-                            }
-                            document.parmform.elements['set_'+identifier].value += posslinkurl;
-                        }
-                    } else if (dlLtidRegExp.test(name)) {
-                        var identifier = name.replace(dlLtidRegExp,'');
-                        if (isRadioSet('deeplink_protect_'+identifier,'ltid')) {
-                            var possltid = document.parmform.elements[i].value;
-                            possltid = possltid.replace(/\D+/g,'');
-                            if (possltid.length) {
-                                if (document.parmform.elements['set_'+identifier].value) {
-                                    possltid = ':'+possltid;
-                                }
-                                document.parmform.elements['set_'+identifier].value += possltid;
-                            } else {
-                                document.parmform.elements['set_'+identifier].value = '';
-                                alert("A link type of 'domain LTI launch' was selected but no domain LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
-                                return false;
-                            }
-                        }
-                    } else if (dlLticRegExp.test(name)) {
-                        var identifier = name.replace(dlLticRegExp,'');
-                        if (isRadioSet('deeplink_protect_'+identifier,'ltic')) {
-                            var possltic = document.parmform.elements[i].value;
-                            possltic = possltic.replace(/\D+/g,'');
-                            if (possltic.length) {
-                                if (document.parmform.elements['set_'+identifier].value) {
-                                    possltic = ':'+possltic;
-                                }
-                                document.parmform.elements['set_'+identifier].value += possltic;
-                            } else {
-                                document.parmform.elements['set_'+identifier].value = '';
-                                alert("A link type of 'course LTI launch' was selected but no course LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
-                                return false;
-                            }
-                        }
-                    } else if (dlKeyRegExp.test(name)) {
-                        var identifier = name.replace(dlKeyRegExp,'');
-                        if (isRadioSet('deeplink_protect_'+identifier,'key')) {
-                            var posskey = document.parmform.elements[i].value;
-                            posskey = posskey.replace(/^\s+|\s+$/g,'');
-                            var origlength = posskey.length;
-                            posskey = posskey.replace(/[^a-zA-Z\d_.!@#$%^&*()+=-]/g,'');
-                            var newlength = posskey.length;
-                            if (newlength > 0) {
-                                var change = origlength - newlength;
-                                if (change) {
-                                    alert(change+' disallowed character(s) removed from deeplink key');
-                                }
-                                if (document.parmform.elements['set_'+identifier].value) {
-                                    posskey = ':'+posskey;
-                                }
-                                document.parmform.elements['set_'+identifier].value += posskey;
-                            } else {
-                                document.parmform.elements['set_'+identifier].value = '';
-                                if (newlength < origlength) {
-                                    alert("A link type of 'deep with key' was selected but the key value was blank, after removing disallowed characters.\nPlease enter a key using one or more of: a-zA-Z0-9_.!@#$%^&*()+=-");
-                                } else {
-                                    alert("A link type of 'deep with key' was selected but the key value was blank.\nPlease enter a key.");
-                                }
-                                return false;
-                            }
+                            document.parmform.elements['set_'+identifier].value += possallow; 
                         }
-                    } else if (dlMenusRegExp.test(name)) {
-                        if (document.parmform.elements[i].checked) {
-                            var identifier =  name.replace(dlMenusRegExp,'');
-                            var posslinkmenu = document.parmform.elements[i].value;
-                            posslinkmenu = posslinkmenu.replace(/^\s+|\s+$/g,'');
-                            if (posslinkmenu == 'std') {
-                                posslinkmenu = '0';
+                    } 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) {
-                                    posslinkmenu = ','+posslinkmenu;
+                                    possdeny = ','+possdeny;
                                 }
-                                document.parmform.elements['set_'+identifier].value += posslinkmenu;
-                            }
-                        }
-                    } else if (dlCollsRegExp.test(name)) {
-                        var identifier =  name.replace(dlCollsRegExp,'');
-                        if (isRadioSet('deeplink_menus_'+identifier,'colls')) {
-                            var posslinkmenu = document.parmform.elements[i].value;
-                            if (document.parmform.elements['set_'+identifier].value) {
-                                posslinkmenu = ','+posslinkmenu;
-                            }
-                            document.parmform.elements['set_'+identifier].value += posslinkmenu;
-                        }
-                    } else if (dlTargetRegExp.test(name)) {
-                        var identifier =  name.replace(dlTargetRegExp,'');
-                        var idx = document.parmform.elements[i].selectedIndex;
-                        if (idx > 0) {
-                            var linktarget = document.parmform.elements[i].options[idx].value
-                            linktarget = linktarget.replace(/^\s+|\s+$/g,'');
-                            if (document.parmform.elements['set_'+identifier].value) {
-                                linktarget = ','+linktarget;
-                            }
-                            document.parmform.elements['set_'+identifier].value += linktarget;
-                        }
-                    } else if (dlExitRegExp.test(name)) {
-                        if (document.parmform.elements[i].checked) {
-                            var identifier =  name.replace(dlExitRegExp,'');
-                            var posslinkexit = document.parmform.elements[i].value;
-                            posslinkexit = posslinkexit.replace(/^\s+|\s+$/g,'');
-                            if (document.parmform.elements['set_'+identifier].value) {
-                                posslinkexit = ','+posslinkexit;
-                            }
-                            document.parmform.elements['set_'+identifier].value += posslinkexit;
-                        }
-                    } else if (dlExitTextRegExp.test(name)) {
-                        var identifier = name.replace(dlExitTextRegExp,'');
-                        if ((isRadioSet('deeplink_exit_'+identifier,'yes')) ||
-                            (isRadioSet('deeplink_exit_'+identifier,'url'))) {
-                            var posstext = document.parmform.elements[i].value;
-                            posstext = posstext.replace(/^\s+|\s+$/g,'');
-                            var origlength = posstext.length;
-                            posstext = posstext.replace(/[:;'",]/g,'');
-                            var newlength = posstext.length;
-                            if (newlength > 0) {
-                                var change = origlength - newlength;
-                                if (change) {
-                                    alert(change+' disallowed character(s) removed from Exit Button text');
-                                }
-                                if (posstext !== 'Exit Tool') {
-                                    posstext = ':'+posstext;
-                                    document.parmform.elements['set_'+identifier].value += posstext;
-                                }
-                            } else {
-                                document.parmform.elements['set_'+identifier].value = '';
-                                if (newlength < origlength) {
-                                    alert("An exit link type of 'In use' was selected but the button text value was blank, after removing disallowed characters.\nDisallowed characters are ,\":;'");
-                                } else {
-                                    alert("An exit link type of 'In use' was selected but the button text value was blank.\nPlease enter the text to use.");
-                                }
-                                return false;
+                                document.parmform.elements['set_'+identifier].value += possdeny;
                             }
                         }
                     }
@@ -1137,27 +1065,9 @@ function validateParms() {
     return true;
 }
 
-function isRadioSet(name,expected) {
-    var menuitems = document.getElementsByName(name);
-    var radioLength = menuitems.length;
-    result = false;
-    if (radioLength  > 1) {
-        for (var j=0; j<radioLength; j++) {
-            if (menuitems[j].checked) {
-                if (menuitems[j].value == expected) {
-                    result = true;
-                    break;
-                }
-            }
-        }
-    }
-    return result;
-}
-
 ENDSCRIPT
 }
 
-# Javascript initialization, for overview mode
 sub ipacc_boxes_js  {
     my $remove = &mt('Remove');
     return <<"END";
@@ -1182,125 +1092,8 @@ sub ipacc_boxes_js  {
 END
 }
 
-sub done_proctor_js {
-    my $defaultdone = &mt('Done');
-    &js_escape(\$defaultdone);
-    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='';
-                    }
-                }
-                if (document.getElementById('done_'+key+'_buttontext')) {
-                    if (radios[i].value == '') {
-                        document.getElementById('done_'+key+'_buttontext').value = '';
-                    } else {
-                        if (document.getElementById('done_'+key+'_buttontext').value == '') {
-                            document.getElementById('done_'+key+'_buttontext').value = '$defaultdone';
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-END
-
-}
-
-# Javascript function toggle
-sub deeplink_js {
-    return <<"END";
-function toggleDeepLink(form,item,key) {
-    var radios = form['deeplink_'+item+'_'+key];
-    if (radios.length) {
-        var keybox;
-        if (document.getElementById('deeplink_key_'+item+'_'+key)) {
-            keybox = document.getElementById('deeplink_key_'+item+'_'+key);
-        }
-        var divoptions = new Array();
-        if (item == 'protect') {
-            divoptions = ['ltic','ltid'];
-        } else {
-            if (item == 'menus') {
-                divoptions = ['colls'];
-            }
-        }
-        var seldivs = new Array();
-        if ((item == 'protect') || (item == 'menus')) {
-            for (var i=0; i<divoptions.length; i++) {
-                if (document.getElementById('deeplinkdiv_'+divoptions[i]+'_'+item+'_'+key)) {
-                    seldivs[i] = document.getElementById('deeplinkdiv_'+divoptions[i]+'_'+item+'_'+key);
-                } else {
-                    seldivs[i] = '';
-                }
-            }
-        }
-        for (var i=0; i<radios.length; i++) {
-            if (radios[i].checked) {
-                if ((item == 'protect') || (item == 'menus')) {
-                    for (var j=0; j<seldivs.length; j++) {
-                        if (radios[i].value == divoptions[j]) {
-                            if (seldivs[j] != '') {
-                                seldivs[j].style.display = 'inline-block';
-                            }
-                            if (item == 'protect') {
-                                keybox.type = 'hidden';
-                                keybox.value = '';
-                            }
-                        } else {
-                            if (seldivs[j] != '') {
-                                seldivs[j].style.display = 'none';
-                                form['deeplink_'+divoptions[j]+'_'+key].selectedIndex = 0;
-                            }
-                        }
-                    }
-                    if (item == 'protect') {
-                        if (radios[i].value == 'key') {
-                            keybox.type = 'text';
-                        } else {
-                            keybox.type = 'hidden';
-                        }
-                    }
-                } else if (item == 'exit') {
-                    if (document.getElementById('deeplinkdiv_'+item+'_'+key)) {
-                        if (radios[i].value == 'no') {
-                            document.getElementById('deeplinkdiv_'+item+'_'+key).style.display = 'none';
-                            if (document.getElementById('deeplink_exittext_'+key)) {
-                                if (document.getElementById('deeplink_exittext_'+key).value != '') {
-                                    document.getElementById('deeplink_exittext_'+key).value = '';
-                                }
-                            }
-                        } else {
-                            document.getElementById('deeplinkdiv_'+item+'_'+key).style.display = 'inline-block';
-                            if (document.getElementById('deeplink_exittext_'+key)) {
-                                if (document.getElementById('deeplink_exittext_'+key).value == '') {
-                                    document.getElementById('deeplink_exittext_'+key).value = 'Exit Tool';
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-END
-
-}
-
 sub startpage {
-    my ($r,$psymb) = @_;
+    my ($r,$psymb,$crstype) = @_;
 
     my %loaditems = (
                       'onload'   => "group_or_section('cgroup')",
@@ -1327,13 +1120,14 @@ sub startpage {
 </script>
 ';
     my $start_page =
-    &Apache::loncommon::start_page('Set/Modify Course Parameters',$js,
-                       {'add_entries' => \%loaditems,});
+        &Apache::loncommon::start_page('Set/Modify Course Parameters',$js,
+                                       {'add_entries' => \%loaditems,});
     my $breadcrumbs =
     &Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
     my $escfilter=&Apache::lonhtmlcommon::entity_encode($env{'form.filter'});
     my $escpart=&Apache::lonhtmlcommon::entity_encode($env{'form.part'});
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDHEAD);
 <form method="post" action="/adm/parmset?action=settable" name="parmform">
 <input type="hidden" value="" name="pres_value" />
@@ -1348,11 +1142,11 @@ 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,$noeditgrp)=@_;
     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);
+
 # get the values for the parameter in cascading order
 # empty levels will remain empty
     my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
@@ -1388,85 +1182,36 @@ sub print_row {
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
     my $mprefix=$rid.'&'.$thismarker.'&';
-    my ($parmname)=($thismarker=~/\_([^\_]+)$/);
-    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
-    my ($othergrp,$grp_parm,$controlgrp,$extra);
+    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$thismarker);
+    my ($othergrp,$grp_parm,$controlgrp);
 
-    if ($parmname eq 'deeplink') {
-        my ($domltistr,$crsltistr);
-        my %lti =
-            &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                            'linkprot');
-        if (keys(%lti)) {
-            foreach my $item (sort { $a <=> $b }  (keys(%lti))) {
-                if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
-                    $domltistr .= $item.':'.&escape(&escape($lti{$item}{'name'})).',';
-                }
-            }
-            $domltistr =~ s/,$//;
-            if ($domltistr) {
-                $extra = 'ltid_'.$domltistr;
-            }
-        }
-        my %courselti = &Apache::lonnet::get_course_lti($cnum,$cdom);
-        if (keys(%courselti)) {
-            foreach my $item (sort { $a <=> $b } keys(%courselti)) {
-                if (($item =~ /^\d+$/) && (ref($courselti{$item}) eq 'HASH')) {
-                    $crsltistr .= $item.':'.&escape(&escape($courselti{$item}{'name'})).',';
-                }
-            }
-            $crsltistr =~ s/,$//;
-            if ($crsltistr) {
-                if ($extra) {
-                    $extra .= '&';
-                }
-                $extra .= 'ltic_'.$crsltistr;
-            }
-        }
-        if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
-            my @colls;
-            foreach my $item (split(/;/,$env{'course.'.$env{'request.course.id'}.'.menucollections'})) {
-                my ($num,$value) = split(/\%/,$item);
-                if ($num =~ /^\d+$/) {
-                    push(@colls,$num);
-                }
-            }
-            if (@colls) {
-                if ($extra) {
-                    $extra .= '&';
-                }
-                $extra .= 'menus_'.join(',',@colls);
-            }
-        }
-    }
     if ($parmlev eq 'general') {
-
         if ($uname) {
-            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         } elsif ($csec) {
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } else {
-            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         }
     } elsif ($parmlev eq 'map') {
 
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         } elsif ($csec) {
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } else {
-            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@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)) {
@@ -1479,33 +1224,32 @@ sub print_row {
             }
         }
 
-        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-
-    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-
-    if ($csec) {
-        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-    }
+        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+
+        if ($csec) {
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        }
 
         if ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
-            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         }
 
-    if ($uname) {
+        if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
-        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
-    }
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        }
 
     } # end of $parmlev if/else
     $r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');
@@ -1516,7 +1260,7 @@ sub print_row {
         my $sessionvaltype=$typeoutpar[$result];
         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
         $r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
-                  &valout($sessionval,$sessionvaltype).'&nbsp;'.
+                  &valout($sessionval,$sessionvaltype,$$name{$which}).'&nbsp;'.
                   '</font></td>');
     }
     $r->print('</tr>');
@@ -1524,41 +1268,39 @@ sub print_row {
 }
 
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly,$extra)=@_;
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp)=@_;
     $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 (($env{'request.course.sec'} ne '') && ($which > 9)) {
+        $nolink = 1;
+    } elsif ($which == 4 || $which ==  5 || $which == 6) {
+        if ($noeditgrp) {
             $nolink = 1;
-        } elsif (($env{'request.course.sec'} ne '') && ($which > 9)) {
+        }
+    } elsif ($mprefix =~ /availablestudent\&$/) {
+        if ($which > 3) {
             $nolink = 1;
-        } elsif ($which == 4 || $which ==  5 || $which == 6) {
-            if ($noeditgrp) {
-                $nolink = 1;
-            }
-        } elsif ($mprefix =~ /availablestudent\&$/) {
+        }
+    } elsif ($mprefix =~ /examcode\&$/) {
+        unless ($which == 2) {
             $nolink = 1;
-        } elsif ($mprefix =~ /examcode\&$/) {
-            unless ($which == 2) {
-                $nolink = 1;
-            }
         }
     }
     if ($nolink) {
-        $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
+        $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));
     } else {
         $r->print(&plink($$typeoutpar[$which],
                          $$display{$value},$$outpar[$which],
-                         $mprefix."$which",'parmform.pres','psub',$extra));
+                         $mprefix."$which",'parmform.pres','psub'));
     }
     $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);
@@ -1573,8 +1315,9 @@ sub check_other_groups {
     if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
+            $grp_parm = &valout($coursereply,$resulttype,$what);
         }
-        $grp_parm = &valout($coursereply,$resulttype);
+        $grp_parm = &valout($coursereply,$resulttype,$what);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
         if ($resultgroup && $resultlevel) {
             $output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
@@ -1718,21 +1461,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[
@@ -1811,7 +1547,7 @@ sub parmmenu {
 ENDSCRIPT
 
     $r->print('<hr />');
-    &shortCuts($r);
+    &shortCuts($r,$allparms,$pscat,$keyorder);
     $r->print('<hr />');
 }
 # return a hash
@@ -1860,7 +1596,6 @@ sub lookUpTableParameter {
         'buttonshide' => 'hiding',
         'turnoffeditor' => 'hiding',
         'encrypturl' => 'hiding',
-        'deeplink' => 'hiding',
         'randomorder' => 'high_level_randomization',
         'randompick' => 'high_level_randomization',
         'available' => 'slots',
@@ -1876,8 +1611,8 @@ sub lookUpTableParameter {
         'lenient' => 'grading',
         'retrypartial' => 'tries',
         'discussvote'  => 'misc',
-        'examcode' => 'high_level_randomization',
-    );
+        'examcode' => 'high_level_randomization', 
+    );    
 }
 
 sub whatIsMyCategory {
@@ -1928,9 +1663,7 @@ sub category_order {
 
 sub parmboxes {
     my ($r,$allparms,$pscat,$keyorder)=@_;
-    my $tempkey;
-    my $tempparameter;
-    my %categories = &categories;
+    my %categories = &categories();
     my %category_order = &category_order();
     my %categoryList = (
         'time_settings' => [],
@@ -1945,41 +1678,35 @@ sub parmboxes {
         'misc' => [],
     );
 
-    foreach $tempparameter (keys %$allparms) {
+    foreach my $tempparameter (keys(%$allparms)) {
         &whatIsMyCategory($tempparameter, \%categoryList);
     }
     #part to print the parm-list
-    $r->print('<div class="LC_columnSection">'."\n");
-
-    #Print parameters
-    for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
-        next if(@{$categoryList{$key}} == 0);
+    foreach my $key (sort { $category_order{$a} <=> $category_order{$b} } keys(%categoryList)) {
+        next if (@{$categoryList{$key}} == 0);
+        next if ($key eq '');
         $r->print('<div class="LC_Box LC_400Box">'
-                  .'<h4 class="LC_hcell">'
-                  .&mt($categories{$key})
-                  .'</h4>'."\n");
-        foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
-            next if ($tempkey eq '');
+                 .'<h4 class="LC_hcell">'.&mt($categories{$key}).'</h4>'."\n");
+        foreach my $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
             $r->print('<span class="LC_nobreak">'
                      .'<label><input type="checkbox" name="pscat" '
                      .'value="'.$tempkey.'" ');
             if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
-                $r->print(' checked="checked"');
+                $r->print( ' checked="checked"');
             }
             $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
                                                       : $tempkey)
                      .'</label></span><br />'."\n");
         }
-        $r->print("</div>\n");
+        $r->print('</div>');
     }
-
-    $r->print("</div>\n");
+    $r->print("\n");
 }
 #
 # This function offers some links on the parameter section to get with one click a group a parameters
 #
 sub shortCuts {
-    my ($r)=@_;
+    my ($r,$allparms,$pscat,$keyorder)=@_;
 
     # Parameter Selection
     $r->print(
@@ -2040,37 +1767,9 @@ sub partmenu {
 sub usermenu {
     my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups,$pssymb)=@_;
     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();
 
@@ -2079,7 +1778,7 @@ ENDJS
     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'});
+        map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
     }
 
     my $g_s_header='';
@@ -2097,7 +1796,7 @@ ENDJS
             $sections .= qq| onchange="group_or_section('csec')" |;
         }
         $sections .= '>';
-    foreach my $section ('',sort keys %sectionhash) {
+    foreach my $section ('',sort(keys(%sectionhash))) {
         $sections.='<option value="'.$section.'" '.
         ($section eq $csec?'selected="selected"':'').'>'.$section.
                                                               '</option>';
@@ -2124,7 +1823,7 @@ function group_or_section(caller) {
 // ]]>
 </script>
 |;
-    } elsif ($currsec eq '') {
+    } else {
         $sections .= qq|
 <script type="text/javascript">
 // <![CDATA[
@@ -2137,12 +1836,12 @@ function group_or_section(caller) {
     }
 
     if (%grouphash) {
-        $groups=&mt('Group').': <select name="cgroup"';
+        $groups=&mt('Group:').' <select name="cgroup"';
         if (%sectionhash && $env{'form.action'} eq 'settable' && $currsec eq '') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
         $groups .= '>';
-        foreach my $grp ('',sort keys %grouphash) {
+        foreach my $grp ('',sort(keys(%grouphash))) {
             $groups.='<option value="'.$grp.'" ';
             if ($grp eq $cgroup) {
                 unless ((defined($uname)) && ($grp eq '')) {
@@ -2164,6 +1863,8 @@ function group_or_section(caller) {
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));
         $r->print($sections.$groups);
         $r->print(&Apache::lonhtmlcommon::row_closure());
+    } else {
+        $r->print($sections); 
     }
 
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));
@@ -2177,12 +1878,12 @@ 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,$divid)=@_;
 
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
 
-    &parmmenu($r);
+    &parmmenu($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
     &parmboxes($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::loncommon::end_scrollbox());
@@ -2193,7 +1894,7 @@ sub displaymenu {
 }
 
 sub mapmenu {
-    my ($r,$allmaps,$pschp,$maptitles,$symbp,$parmlev)=@_;
+    my ($r,$allmaps,$pschp,$maptitles,$symbp)=@_;
     my %allmaps_inverted = reverse %$allmaps;
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $tree=[];
@@ -2241,11 +1942,7 @@ sub mapmenu {
         }
     }
 # Show it ...    
-    my $rowattr = ' id="mapmenu"';
-    if ($parmlev eq 'general') {
-        $rowattr .= ' style="display:none"';
-    }
-    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',$rowattr));
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',' id="mapmenu"'));
     if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
         my $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
         my $whitespace =
@@ -2352,14 +2049,15 @@ sub mapmenu {
 sub levelmenu {
     my ($r,$alllevs,$parmlev)=@_;
 
-    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').
+                                                &Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
     $r->print('<select id="parmlev" name="parmlev" onchange="showHide_courseContent()">');
-    foreach (reverse sort keys %{$alllevs}) {
-    $r->print('<option value="'.$$alllevs{$_}.'"');
-    if ($parmlev eq $$alllevs{$_}) {
-        $r->print(' selected="selected"');
-    }
-    $r->print('>'.&mt($_).'</option>');
+    foreach my $lev (reverse(sort(keys(%{$alllevs})))) {
+        $r->print('<option value="'.$$alllevs{$lev}.'"');
+        if ($parmlev eq $$alllevs{$lev}) {
+            $r->print(' selected="selected"');
+        }
+        $r->print('>'.&mt($lev).'</option>');
     }
     $r->print("</select>");
 }
@@ -2381,7 +2079,7 @@ sub sectionmenu {
     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}))) {
+        if ((@{$selectedsections}) && (grep(/^\Q$s\E$/,@{$selectedsections}))) {  
             $output .= ' selected="selected"';
         }
         $output .= '>'."$s</option>\n";
@@ -2396,7 +2094,7 @@ sub groupmenu {
     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'});
+         map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
     }
     return '' if (!%grouphash);
 
@@ -2404,9 +2102,9 @@ sub groupmenu {
     foreach my $group (sort(keys(%grouphash))) {
         $output .= '    <option value="'.$group.'"';
         if ((@{$selectedgroups}) && (grep(/^\Q$group\E$/,\@{$selectedgroups}))) {
-            $output .= ' selected="selected"';
+            $output .=  ' selected="selected"';
         }
-        $output .= '>'.$group."</option>\n";
+        $output .= '>'."$group</option>\n";
     }
     $output .= "</select>\n";
     return $output;
@@ -2421,7 +2119,7 @@ sub keysinorder {
     my ($name,$keyorder)=@_;
     return sort {
     $$keyorder{$a} <=> $$keyorder{$b};
-    } (keys %{$name});
+    } (keys(%{$name}));
 }
 
 sub keysinorder_bytype {
@@ -2433,14 +2131,14 @@ sub keysinorder_bytype {
         return ($a cmp $b);
     }
     $$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
-    } (keys %{$name});
+    } (keys(%{$name}));
 }
 
 sub keysindisplayorder {
     my ($name,$keyorder)=@_;
     return sort {
     $$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};
-    } (keys %{$name});
+    } (keys(%{$name}));
 }
 
 sub sortmenu {
@@ -2487,7 +2185,8 @@ sub standardkeyorder {
 
 sub assessparms {
 
-    my ($r,$parm_permission) = @_;
+    my $r=shift;
+
 
 
 # -------------------------------------------------------- Variable declaration
@@ -2536,11 +2235,11 @@ sub assessparms {
 
 # Check group privs.
     $cgroup=$env{'form.cgroup'};
-    my $noeditgrp;
+    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'})))) {
+            if (($env{'request.course.groups'} eq '') || 
+                (!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {
                 $noeditgrp = 1;
             }
         }
@@ -2559,7 +2258,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='';
@@ -2592,13 +2291,15 @@ sub assessparms {
 
     my $id=$env{'form.id'};
     if (($id) && ($udom)) {
-        $uname=(&Apache::lonnet::idget($udom,$id))[1];
+        $uname=(&Apache::lonnet::idget($udom,[$id],'ids'))[1];
         if ($uname) {
             $id='';
         } else {
             $message=
-            '<span class="LC_error">'.&mt("Unknown ID")." '$id' ".
-            &mt('at domain')." '$udom'</span>";
+                '<p class="LC_warning">'.
+                &mt('Unknown ID [_1] at domain [_2]',
+                    "'".$id."'","'".$udom."'").
+                '</p>';
         }
     } else {
         $uname=$env{'form.uname'};
@@ -2609,131 +2310,36 @@ sub assessparms {
         $uhome=&Apache::lonnet::homeserver($uname,$udom);
         if ($uhome eq 'no_host') {
             $message=
-            '<span class="LC_error">'.&mt("Unknown user")." '$uname' ".
-            &mt("at domain")." '$udom'</span>";
+                '<p class="LC_warning">'.
+                &mt('Unknown user [_1] at domain [_2]',
+                    "'".$uname."'","'".$udom."'").
+                '</p>';
             $uname='';
         } else {
             $csec=&Apache::lonnet::getsection($udom,$uname,
                           $env{'request.course.id'});
             if ($csec eq '-1') {
-                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=
+                    '<p class="LC_warning">'.
+                    &mt('User [_1] at domain [_2] not in this course',
+                        "'".$uname."'","'".$udom."'").
+                    '</p>';
+                $uname='';
+                $csec=$env{'form.csec'};
                 $cgroup=$env{'form.cgroup'};
-            }
-            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];
                 }
             }
         }
@@ -2751,7 +2357,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'});
@@ -2760,7 +2366,6 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
-        my $totalskippeduser = 0;
         my $now = time;
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer,$name);
@@ -2769,12 +2374,7 @@ sub assessparms {
             }
             if ($markers[$i] =~ /\&(6|5|4)$/) {
                 next if ($noeditgrp);
-            } elsif ($markers[$i] =~ /\&(3|2|1)$/) {
-                if ($uname eq '') {
-                    $totalskippeduser ++;
-                    next;
-                }
-            }
+            } 
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
@@ -2805,9 +2405,10 @@ sub assessparms {
                         }
                     }
                 }
-            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate)\&\d+$/) {
+            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate|acc|interval)\&\d+$/) {
                 $name = $1;
                 my $val = $values[$i];
+                my $valmatch = '';
                 if ($name eq 'examcode') {
                     if (&Apache::lonnet::validCODE($values[$i])) {
                         $val = 'valid';
@@ -2817,22 +2418,56 @@ sub assessparms {
                         if ($val > $now) {
                             $val = 'future';
                         }
-                    }
+                    } 
                 } elsif ($name eq 'printenddate') {
                     if ($val =~ /^\d+$/) {
                         if ($val < $now) {
                             $val = 'past';
                         }
                     }
+                } elsif (($name eq 'lenient') || ($name eq 'acc')) {
+                    my $stringtype = &get_stringtype($name);
+                    my $stringmatch = &standard_string_matches($stringtype);
+                    if (ref($stringmatch) eq 'ARRAY') {
+                        foreach my $item (@{$stringmatch}) {
+                            if (ref($item) eq 'ARRAY') {
+                                my ($regexpname,$pattern) = @{$item};
+                                if ($pattern ne '') {
+                                    if ($val =~ /$pattern/) {
+                                        $valmatch = $regexpname;
+                                        $val = '';
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } elsif ($name eq 'interval') {
+                    my $intervaltype = &get_intervaltype($name);
+                    my $intervalmatch = &standard_interval_matches($intervaltype);
+                    if (ref($intervalmatch) eq 'ARRAY') {
+                        foreach my $item (@{$intervalmatch}) {
+                            if (ref($item) eq 'ARRAY') {
+                                my ($regexpname,$pattern) = @{$item};
+                                if ($pattern ne '') {
+                                    if ($val =~ /$pattern/) {
+                                        $valmatch = $regexpname;
+                                        $val = '';
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
                 $needsrelease =
-                    $Apache::lonnet::needsrelease{"parameter:$name:$val"};
+                    $Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"};
                 if ($needsrelease) {
                     unless ($got_chostname) {
                         ($chostname,$cmajor,$cminor) = &parameter_release_vars();
                         $got_chostname = 1;
-                    }
-                    $needsnewer = &parameter_releasecheck($name,$val,
+                    } 
+                    $needsnewer = &parameter_releasecheck($name,$val,$valmatch,
                                                           $needsrelease,
                                                           $cmajor,$cminor);
                 }
@@ -2851,42 +2486,22 @@ sub assessparms {
 # ---------------------------------------------------------------- Done storing
         if ($totalstored) {
             $message.='<p class="LC_warning">'
-                     .&mt('Changes for [quant,_1,parameter] saved.',$totalstored)
-                     .'<br />'
                      .&mt('Changes can take up to 10 minutes before being active for all students.')
                      .&Apache::loncommon::help_open_topic('Caching')
                      .'</p>';
-        } else {
-            $message.='<p class="LC_info">'.&mt('No parameter changes saved.').'</p>';
-        }
-        if ($totalskippeduser) {
-            $message .= '<p class="LC_warning">';
-            if ($uhome eq 'no_host') {
-                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the username or ID was invalid.',
-                                $totalskippeduser);
-            } elsif ($env{'form.userroles'} eq 'any') {
-                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user does not have a course role.',
-                                $totalskippeduser);
-            } else {
-                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user is not a student.',
-                                $totalskippeduser);
-            }
-            $message .= '</p>';
         }
     }
 #----------------------------------------------- if all selected, fill in array
-    if ($pscat[0] eq "all") {@pscat = (keys %allparms);}
+    if ($pscat[0] eq "all") {@pscat = (keys(%allparms));}
     if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };
-    if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
+    if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys(%allparts));}
 # ------------------------------------------------------------------ Start page
 
-    &startpage($r,$pssymb);
+    my $crstype = &Apache::loncommon::course_type();
+    &startpage($r,$pssymb,$crstype);
 
     foreach 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') {
+        'date_interval','int','float','string') {
         $r->print('<input type="hidden" value="'.
           &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
           '" name="recent_'.$item.'" />');
@@ -2894,20 +2509,13 @@ sub assessparms {
 
     # ----- Start Parameter Selection
 
-    # Hide parm selection and possibly table?
-    my ($tablejs,$tabledivsty);
-    if (((($env{'form.uname'} ne '') || ($env{'form.id'} ne '')) && ($uname eq '')) &&
-        ($env{'form.dis'}) && ($pssymb eq '')) {
-        $tablejs = 'document.getElementById('."'parmtable'".').style.display = "";';
-        $tabledivsty = ' style="display:none"';
-    }
+    # Hide parm selection?
     $r->print(<<ENDPARMSELSCRIPT);
 <script type="text/javascript">
 // <![CDATA[
 function parmsel_show() {
   document.getElementById('parmsel').style.display = "";
   document.getElementById('parmsellink').style.display = "none";
-  $tablejs
 }
 // ]]>
 </script>
@@ -2933,7 +2541,7 @@ ENDPARMSELSCRIPT
         $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
         &levelmenu($r,\%alllevs,$parmlev);
         $r->print(&Apache::lonhtmlcommon::row_closure());
-        &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp,$parmlev);
+        &mapmenu($r,\%allmaps,$pschp,\%maptitles, \%symbp);
         $r->print(&Apache::lonhtmlcommon::row_closure());
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
         &partmenu($r,\%allparts,\@psprt);
@@ -2942,7 +2550,7 @@ 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,'parmmenuscroll');
 
         # Step 3
         $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
@@ -2970,7 +2578,6 @@ ENDPARMSELSCRIPT
              .'</a>'
              .'</p>');
     } else {
-        $r->print();
         # parameter screen for a single resource. 
         my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);
         my $title = &Apache::lonnet::gettitle($pssymb);
@@ -2980,12 +2587,6 @@ ENDPARMSELSCRIPT
                   '<br />');
         $r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')).
-                  '<label>'.
-                  '<input type="checkbox" name="psprt" value="all"'.
-                  ($env{'form.psprt'}?' checked="checked"':'').' />'.
-                  &mt('Show all parts').
-                  '</label></td></tr>');
         &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
@@ -3010,16 +2611,12 @@ ENDPARMSELSCRIPT
 
     @pscat = @temp_pscat;
 
+
     if (($env{'form.prevvisit'}) || ($pschp) || ($pssymb)) {
 # ----------------------------------------------------------------- Start Table
         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);
-        }
-        $r->print('<div id="parmtable"'.$tabledivsty.'>');
 
         if ($parmlev eq 'full') {
 #
@@ -3042,7 +2639,7 @@ ENDPARMSELSCRIPT
                        $userspan ++;
                    }
                    $r->print('<th colspan="'.$userspan.'" rowspan="2">');
-                   $r->print(&mt("User")." $uname ".&mt('at Domain')." $udom</th>");
+                   $r->print(&mt('User [_1] at Domain [_2]',"'".$uname."'","'".$udom."'").'</th>');
                }
                my %lt=&Apache::lonlocal::texthash(
                 'pie'    => "Parameter in Effect",
@@ -3105,9 +2702,8 @@ ENDTABLEHEADFOUR
                my $defbgtwo='';
                my $defbgthree = '';
 
-               foreach (@ids) {
+               foreach my $rid (@ids) {
 
-                my $rid=$_;
                 my ($inmapid)=($rid=~/\.(\d+)$/);
 
                 if ((!$pssymb &&
@@ -3141,35 +2737,34 @@ ENDTABLEHEADFOUR
                     my $uri=&Apache::lonnet::declutter($uris{$rid});
 
                     my $filter=$env{'form.filter'};
-                    foreach (&keysplit($keyp{$rid})) {
-                        my $tempkeyp = $_;
+                    foreach my $tempkeyp (&keysplit($keyp{$rid})) {
                         if (grep $_ eq $tempkeyp, @catmarker) {
-                          my $parmname=&Apache::lonnet::metadata($uri,$_.'.name');
+                          my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');
 # We may only want certain parameters listed
                           if ($filter) {
                              unless ($filter=~/\Q$parmname\E/) { next; }
                           }
-                          $name{$_}=$parmname;
-                          $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
+                          $name{$tempkeyp}=$parmname;
+                          $part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');
 
-                          my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
-                          if ($allparms{$name{$_}} ne '') {
+                          my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display');
+                          if ($allparms{$name{$tempkeyp}} ne '') {
                               my $identifier;
                               if ($parmdis =~ /(\s*\[Part.*)$/) {
                                   $identifier = $1;
                               }
-                              $display{$_} = $allparms{$name{$_}}.$identifier;
+                              $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
                           } else {
-                              $display{$_} = $parmdis;
+                              $display{$tempkeyp} = $parmdis;
                           }
-                          unless ($display{$_}) { $display{$_}=''; }
-                          $display{$_}.=' ('.$name{$_}.')';
-                          $default{$_}=&Apache::lonnet::metadata($uri,$_);
-                          $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');
-                          $thistitle=&Apache::lonnet::metadata($uri,$_.'.title');
+                          unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
+                          $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
+                          $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp);
+                          $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type');
+                          $thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title');
                         }
                     }
-                    my $totalparms=scalar keys %name;
+                    my $totalparms=scalar(keys(%name));
                     if ($totalparms>0) {
                            my $firstrow=1;
                         my $title=&Apache::lonnet::gettitle($symbp{$rid});
@@ -3195,17 +2790,16 @@ ENDTABLEHEADFOUR
                         $r->print('<td style="background-color:'.$defbgone.';"'.
                                       ' rowspan='.$totalparms.
                                       '>'.$maptitles{$mapp{$rid}}.'</td>');
-                        foreach (&keysinorder_bytype(\%name,\%keyorder)) {
-
+                        foreach my $item (&keysinorder_bytype(\%name,\%keyorder)) {
                             unless ($firstrow) {
                                 $r->print('<tr>');
                             } else {
                                 undef $firstrow;
                             }
-                            &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
+                            &print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
                                        $defbgthree,$parmlev,$uname,$udom,$csec,
-                                       $cgroup,\@usersgroups,$noeditgrp,$readonly);
+                                       $cgroup,\@usersgroups,$noeditgrp);
                         }
                     }
                 }
@@ -3229,7 +2823,7 @@ ENDTABLEHEADFOUR
 
 #-------------------------------------------- for each map, gather information
             my $mapid;
-               foreach $mapid (sort { $a <=> $b } keys(%maplist)) {
+               foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
                 my $maptitle = $maplist{$mapid};
 
 #-----------------------  loop through ids and get all parameter types for map
@@ -3243,9 +2837,9 @@ ENDTABLEHEADFOUR
 
 #        $r->print("Catmarker: @catmarker<br />\n");
 
-                foreach (@ids) {
-                    ($map)=(/([\d]*?)\./);
-                      my $rid = $_;
+                foreach my $id (@ids) {
+                    ($map)=($id =~ /([\d]*?)\./);
+                    my $rid = $id;
 
 #                  $r->print("$mapid:$map:   $rid <br /> \n");
 
@@ -3260,12 +2854,11 @@ ENDTABLEHEADFOUR
 # When storing information, store as part 0
 # When requesting information, request from full part
 #-------------------------------------------------------------------
-                        foreach (&keysplit($keyp{$rid})) {
-                             my $tempkeyp = $_;
-                              my $fullkeyp = $tempkeyp;
-                              $tempkeyp =~ s/_\w+_/_0_/;
+                        foreach my $fullkeyp (&keysplit($keyp{$rid})) {
+                            my $tempkeyp = $fullkeyp;
+                            $tempkeyp =~ s/_\w+_/_0_/;
 
-                              if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
+                            if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                                 $part{$tempkeyp}="0";
                                 $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
                                 my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
@@ -3324,12 +2917,11 @@ ENDTABLEHEADFOUR
                          .&Apache::loncommon::end_data_table_header_row()
                 );
 
-                foreach (&keysinorder(\%name,\%keyorder)) {
+                foreach my $item (&keysinorder(\%name,\%keyorder)) {
                     $r->print(&Apache::loncommon::start_data_table_row());
-                    &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
+                    &print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
-                           $readonly);
+                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
                 }
                 $r->print(&Apache::loncommon::end_data_table().'</p>'
                          .'</div>'
@@ -3352,8 +2944,8 @@ ENDTABLEHEADFOUR
             my %type = ();
             my %default = ();
 
-            foreach (@ids) {
-                my $rid = $_;
+            foreach $id (@ids) {
+                my $rid = $id;
 
                 my $uri=&Apache::lonnet::declutter($uris{$rid});
 
@@ -3364,11 +2956,10 @@ ENDTABLEHEADFOUR
 # When storing information, store as part 0
 # When requesting information, request from full part
 #-------------------------------------------------------------------
-                foreach (&keysplit($keyp{$rid})) {
-                    my $tempkeyp = $_;
-                      my $fullkeyp = $tempkeyp;
-                      $tempkeyp =~ s/_\w+_/_0_/;
-                      if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
+                foreach my $fullkeyp (&keysplit($keyp{$rid})) {
+                    my $tempkeyp = $fullkeyp;
+                    $tempkeyp =~ s/_\w+_/_0_/;
+                    if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                         $part{$tempkeyp}="0";
                         $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
                         my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
@@ -3416,21 +3007,20 @@ ENDMAPONE
                      .&Apache::loncommon::end_data_table_header_row()
             );
 
-            foreach (&keysinorder(\%name,\%keyorder)) {
+            foreach my $item (&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);
+                &print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
+                       \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
+                                   $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
             }
             $r->print(&Apache::loncommon::end_data_table()
                      .'</p>'
                      .'</center>'
             );
         } # end of $parmlev eq general
-        $r->print('</div>');
     }
     $r->print('</form>');
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 } # end sub assessparms
 
@@ -3472,19 +3062,19 @@ sub readdata {
 # Read userdata
 
     my $classlist=&Apache::loncoursedata::get_classlist();
-    foreach (keys %$classlist) {
-        if ($_=~/^($match_username)\:($match_domain)$/) {
-        my ($tuname,$tudom)=($1,$2);
-        my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
-            foreach my $userkey (keys %{$useropt}) {
-        if ($userkey=~/^$env{'request.course.id'}/) {
+    foreach my $user (keys(%$classlist)) {
+        if ($user=~/^($match_username)\:($match_domain)$/) {
+            my ($tuname,$tudom)=($1,$2);
+            my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
+            foreach my $userkey (keys(%{$useropt})) {
+                if ($userkey=~/^\Q$env{'request.course.id'}\E/) {
                     my $newkey=$userkey;
-            $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
-            $$resourcedata{$newkey}=$$useropt{$userkey};
-        }
+                    $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
+                    $$resourcedata{$newkey}=$$useropt{$userkey};
+                }
+            }
         }
     }
-    }
     if (wantarray) {
         return ($resourcedata,$classlist);
     } else {
@@ -3510,14 +3100,14 @@ sub storedata {
     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
-        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny' || $cmd eq 'setdeeplink');
+        next if ($cmd eq 'settext' || $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, $valmatch, $namematch);
+        my ($data, $typeof, $text, $name, $valchk, $valmatch);
         if ($cmd eq 'set') {
             $data=$env{$key};
             $valmatch = '';
@@ -3526,8 +3116,8 @@ sub storedata {
             $text = &mt('Saved modified parameter for');
             if ($typeof eq 'string_questiontype') {
                 $name = 'type';
-            } elsif ($typeof eq 'string_deeplink') {
-                ($name) = ($typeof =~ /^string_(deeplink)$/);
+            } elsif ($typeof eq 'string_lenient') {
+                $name = 'lenient';
                 my $stringmatch = &standard_string_matches($typeof);
                 if (ref($stringmatch) eq 'ARRAY') {
                     foreach my $item (@{$stringmatch}) {
@@ -3543,8 +3133,6 @@ sub storedata {
                         }
                     }
                 }
-            } elsif ($typeof eq 'string_lenient') {
-                $name = 'lenient';
             } elsif ($typeof eq 'string_discussvote') {
                 $name = 'discussvote';
             } elsif ($typeof eq 'string_examcode') {
@@ -3578,18 +3166,37 @@ sub storedata {
             }
         } elsif ($cmd eq 'dateinterval') {
             $data=&get_date_interval_from_form($thiskey);
+            if ($thiskey =~ /\.interval$/) {
+                $name = 'interval';
+                my $intervaltype = &get_intervaltype($name);
+                my $intervalmatch = &standard_interval_matches($intervaltype);
+                if (ref($intervalmatch) eq 'ARRAY') {
+                    foreach my $item (@{$intervalmatch}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($pattern ne '') {
+                                if ($data =~ /$pattern/) {
+                                    $valmatch = $regexpname;
+                                    $valchk = '';
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified date for');
         }
         if ($name ne '') {
             my ($needsrelease,$needsnewer);
-            $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk"};
+            $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};
             if ($needsrelease) {
                 unless ($got_chostname) {
                     ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                     $got_chostname = 1;
                 }
-                $needsnewer = &parameter_releasecheck($name,$valchk,
+                $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,
                                                       $needsrelease,
                                                       $cmajor,$cminor);
                 if ($needsnewer) {
@@ -3636,7 +3243,7 @@ sub storedata {
     }
 # Store all course level
     my $delentries=$#deldata+1;
-    my @newdatakeys=keys %newdata;
+    my @newdatakeys=keys(%newdata);
     my $putentries=$#newdatakeys+1;
     if ($delentries) {
     if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
@@ -3687,7 +3294,8 @@ sub parse_listdata_key {
 }
 
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly,$parmlev)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist)=@_;
+    
 # Start list output
 
     my $oldsection='';
@@ -3697,7 +3305,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')) {
@@ -3705,7 +3312,7 @@ sub listdata {
         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'});
+            map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
         }
     }
 
@@ -3748,8 +3355,9 @@ sub listdata {
     }
 
     $result;
-    } keys %{$listdata}) {
+    } keys(%{$listdata})) {
 
+    my $readonly;
     if ($$listdata{$thiskey.'.type'}) {
         my $thistype=$$listdata{$thiskey.'.type'};
         if ($$resourcedata{$thiskey.'.type'}) {
@@ -3758,9 +3366,6 @@ sub listdata {
         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)/) {
@@ -3768,12 +3373,11 @@ sub listdata {
                 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'});
+                            next unless ($classlist->{$stuname.':'.$studom}->[$secidx] eq $env{'request.course.sec'}); 
                         }
                     }
                 }
-                $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
-                $userscope = 1;
+                $section=&mt('User').": ".&Apache::loncommon::plainname($stuname,$studom);
             } else {
                 if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
                     if (exists($grouphash{$issection})) {
@@ -3781,7 +3385,7 @@ sub listdata {
                     } elsif ($issection eq $env{'request.course.sec'}) {
                         $section = &mt('Section').': '.$issection;
                     } else {
-                        next;
+                        next; 
                     }
                 } else {
                     $section=&mt('Group/Section').': '.$issection;
@@ -3794,12 +3398,10 @@ sub listdata {
         $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) {
         my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
-        next if (($url =~ /\.(page|sequence)$/) && ($parmlev eq 'full') && ($caller eq 'newoverview'));
         $realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
         }
         if ($sortorder eq 'realmstudent') {
@@ -3839,13 +3441,8 @@ sub listdata {
               '<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>');
+                      $thiskey.'" /></td>');
         }
         $r->print('<td>');
         $foundkeys++;
@@ -3861,21 +3458,18 @@ sub listdata {
                                                     $jskey,
                                                     $$resourcedata{$thiskey},
                                                     '',1,$state));
-            unless ($readonly) {
+            unless  ($readonly) {
                 $r->print(
 '<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));
         } elsif ($thistype =~ m/^string/) {
-            if ($name eq 'availablestudent') {
-                $readonly = 1;
-            }
             $r->print(&string_selector($thistype,$thiskey,
                       $$resourcedata{$thiskey},$name,$readonly));
         } else {
@@ -3891,116 +3485,21 @@ sub listdata {
     return $foundkeys;
 }
 
-
-sub date_interval_selector {
-    my ($thiskey, $pname, $showval, $readonly) = @_;
-    my ($result,%skipval);
-    my $currval = $showval;
-    foreach my $which (['days', 86400, 31],
-               ['hours', 3600, 23],
-               ['minutes', 60, 59],
-               ['seconds',  1, 59]) {
-    my ($name, $factor, $max) = @{ $which };
-    my $amount = int($showval/$factor);
-    $showval  %= $factor;
-    my %select = ((map {$_ => $_} (0..$max)),
-              'select_form_order' => [0..$max]);
-    if ($currval eq '') {
-        unshift(@{$select{'select_form_order'}},'');
-        $select{''} = '';
-        $amount = '';
-    }
-    $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
-                           \%select,'',$readonly);
-    $result .= ' '.&mt($name);
-    }
-    if ($pname eq 'interval') {
-        unless ($skipval{'done'}) {
-            my $checkedon = '';
-            my $checkedoff = '';
-            my $checkedproc = '';
-            my $currproctorkey = '';
-            my $currprocdisplay = 'hidden';
-            my $currdonetext = &mt('Done');
-            my $checkedoff = ' checked="checked"';
-            if ($currval =~ /^(?:\d+)_done$/) {
-                $checkedon = ' checked="checked"';
-            } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
-                $currdonetext = $1;
-                $checkedon = ' checked="checked"';
-            } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
-                $currproctorkey = $1;
-                $checkedproc = ' checked="checked"';
-                $currprocdisplay = 'text';
-            } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
-                $currdonetext = $1;
-                $currproctorkey = $2;
-                $checkedproc = ' checked="checked"';
-                $currprocdisplay = 'text';
-            } elsif ($currval ne '') {
-                $checkedoff = ' checked="checked"';
-            } else {
-                $currdonetext = '';
-            }
-            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.'" />';
-    }
-    return $result;
-
-}
-
 sub get_date_interval_from_form {
     my ($key) = @_;
     my $seconds = 0;
-    my $numnotnull = 0;
     foreach my $which (['days', 86400],
                ['hours', 3600],
                ['minutes', 60],
                ['seconds',  1]) {
     my ($name, $factor) = @{ $which };
     if (defined($env{'form.'.$name.'_'.$key})) {
-        unless ($env{'form.'.$name.'_'.$key} eq '') {
-            $numnotnull ++;
-            $seconds += $env{'form.'.$name.'_'.$key} * $factor;
-        }
+        $seconds += $env{'form.'.$name.'_'.$key} * $factor;
     }
     }
-    if (($key =~ /\.interval$/) &&
-            (($env{'form.done_'.$key} eq '_done') || ($env{'form.done_'.$key} eq '_done_proctor'))) {
-        if ($env{'form.done_'.$key.'_buttontext'}) {
-            $env{'form.done_'.$key.'_buttontext'} =~ s/\://g;
-            $seconds .= '_done:'.$env{'form.done_'.$key.'_buttontext'}.':';
-            if ($env{'form.done_'.$key} eq '_done_proctor') {
-                $seconds .= '_proctor';
-            }
-        } else {
-            $seconds .= $env{'form.done_'.$key};
-        }
-        if (($env{'form.done_'.$key} eq '_done_proctor') &&
-                ($env{'form.done_'.$key.'_proctorkey'})) {
-            $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
-        }
+    if (($key =~ /\.interval$/) && ($env{'form.done_'.$key} eq '_done')) {
+        $seconds .= $env{'form.done_'.$key};
     }
-    return if (!$numnotnull);
     return $seconds;
 }
 
@@ -4042,7 +3541,7 @@ sub string_ip_selector {
         @{$access{'deny'}} = ('');
     }
     my ($disabled,$addmore);
-    if ($readonly) {
+    if ($disabled) {
         $disabled=' disabled="disabled"';
     } else {
         $addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
@@ -4058,7 +3557,7 @@ sub string_ip_selector {
         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 .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>'; 
             }
             $output .= '</div>'."\n";
             $num ++;
@@ -4074,259 +3573,7 @@ sub string_ip_selector {
     return $output;
 }
 
-sub string_deeplink_selector {
-    my ($thiskey, $showval, $readonly) = @_;
-    my (@tables,%values,@current,%titles,%options,%optiontext,%defaults,
-        %selectnull,%domlti,%crslti,@possmenus,%components);
-    @tables = ('upper','lower');
-    %components = (
-                    upper => ['state','others','listing','scope'],
-                    lower => ['protect','menus','target','exit'],
-                  );
-    %titles = &Apache::lonlocal::texthash (
-                  state   => 'Access status',
-                  others  => 'Hide other resources',
-                  listing => 'In Contents and/or Gradebook',
-                  scope   => 'Access scope for link',
-                  protect => 'Link protection',
-                  menus   => 'Menu Items Displayed',
-                  target  => 'Embedded?',
-                  exit    => 'Exit Tool Button?',
-              );
-    %options = (
-                   state   => ['only','off','both'],
-                   others  => ['hide','unhide'],
-                   listing => ['full','absent','grades','details','datestatus'],
-                   scope   => ['res','map','rec'],
-                   protect => ['none','key','ltid','ltic'],
-                   menus   => ['std','colls'],
-                   target  => ['_self','_top'],
-                   exit    => ['no','yes','url'],
-               );
-    %optiontext = &Apache::lonlocal::texthash (
-                    only       => 'deep only',
-                    off        => 'deeplink off',
-                    both       => 'regular + deep',
-                    hide       => 'Hidden',
-                    unhide     => 'Unhidden',
-                    full       => 'Listed (linked) in both',
-                    absent     => 'Not listed',
-                    grades     => 'Listed in grades only',
-                    details    => 'Listed (unlinked) in both',
-                    datestatus => 'Listed (unlinked) inc. status in both',
-                    res        => 'resource only',
-                    map        => 'enclosing map/folder',
-                    rec        => 'recursive map/folder',
-                    none       => 'not in use',
-                    key        => 'key access',
-                    ltic       => 'LTI access (course)',
-                    ltid       => 'LTI access (domain)' ,
-                    std        => 'Standard (all menus)',
-                    colls      => 'Numbered collection',
-                    _self      => 'Embedded',
-                    _top       => 'Not embedded',
-                    no         => 'Not in use',
-                    yes        => 'In use, no URL redirect',
-                    url        => 'In use, redirect to URL',
-                  );
-    %selectnull = &Apache::lonlocal::texthash (
-                    ltic => 'Select Launcher',
-                    ltid => 'Select Launcher',
-                    colls => 'Select',
-                  );
-    if ($showval =~ /,/) {
-        %values=();
-        @current = split(/,/,$showval);
-        ($values{'state'}) = ($current[0] =~ /^(only|off|both)$/);
-        ($values{'others'}) = ($current[1] =~ /^(hide|unhide)$/);
-        ($values{'listing'}) = ($current[2] =~ /^(full|absent|grades|details|datestatus)$/);
-        ($values{'scope'}) = ($current[3] =~ /^(res|map|rec)$/);
-        ($values{'protect'}) = ($current[4] =~ /^(key:[a-zA-Z\d_.!\@#\$%^&*()+=-]+|ltic:\d+|ltid:\d+)$/);
-        ($values{'menus'}) = ($current[5] =~ /^(\d+)$/);
-        ($values{'target'}) = ($current[6] =~ /^(_self|_top)$/);
-        ($values{'exit'}) = ($current[7] =~ /^((?:(?:yes|url)(?:|\:[^:;"',]+))|no)$/);
-    } else {
-        $defaults{'state'} = 'off',
-        $defaults{'others'} = 'unhide',
-        $defaults{'listing'} = 'full';
-        $defaults{'scope'} = 'res';
-        $defaults{'protect'} = 'none';
-        $defaults{'menus'} = '0';
-        $defaults{'target'} = '_top';
-        $defaults{'exit'} = 'yes';
-    }
-    my $disabled;
-    if ($readonly) {
-        $disabled=' disabled="disabled"';
-    }
-    my %courselti =
-        &Apache::lonnet::get_course_lti($env{'course.'.$env{'request.course.id'}.'.num'},
-                                        $env{'course.'.$env{'request.course.id'}.'.domain'});
-    foreach my $item (keys(%courselti)) {
-        if (ref($courselti{$item}) eq 'HASH') {
-            $crslti{$item} = $courselti{$item}{'name'};
-        }
-    }
-    my %lti =
-        &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                        'linkprot');
-    foreach my $item (keys(%lti)) {
-        if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
-            $domlti{$item} = $lti{$item}{'name'};
-        }
-    }
-    if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
-        foreach my $item (split(/;/,$env{'course.'.$env{'request.course.id'}.'.menucollections'})) {
-            my ($num,$value) = split(/\%/,$item);
-            if ($num =~ /^\d+$/) {
-                push(@possmenus,$num);
-            }
-        }
-    }
-
-    my $output = '<input type="hidden" name="set_'.$thiskey.'" />';
-    foreach my $table ('upper','lower') {
-        next unless (ref($components{$table}) eq 'ARRAY');
-        $output .= '<table width="100%"><tr>';
-        foreach my $item (@{$components{$table}}) {
-            $output .= '<th>'.$titles{$item}.'</th>';
-        }
-        $output .= '</tr><tr>';
-        foreach my $item (@{$components{$table}}) {
-            $output .= '<td>';
-            if (($item eq 'protect') || ($item eq 'menus') || ($item eq 'exit')) {
-                my $selected = $values{$item};
-                foreach my $option (@{$options{$item}}) {
-                    if ($item eq 'protect') {
-                        if ($option eq 'ltid') {
-                            next unless (keys(%domlti));
-                        } elsif ($option eq 'ltic') {
-                            next unless (keys(%crslti));
-                        }
-                    } elsif (($item eq 'menus') && ($option eq 'colls')) {
-                        next unless (@possmenus);
-                    }
-                    my $checked;
-                    if ($item eq 'menus') {
-                        if (($selected =~ /^\d+$/) && (@possmenus) &&
-                            (grep(/^\Q$selected\E$/,@possmenus))) {
-                            if ($option eq 'colls') {
-                                $checked = ' checked="checked"';
-                            }
-                        } elsif (($option eq 'std') && ($selected == 0) && ($selected ne '')) {
-                            $checked = ' checked="checked"';
-                        }
-                    } elsif ($selected =~ /^\Q$option\E/) {
-                        $checked = ' checked="checked"';
-                    }
-                    my $onclick;
-                    unless ($readonly) {
-                        my $esc_key = &js_escape($thiskey);
-                        $onclick = ' onclick="toggleDeepLink(this.form,'."'$item','$esc_key'".');"';
-                    }
-                    $output .= '<span class="LC_nobreak"><label>'.
-                               '<input type="radio" name="deeplink_'.$item.'_'.$thiskey.'" value="'.$option.'"'.$onclick.$disabled.$checked.' />'."\n".
-                               $optiontext{$option}.'</label>';
-                    if (($item eq 'protect') && ($option eq 'key')) {
-                        my $visibility="hidden";
-                        my $currkey;
-                        if ($checked) {
-                            $visibility = "text";
-                            $currkey = (split(/\:/,$values{$item}))[1];
-                        }
-                        $output .= '&nbsp;'.
-                                   '<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="10"'.$disabled.' />';
-                    } elsif (($option eq 'ltic') || ($option eq 'ltid') || ($option eq 'colls')) {
-                        my $display="none";
-                        my ($current,$blankcheck,@possibles);
-                        if ($checked) {
-                            $display = 'inline-block';
-                            if (($option eq 'ltic') || ($option eq 'ltid'))  {
-                                $current = (split(/\:/,$selected))[1];
-                            } else {
-                                $current = $selected;
-                            }
-                        } else {
-                            $blankcheck = ' selected="selected"';
-                        }
-                        if ($option eq 'ltid') {
-                            @possibles = keys(%domlti);
-                        } elsif ($option eq 'ltic') {
-                            @possibles = keys(%crslti);
-                        } else {
-                            @possibles = @possmenus;
-                        }
-                        $output .= '<div id="deeplinkdiv_'.$option.'_'.$item.'_'.$thiskey.'"'.
-                                   ' style="display: '.$display.'">&nbsp;<select name="'.
-                                   'deeplink_'.$option.'_'.$thiskey.'"'.$disabled.'>';
-                        if (@possibles > 1) {
-                            $output .= '<option value=""'.$blankcheck.'>'.$selectnull{$option}.
-                                       '</option>'."\n";
-                        }
-                        foreach my $poss (sort { $a <=> $b } @possibles) {
-                            my $selected;
-                            if (($poss == $current) || (scalar(@possibles) ==1)) {
-                                $selected = ' selected="selected"';
-                            }
-                            my $shown = $poss;
-                            if ($option eq 'ltid') {
-                                $shown = $domlti{$poss};
-                            } elsif ($option eq 'ltic') {
-                                $shown = $crslti{$poss};
-                            }
-                            $output .= '<option value="'.$poss.'"'.$selected.'>'.$shown.'</option>';
-                        }
-                        $output .= '</select></div>';
-                    }
-                    $output .= '</span> ';
-                }
-                if ($item eq 'exit') {
-                    my $exitsty = 'none';
-                    my $displayval;
-                    if ($values{$item} =~ /^(yes|url)/) {
-                        $exitsty = 'inline-block';
-                        my $currval = (split(/\:/,$values{$item}))[1];
-                        if ($currval eq '') {
-                            $displayval = 'Exit Tool';
-                        } else {
-                            $displayval = $currval;
-                        }
-                    }
-                    $output .= '<div id="deeplinkdiv_'.$item.'_'.$thiskey.'"'.
-                               ' style="display: '.$exitsty.'"><br />'.&mt('Button text').': '.
-                               '<input type="text" name="deeplink_exittext_'.$thiskey.'"'.
-                               ' id="deeplink_exittext_'.$thiskey.'" value="'.$displayval.'"'.
-                               ' size="10"'.$disabled.' /></div>';
-                }
-            } else {
-                my $selected = $values{$item};
-                my $defsel;
-                if ($selected eq '') {
-                    $defsel = ' selected="selected"';
-                }
-                $output .= '<select name="deeplink_'.$item.'_'.$thiskey.'"'.$disabled.'>'."\n".
-                           '<option value=""'.$defsel.'>'.&mt('Please select').'</option>'."\n";
-                foreach my $option (@{$options{$item}}) {
-                    $output .= '<option value="'.$option.'"';
-                    if ($option eq $selected) {
-                        $output .= ' selected="selected"';
-                    }
-                    $output .= '>'.$optiontext{$option}.'</option>';
-                }
-                $output .= '</select>';
-            }
-            $output .= '</td>';
-        }
-        $output .= '</tr></table>'."\n";
-        if ($table eq 'upper') {
-            $output .= '<br />';
-        }
-    }
-    return $output;
-}
-
 {
-
 my %strings =
     (
      'string_yesno'
@@ -4341,7 +3588,7 @@ my %strings =
              => [[ 'problem', 'Standard Problem'],
                  [ 'survey', 'Survey'],
                  [ 'anonsurveycred', 'Anonymous Survey (credit for submission)'],
-                 [ 'exam', 'Exam'],
+                 [ 'exam', 'Bubblesheet Exam'],
                  [ 'anonsurvey', 'Anonymous Survey'],
                  [ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],
                  [ 'practice', 'Practice'],
@@ -4349,24 +3596,23 @@ my %strings =
      'string_lenient'
              => [['yes', 'Yes' ],
                  [ 'no', 'No' ],
-                 [ 'default', 'Default - only bubblesheet grading is lenient' ]],
+                 [ 'default', 'Default - only bubblesheet grading is lenient' ],
+                 [ 'weighted', 'Yes, weighted (optionresponse in checkbox mode)' ]],
      'string_discussvote'
              => [['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']],
-     'string_deeplink'
-             => [['on','Set choices for link protection, resource listing, access scope, shown menu items, embedding, and exit link']],
+                 ['_denyfrom_',], 'Hostname(s) or IP(s) from which access is disallowed'], 
      );
 
 my %stringmatches = (
+         'string_lenient'
+              => [['weighted','^\-?[.\d]+,\-?[.\d]+,\-?[.\d]+,\-?[.\d]+$'],],
          'string_ip'
               => [['_allowfrom_','[^\!]+'],
                   ['_denyfrom_','\!']],
-         'string_deeplink'
-              => [['on','^(only|off|both)\,(hide|unhide)\,(full|absent|grades|details|datestatus)\,(res|map|rec)\,(none|key\:\w+|ltic\:\d+|ltid\:\d+)\,(\d+|)\,_(self|top),(yes|url|no)(|:[^:;\'",]+)$']],
     );
 
 my %stringtypes = (
@@ -4376,7 +3622,6 @@ my %stringtypes = (
                     discussvote  => 'string_discussvote',
                     examcode     => 'string_examcode',
                     acc          => 'string_ip',
-                    deeplink     => 'string_deeplink',
                   );
 
 sub standard_string_options {
@@ -4395,43 +3640,66 @@ sub standard_string_matches {
     return;
 }
 
+sub get_stringtype {
+    my ($name) = @_;
+    if (exists($stringtypes{$name})) {
+        return $stringtypes{$name};
+    }
+    return;
+}
+
 sub string_selector {
     my ($thistype, $thiskey, $showval, $name, $readonly) = @_;
 
     if (!exists($strings{$thistype})) {
-    return &default_selector($thiskey,$showval,$readonly);
+        return &default_selector($thiskey,$showval,$readonly);
     }
 
     my %skiptype;
     if (($thistype eq 'string_questiontype') || 
         ($thistype eq 'string_lenient') ||
         ($thistype eq 'string_discussvote') ||
+        ($thistype eq 'string_ip') ||
         ($name eq 'retrypartial')) {
         my ($got_chostname,$chostname,$cmajor,$cminor); 
         foreach my $possibilities (@{ $strings{$thistype} }) {
             next unless (ref($possibilities) eq 'ARRAY');
             my ($parmval, $description) = @{ $possibilities };
-            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval"};
+            my $parmmatch;
+            if (ref($stringmatches{$thistype}) eq 'ARRAY') {
+                foreach my $item (@{$stringmatches{$thistype}}) {
+                    if (ref($item) eq 'ARRAY') {
+                        if ($parmval eq $item->[0]) {
+                            $parmmatch = $parmval;
+                            $parmval = '';
+                            last;
+                        }
+                    }
+                }
+            }
+            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval:$parmmatch"}; 
             if ($needsrelease) {
                 unless ($got_chostname) {
                     ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                     $got_chostname = 1;
                 }
-                my $needsnewer=&parameter_releasecheck($name,$parmval,$needsrelease,
-                                                       $cmajor,$cminor);
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
+                                                       $needsrelease,$cmajor,$cminor);
                 if ($needsnewer) {
-                    $skiptype{$parmval} = 1;
+                    if ($parmmatch ne '') {
+                        $skiptype{$parmmatch} = 1;
+                    } elsif ($parmval ne '') {
+                        $skiptype{$parmval} = 1;
+                    }
                 }
             }
         }
     }
 
     if ($thistype eq 'string_ip') {
-        return &string_ip_selector($thiskey,$showval,$readonly);
-    } elsif ($thistype eq 'string_deeplink') {
-        return &string_deeplink_selector($thiskey,$showval,$readonly);
+        return &string_ip_selector($thiskey,$showval,$readonly); 
     }
- 
+
     my ($result,$disabled);
 
     if ($readonly) {
@@ -4451,7 +3719,7 @@ sub string_selector {
         foreach my $possibilities (@{ $strings{$thistype} }) {
             next unless (ref($possibilities) eq 'ARRAY');
             my ($name, $description) = @{ $possibilities };
-            next if ($skiptype{$name}); 
+            next if ($skiptype{$name});
             $rem = $i%($numinrow);
             if ($rem == 0) {
                 if ($i > 0) {
@@ -4459,24 +3727,66 @@ sub string_selector {
                 }
                 $result .= '<tr>';
             }
-            $result .= '<td class="LC_left_item">'.
+            my $colspan;
+            if ($i == @{ $strings{$thistype} }-1) {
+                $rem = @{ $strings{$thistype} }%($numinrow);
+                if ($rem) {
+                    my $colsleft = $numinrow - $rem;
+                    if ($colsleft) {
+                        $colspan = $colsleft+1;
+                        $colspan = ' colspan="'.$colspan.'"';
+                    }
+                }
+            }
+            my ($add,$onchange,$css_class);
+            if ($thistype eq 'string_lenient') {
+                if ($name eq 'weighted') {
+                    my $display;
+                    my %relatives = &Apache::lonlocal::texthash(
+                                        corrchkd     => 'Correct (checked)',
+                                        corrunchkd   => 'Correct (unchecked)',
+                                        incorrchkd   => 'Incorrect (checked)',
+                                        incorrunchkd => 'Incorrect (unchecked)',
+                    );
+                    my %textval = (
+                                    corrchkd     => '1.0',
+                                    corrunchkd   => '1.0',
+                                    incorrchkd   => '0.0',
+                                    incorrunchkd => '0.0',
+                    );
+                    if ($showval =~ /^([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)$/) {
+                        $textval{'corrchkd'} = $1;
+                        $textval{'corrunchkd'} = $2;
+                        $textval{'incorrchkd'} = $3;
+                        $textval{'incorrunchkd'} = $4;
+                        $display = 'inline';
+                        $showval = $name;
+                    } else {
+                        $display = 'none';
+                    }
+                    $add = ' <div id="LC_parmtext_'.$thiskey.'" style="display:'.$display.'"><table>'.
+                           '<tr><th colspan="2">'.&mt("Foil's submission status").'</th><th>'.&mt('Points').'</th></tr>';  
+                    foreach my $reltype ('corrchkd','corrunchkd','incorrchkd','incorrunchkd') {
+                        $add .= '<tr><td>&nbsp;</td><td>'.$relatives{$reltype}.'</td>'."\n".
+                                '<td><input type="text" name="settext_'.$thiskey.'"'.
+                                ' value="'.$textval{$reltype}.'" size="3"'.$disabled.' />'.
+                                '</td></tr>';
+                    }
+                    $add .= '</table></div>'."\n";
+                }
+                $onchange = ' onclick="javascript:toggleParmTextbox(this.form,'."'$thiskey'".');"';
+                $css_class = ' class="LC_lenient_radio"';
+            }
+            $result .= '<td class="LC_left_item"'.$colspan.'>'.
                        '<span class="LC_nobreak"><label>'.
                        '<input type="radio" name="set_'.$thiskey.
-                       '" value="'.$name.'"'.$disabled;
+                       '" value="'.$name.'"'.$onchange.$css_class.$disabled;
             if ($showval eq $name) {
                 $result .= ' checked="checked"';
             }
-            $result .= ' />'.&mt($description).'</label></span></td>';
+            $result .= ' />'.&mt($description).'</label>'.$add.'</span></td>';
             $i++;
         }
-        $rem = @{ $strings{$thistype} }%($numinrow);
-        my $colsleft = $numinrow - $rem;
-        if ($colsleft > 1 ) {
-            $result .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
-                       '&nbsp;</td>';
-        } elsif ($colsleft == 1) {
-            $result .= '<td class="LC_left_item">&nbsp;</td>';
-        }
         $result .= '</tr>';
     }
     if ($result) {
@@ -4485,24 +3795,148 @@ sub string_selector {
     return $result;
 }
 
+my %intervals =
+    (
+     'date_interval'
+             => [[ 'done', 'Yes' ],
+                 [ '', 'No' ]],
+    );
+
+my %intervalmatches = (
+         'date_interval'
+              => [['done','\d+_done$'],],
+    );
+
+my %intervaltypes = (
+                      interval => 'date_interval',
+    );
+
+sub standard_interval_matches {
+    my ($interval_type) = @_;
+    if (ref($intervalmatches{$interval_type}) eq 'ARRAY') {
+        return $intervalmatches{$interval_type};
+    }
+    return;
+}
+
+sub get_intervaltype {
+    my ($name) = @_;
+    if (exists($intervaltypes{$name})) {
+        return $intervaltypes{$name};
+    }
+    return;
+}
+
+sub standard_interval_options {
+    my ($interval_type) = @_;
+    if (ref($intervals{$interval_type}) eq 'ARRAY') {
+        return $intervals{$interval_type};
+    }
+    return;
+}
+
+sub date_interval_selector {
+    my ($thiskey, $name, $showval, $readonly) = @_;
+    my ($result,%skipval);
+    if ($name eq 'interval') {
+        my $intervaltype = &get_intervaltype($name);
+        my ($got_chostname,$chostname,$cmajor,$cminor);
+        foreach my $possibilities (@{ $intervals{$intervaltype} }) {
+            next unless (ref($possibilities) eq 'ARRAY');
+            my ($parmval, $description) = @{ $possibilities };
+            my $parmmatch;
+            if (ref($intervalmatches{$intervaltype}) eq 'ARRAY') {
+                foreach my $item (@{$intervalmatches{$intervaltype}}) {
+                    if (ref($item) eq 'ARRAY') {
+                        if ($parmval eq $item->[0]) {
+                            $parmmatch = $parmval;
+                            $parmval = '';
+                            last;
+                        }
+                    }
+                }
+            }
+            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval:$parmmatch"};
+            if ($needsrelease) {
+                unless ($got_chostname) {
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                    $got_chostname = 1;
+                }
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
+                                                       $needsrelease,$cmajor,$cminor);
+                if ($needsnewer) {
+                    if ($parmmatch ne '') {
+                        $skipval{$parmmatch} = 1;
+                    } elsif ($parmval ne '') {
+                        $skipval{$parmval} = 1;
+                    }
+                }
+            }
+        }
+    }
+
+    my $currval = $showval;
+    foreach my $which (['days', 86400, 31],
+               ['hours', 3600, 23],
+               ['minutes', 60, 59],
+               ['seconds',  1, 59]) {
+    my ($name, $factor, $max) = @{ $which };
+    my $amount = int($showval/$factor);
+    $showval  %= $factor;
+    my %select = ((map {$_ => $_} (0..$max)),
+              'select_form_order' => [0..$max]);
+    $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
+                           \%select,'',$readonly);
+    $result .= ' '.&mt($name);
+    }
+    if ($name eq 'interval') {
+        unless ($skipval{'done'}) {
+            my $checkedon = '';
+            my $checkedoff = ' checked="checked"';
+            if ($currval =~ /^(\d+)_done$/) {
+                $checkedon = ' checked="checked"';
+                $checkedoff = '';
+            }
+            $result .= '<span class="LC_nobreak">'.('&nbsp;' x 3).'('.&mt('Include "done" button').
+                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.' />'.
+                       &mt('Yes').'</label>'.
+                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.' />'.
+                       &mt('No').'</label>)</span>';
+        }
+    }
+    unless ($readonly) {
+        $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+    }
+    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})) {
+    my $stringtype = &get_stringtype($name);
+    if ($stringtype ne '') {
         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) {
+                my $parmmatch;
+                if (ref($stringmatches{$stringtypes{$name}}) eq 'ARRAY') {
+                    foreach my $item (@{$stringmatches{$stringtypes{$name}}}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($parmval eq $regexpname) {
+                                if ($value =~ /$pattern/) {
+                                    $desc = $description; 
+                                    $parmmatch = 1;
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                    last if ($parmmatch);
+                } elsif ($parmval eq $value) {
                     $desc = $description;
                     last;
                 }
@@ -4539,25 +3973,12 @@ sub oldversion_warning {
 #
 
 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) {
+    foreach my $key (keys(%data)) {
         if ($key=~/\wtype$/) {
             my $newkey=$key;
             $newkey=~s/type$/\.type/;
@@ -4567,13 +3988,9 @@ sub dateshift {
     }
     my %storecontent=();
 # go through all parameters and look for dates
-    foreach my $key (keys %data) {
+    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;
        }
     }
@@ -4587,19 +4004,16 @@ 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);
-    }
+    my $crstype =  $env{'course.'.$env{'request.course.id'}.'.type'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
         text=>"Overview Mode"});
 
     my %loaditems = (
-                      'onload'   => "showHide_courseContent(); resize_scrollbox('mapmenuscroll','1','1');",
+                      'onload'   => "showHide_courseContent(); resize_scrollbox('mapmenuscroll','1','1'); showHideLenient();",
                     );
     my $js = '
 <script type="text/javascript">
@@ -4607,17 +4021,18 @@ sub newoverview {
 '.
             &Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
             &showhide_js()."\n".
+            &toggleparmtextbox_js()."\n".
             &validateparms_js()."\n".
             &ipacc_boxes_js()."\n".
-            &done_proctor_js()."\n".
-            &deeplink_js()."\n".
 '// ]]>
 </script>
 ';
+
     my $start_page = &Apache::loncommon::start_page('Set Parameters',$js,
                                                     {'add_entries' => \%loaditems,});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDOVER);
 <form method="post" action="/adm/parmset?action=newoverview" name="parmform" onsubmit="return validateParms();">
 ENDOVER
@@ -4646,7 +4061,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');
@@ -4685,8 +4100,10 @@ ENDOVER
     $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
     &levelmenu($r,\%alllevs,$parmlev);
-    $r->print(&Apache::lonhtmlcommon::row_closure());
-    &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp,$parmlev);
+    if ($parmlev ne 'general') {
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+        &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp);
+    }
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
@@ -4709,7 +4126,7 @@ ENDOVER
     $r->print('</tr><tr><td>');
     &partmenu($r,\%allparts,\@psprt);
     $r->print('</td>');
-    if ($sectionselector) {
+    if ($sectionselector) { 
         $r->print('<td>'.$sectionselector.'</td>');
     }
     if ($groupselector) {
@@ -4749,13 +4166,12 @@ ENDOVER
 
 # List data
 
-        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly,$parmlev);
-    }
-    $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,'newoverview');
     }
-    $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());
 }
 
@@ -4774,7 +4190,7 @@ sub secgroup_lister {
                 $$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
             } elsif ($parmlev eq 'map') {
 # map-level parameter
-                foreach my $mapid (keys %{$allmaps}) {
+                foreach my $mapid (keys(%{$allmaps})) {
                     if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
                     my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
                     $$listdata{$newparmkey}=1;
@@ -4795,33 +4211,32 @@ 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".
+             &toggleparmtextbox_js()."\n".
              &validateparms_js()."\n".
              &ipacc_boxes_js()."\n".
-             &deeplink_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 %loaditems = (
+                      'onload'   => "showHideLenient();",
+                    );
+
+    my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js,{'add_entries' => \%loaditems,});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform" onsubmit="return validateParms();">');
 
 # Store modified
-    unless ($readonly) {
-        &storedata($r,$crs,$dom);
-    }
+
+    &storedata($r,$crs,$dom);
 
 # Read modified data
 
@@ -4832,26 +4247,12 @@ sub overview {
     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);
-
-    $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());
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder,'overview',$classlist);
+    $r->print(&tableend().'<p>'.
+    ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':'<span class="LC_info">'.&mt('There are no parameters.').'</span>').'</p></form>'.
+          &Apache::loncommon::end_page());
 }
 
 sub clean_parameters {
@@ -4913,8 +4314,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') {
@@ -4925,8 +4328,8 @@ ENDOVER
         my ($map,$resid,$url) =
             &Apache::lonnet::decode_symb($data{'realm'});
         $r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',
-                  $url.' <br />&nbsp;&nbsp;&nbsp;',
-                  $resid.' <br />&nbsp;&nbsp;&nbsp;',$map));
+                      $url.' <br />&nbsp;&nbsp;&nbsp;',
+                      $resid.' <br />&nbsp;&nbsp;&nbsp;',$map));
         }
         $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
         $r->print('</td></tr>');
@@ -4936,6 +4339,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());
 }
 
@@ -4943,24 +4347,14 @@ sub date_shift_one {
     my ($r) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $sec = $env{'request.course.sec'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
-    my $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);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print('<form name="shiftform" method="post" action="">'.
               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
@@ -4972,7 +4366,8 @@ sub date_shift_one {
               '</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());
 }
 
@@ -4980,57 +4375,26 @@ 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'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
-    $r->print('<h2>'.&mt('Shift Dates').'</h2>');
-    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('<h2>'.&mt('Shift Dates').'</h2>'.
+              '<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
+              &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+              &Apache::lonlocal::locallocaltime($timeshifted)).'</p>');
     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));
-    }
+    &dateshift($delta);
     $r->print(
+        &Apache::lonhtmlcommon::confirm_success(&mt('Done')).
         '<br /><br />'.
         &Apache::lonhtmlcommon::actionbox(
             ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -5046,7 +4410,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/^\[(.*)\]//;
     }
@@ -5074,7 +4439,7 @@ sub parse_key {
 
 
 sub header {
-    return &Apache::loncommon::start_page('Content and Problem Settings');
+    return &Apache::loncommon::start_page('Settings');
 }
 
 
@@ -5087,6 +4452,7 @@ sub print_main_menu {
     my $crstype = &Apache::loncommon::course_type();
     my $lc_crstype = lc($crstype);
 
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -5097,73 +4463,35 @@ 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 @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'  ,
             }]},
@@ -5171,43 +4499,45 @@ 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());
+    $r->print('</form>');
+    &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -5275,6 +4605,7 @@ sub order_meta_fields {
     my $idx = 1;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};;
     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
         text=>"Add Metadata Field"});
@@ -5283,11 +4614,12 @@ sub order_meta_fields {
               text=>"Restrict Metadata"},
              {text=>"Order Metadata"});
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+    &startSettingsScreen($r,'parmset',$crstype);
     if ($env{'form.storeorder'}) {
         my $newpos = $env{'form.newpos'} - 1;
         my $currentpos = $env{'form.currentpos'} - 1;
         my @neworder = ();
-        my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+        my @oldorder = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
         my $i;
         if ($newpos > $currentpos) {
         # moving stuff up
@@ -5321,10 +4653,10 @@ sub order_meta_fields {
     }
     my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $ordered_fields;
-    my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+    my @fields_in_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
     if (!@fields_in_order) {
         # no order found, pick sorted order then create metadata.addedorder key.
-        foreach my $key (sort keys %$fields) {
+        foreach my $key (sort(keys(%$fields))) {
             push @fields_in_order, $key;
             $ordered_fields = join ",", @fields_in_order;
         }
@@ -5352,6 +4684,7 @@ sub order_meta_fields {
         $idx ++;
     }
     $r->print('</table>');
+    &endSettingsScreen($r);
     return 'ok';
 }
 
@@ -5360,7 +4693,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);
 }
 
@@ -5373,6 +4706,8 @@ sub addmetafield {
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    &startSettingsScreen($r,'parmset',$crstype);
     if (exists($env{'form.undelete'})) {
         my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
         foreach my $meta_field(@meta_fields) {
@@ -5382,10 +4717,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'})) {
@@ -5397,17 +4729,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 /');
@@ -5415,14 +4742,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);
 }
 
 
@@ -5439,13 +4764,10 @@ sub setrestrictmeta {
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    &startSettingsScreen($r,'parmset',$crstype);
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
     my $save_field = '';
-    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.(.+)_(.+)$/) {
@@ -5484,25 +4806,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);
@@ -5511,6 +4836,7 @@ ENDButtons
         $buttons
         </form>
 ENDenv
+    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
 }
@@ -5551,14 +4877,16 @@ sub defaultsetter {
 
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
         text=>"Set Defaults"});
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
     my $start_page =
-    &Apache::loncommon::start_page('Parameter Setting Default Actions');
+        &Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
     $r->print($start_page.$breadcrumbs);
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');
 
-    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my @ids=();
     my %typep=();
     my %keyp=();
@@ -5609,11 +4937,11 @@ sub defaultsetter {
         }
         }
     }
-    foreach my $key (keys %allparms) {
+    foreach my $key (keys(%allparms)) {
         $newrules{$key.'_triggers'}=$triggers{$key};
     }
-    &Apache::lonnet::put('parmdefactions',\%newrules,$dom,$crs);
-    &Apache::lonnet::del('parmdefactions',\@delrules,$dom,$crs);
+    &Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
+    &Apache::lonnet::del('parmdefactions',\@delrules,$cdom,$cnum);
     &resetrulescache();
     }
     my %lt=&Apache::lonlocal::texthash('days' => 'Days',
@@ -5701,6 +5029,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;
 }
@@ -5747,7 +5076,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);
@@ -5762,7 +5091,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 {
@@ -5789,7 +5117,10 @@ sub standard_parameter_types {
 }
 
 sub parm_change_log {
-    my ($r,$parm_permission)=@_;
+    my ($r)=@_;
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
     text=>"Parameter Change Log"});
     my $js = '<script type="text/javascript">'."\n".
@@ -5799,9 +5130,8 @@ sub parm_change_log {
              '</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
-    my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
-                      $env{'course.'.$env{'request.course.id'}.'.domain'},
-                      $env{'course.'.$env{'request.course.id'}.'.num'});
+    &startSettingsScreen($r,'parmset',$crstype);
+    my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',$cdom,$cnum);
 
     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
 
@@ -5818,19 +5148,12 @@ 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'});
+
+    my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
           '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
-          &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th>');
-    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') {
@@ -5842,12 +5165,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'}) {
@@ -5869,8 +5186,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'),
@@ -5888,11 +5204,10 @@ sub parm_change_log {
             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))))));
+            next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
             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'}));
+                next if (($stusection ne '-1') && ($stusection ne $env{'request.course.sec'})); 
             }
         }
         if ($env{'form.displayfilter'} eq 'currentfolder') {
@@ -5948,31 +5263,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.':'.
@@ -5992,6 +5303,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());
 }
 
@@ -6040,10 +5352,10 @@ sub update_slots {
                           context => 'parameter',
                         );
         &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
-                                        '',$uname,$udom,$cnum,$cdom);
+                                   '',$uname,$udom,$cnum,$cdom);
 
         &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                        '',$uname,$udom,$uname,$udom);
+                                   '',$uname,$udom,$uname,$udom);
     }
     return $success;
 }
@@ -6074,9 +5386,9 @@ sub delete_slots {
                                   context => 'parameter',
                                 );
                 &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
-                                                1,$uname,$udom,$cnum,$cdom);
+                                           1,$uname,$udom,$cnum,$cdom);
                 &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                                1,$uname,$udom,$uname,$udom);
+                                           1,$uname,$udom,$uname,$udom);
             }
         }
     }
@@ -6099,58 +5411,20 @@ sub parameter_release_vars {
 }
 
 sub parameter_releasecheck {
-    my ($name,$value,$needsrelease,$cmajor,$cminor) = @_;
+    my ($name,$value,$valmatch,$needsrelease,$cmajor,$cminor) = @_;
     my $needsnewer;
     my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
     if (($cmajor < $needsmajor) || 
         ($cmajor == $needsmajor && $cminor < $needsminor)) {
         $needsnewer = 1;
-    } else {
-        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value});
+    } elsif ($valmatch) {
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch});
+    } elsif ($value) { 
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'});
     }
     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,
-                      );
-    }
-    foreach my $perm (values(%permission)) {
-        if ($perm) { $allowed=1; last; }
-    }
-    return (\%permission,$allowed);
-}
-
 sub handler {
     my $r=shift;
 
@@ -6178,41 +5452,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') {