--- loncom/interface/lonparmset.pm	2011/12/04 16:27:06	1.517
+++ loncom/interface/lonparmset.pm	2019/03/02 16:25:45	1.522.2.23.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.517 2011/12/04 16:27:06 www Exp $
+# $Id: lonparmset.pm,v 1.522.2.23.2.3 2019/03/02 16:25:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,8 +46,6 @@ This module sets coursewide and assessme
 
 =over
 
-=pod
-
 =item parmval()
 
 Figure out a cascading parameter.
@@ -139,15 +137,21 @@ javascript function 'pjump'.
 
  extractResourceInformation extracts lots of information about all of the the course's resources into a variety of hashes.
 
-Input: See list below:
+Input: See list below
+
+=over 4
 
 =item * B<env{'user.name'}> : Current username
 
 =item * B<env{'user.domain'}> : Domain of current user.
 
-=item * b<env{"request.course.fn"} : Course
+=item * B<env{"request.course.fn"}> : Course
+
+=back
 
-Outputs: See list below:
+Outputs: See list below
+
+=over 4
 
 =item * B<ids> (out) : An array that will contain all of the ids in the course.
 
@@ -173,6 +177,8 @@ Outputs: See list below:
 
 =item * B<defkeytype>
 
+=back
+
 =item isdateparm()
 
 =item parmmenu()
@@ -210,6 +216,8 @@ Returns: nothing
 
 Variables used (guessed by Jeremy):
 
+=over
+
 =item * B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
 
 =item * B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
@@ -222,6 +230,8 @@ Variables used (guessed by Jeremy):
         When storing information, store as part 0
         When requesting information, request from full part
 
+=back
+
 =item tablestart()
 
 =item tableend()
@@ -288,7 +298,6 @@ Set portfolio metadata
 
 Main handler.  Calls &assessparms subroutine.
 
-
 =back
 
 =cut
@@ -314,27 +323,6 @@ use HTML::Entities;
 use LONCAPA qw(:DEFAULT :match);
 
 
-sub startSettingsScreen {
-    my ($r,$mode)=@_;
-
-    $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
-    $r->print("\n".'<li'.($mode eq 'coursepref'?' class="active"':'').'><a href="/adm/courseprefs"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
-                                          &mt('Course Settings').
-                                          '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
-
-    $r->print("\n".'<li'.($mode eq 'parmset'?' class="active"':'').'><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;"><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,
@@ -661,7 +649,7 @@ sub storeparm_by_symb {
 }
 
 sub log_parmset {
-    return &Apache::lonnet::instructor_log('parameterlog',@_);
+    return &Apache::lonnet::write_log('course','parameterlog',@_);
 }
 
 sub storeparm_by_symb_inner {
@@ -764,18 +752,31 @@ 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') {
-    if ($editable) {
-        $result = '<span class="LC_clickhere">*</span>';
-    } else {
-        $result='&nbsp;';
-    }
+        if ($editable) {
+            $result =
+                '<img src="/res/adm/pages/editmap.png"'
+               .' alt="'.&mt('Change').'"'
+               .' title="'.&mt('Change').'" style="border:0;" />';
+        } else {
+            $result='&nbsp;';
+        }
     } else {
         if ($type eq 'date_interval') {
-            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+            my ($totalsecs,$donesuffix) = split(/_/,$value,2);
+            my ($usesdone,$donebuttontext,$proctor,$secretkey);
+            if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
+                $donebuttontext = $1;
+                (undef,$proctor,$secretkey) = split(/_/,$2);
+                $usesdone = 'done';
+            } elsif ($donesuffix =~ /^done(|_.+)$/) {
+                $donebuttontext = &mt('Done');
+                ($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix);
+            }
+            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
             my @timer;
             $year=$year-70;
             $mday--;
@@ -808,6 +809,13 @@ sub valout {
                 push(@timer,&mt('[quant,_1,sec]',0));
             }
             $result.=join(", ",@timer);
+            if ($usesdone eq 'done') {
+                if ($secretkey) {
+                    $result .= ' '.&mt('+ "[_1]" with proctor key: [_2]',$donebuttontext,$secretkey);
+                } else {
+                    $result .= ' + "'.$donebuttontext.'"';
+                }
+            }
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
         &date_sanity_info($value);
@@ -825,8 +833,12 @@ sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-    if (&isdateparm($type)) {
+        if ((&isdateparm($type)) || (&is_specialstring($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]};
         }
@@ -834,7 +846,7 @@ 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) {
@@ -855,22 +867,18 @@ sub page_js {
     return(<<ENDJS);
 <script type="text/javascript">
 // <![CDATA[
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
 
     $pjump_def
 
     function psub() {
-        pclose();
+        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') {
+            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;');
@@ -900,15 +908,125 @@ ENDJS
 
 }
 
+sub showhide_js {
+    return <<"COURSECONTENTSCRIPT";
+
+function showHide_courseContent() {
+    var parmlevValue=document.getElementById("parmlev").value;
+    if (parmlevValue == 'general') {
+        document.getElementById('mapmenu').style.display="none";
+    } else {
+        if ((parmlevValue == "full") || (parmlevValue == "map")) {
+            document.getElementById('mapmenu').style.display ="";
+        } else {
+            document.getElementById('mapmenu').style.display="none";
+        }
+    }
+    return;
+}
+
+COURSECONTENTSCRIPT
+}
+
+sub validateparms_js {
+    return <<'ENDSCRIPT';
+
+function validateParms() {
+    var ipallowRegExp = /^setipallow_/;
+    var ipdenyRegExp = /^setipdeny_/;
+    var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
+    if ((document.parmform.elements.length != 'undefined')  && (document.parmform.elements.length) != 'null') {
+        if (document.parmform.elements.length) {
+            for (i=0; i<document.parmform.elements.length; i++) {
+                var name=document.parmform.elements[i].name;
+                if (ipallowRegExp.test(name)) {
+                    var identifier = name.replace(ipallowRegExp,'');
+                    var possallow = document.parmform.elements[i].value;
+                    possallow = possallow.replace(/^\s+|\s+$/g,'');
+                    if (patternIP.test(possallow)) {
+                        if (document.parmform.elements['set_'+identifier].value) {
+                            possallow = ','+possallow;
+                        }
+                        document.parmform.elements['set_'+identifier].value += possallow;
+                    }
+                } else if (ipdenyRegExp.test(name)) {
+                    var identifier = name.replace(ipdenyRegExp,'');
+                    var possdeny = document.parmform.elements[i].value;
+                    possdeny = possdeny.replace(/^\s+|\s+$/g,'');
+                    if (patternIP.test(possdeny)) {
+                        possdeny = '!'+possdeny;
+                        if (document.parmform.elements['set_'+identifier].value) {
+                            possdeny = ','+possdeny;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+ENDSCRIPT
+}
+
+# Javascript initialization, for overview mode
+sub ipacc_boxes_js  {
+    my $remove = &mt('Remove');
+    return <<"END";
+\$(document).ready(function() {
+    var wrapper         = \$(".LC_string_ipacc_wrap");
+    var add_button      = \$(".LC_add_ipacc_button");
+    var ipaccRegExp     = /^LC_string_ipacc_/;
+
+    \$(add_button).click(function(e){
+        e.preventDefault();
+        var identifier = \$(this).closest("div").attr("id");
+        identifier = identifier.replace(ipaccRegExp,'');
+        \$(this).closest('div').find('.LC_string_ipacc_inner').append('<div><input type="text" name="setip'+identifier+'" /><a href="#" class="LC_remove_ipacc">$remove</a></div>');
+    });
+
+    \$(wrapper).delegate(".LC_remove_ipacc","click", function(e){
+        e.preventDefault(); \$(this).closest("div").remove();
+    })
+});
+
+
+END
+}
+
+sub done_proctor_js {
+    return <<"END";
+function toggleSecret(form,radio,key) {
+    var radios = form[radio+key];
+    if (radios.length) {
+        for (var i=0; i<radios.length; i++) {
+            if (radios[i].checked) {
+                if (radios[i].value == '_done_proctor') {
+                    if (document.getElementById('done_'+key+'_proctorkey')) {
+                        document.getElementById('done_'+key+'_proctorkey').type='text';
+                    }
+                } else {
+                    if (document.getElementById('done_'+key+'_proctorkey')) {
+                        document.getElementById('done_'+key+'_proctorkey').type='hidden';
+                        document.getElementById('done_'+key+'_proctorkey').value='';
+                    }
+                }
+            }
+        }
+    }
+}
+END
+
+}
+
 sub startpage {
     my ($r,$psymb) = @_;
 
     my %loaditems = (
-                      'onunload' => "pclose()",
                       'onload'   => "group_or_section('cgroup')",
                     );
     if (!$psymb) {
-        $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup')";
+        $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup'); resize_scrollbox('mapmenuscroll','1','1');";
     }
 
     if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
@@ -920,16 +1038,22 @@ sub startpage {
        text=>"Table Mode",
        help => 'Course_Setting_Parameters'});
     }
+    my $js = &page_js().'
+<script type="text/javascript">
+// <![CDATA[
+'.
+            &Apache::lonhtmlcommon::resize_scrollbox_js('params').'
+// ]]>
+</script>
+';
     my $start_page =
-    &Apache::loncommon::start_page('Set/Modify Course Parameters',
-                       &page_js(),
+    &Apache::loncommon::start_page('Set/Modify Course Parameters',$js,
                        {'add_entries' => \%loaditems,});
     my $breadcrumbs =
     &Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
     my $escfilter=&Apache::lonhtmlcommon::entity_encode($env{'form.filter'});
     my $escpart=&Apache::lonhtmlcommon::entity_encode($env{'form.part'});
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
     $r->print(<<ENDHEAD);
 <form method="post" action="/adm/parmset?action=settable" name="parmform">
 <input type="hidden" value="" name="pres_value" />
@@ -944,7 +1068,8 @@ ENDHEAD
 
 sub print_row {
     my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
-    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups)=@_;
+    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp,
+    $readonly)=@_;
     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);
@@ -983,30 +1108,30 @@ sub print_row {
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
     my $mprefix=$rid.'&'.$thismarker.'&';
-    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
+    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$thismarker);
     my ($othergrp,$grp_parm,$controlgrp);
 
     if ($parmlev eq 'general') {
 
         if ($uname) {
-            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
         } elsif ($csec) {
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
         } else {
-            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
         }
     } elsif ($parmlev eq 'map') {
 
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
         } elsif ($cgroup) {
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
         } elsif ($csec) {
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
         } else {
-            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
         }
     } else {
         if ($uname) {
@@ -1026,32 +1151,32 @@ sub print_row {
             }
         }
 
-        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
 
-    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
 
     if ($csec) {
-        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
     }
 
         if ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
         }
 
     if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
-        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
     }
 
     } # end of $parmlev if/else
@@ -1063,7 +1188,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>');
@@ -1071,19 +1196,27 @@ sub print_row {
 }
 
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly)=@_;
     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
               ';" align="center">');
     my $nolink = 0;
-    if ($which == 11 || $which == 12) {
+    if ($readonly) {
         $nolink = 1;
-    } elsif ($mprefix =~ /availablestudent\&$/) {
-        if ($which > 3) {
+    } else {
+        if ($which == 11 || $which == 12) {
             $nolink = 1;
+        } elsif ($mprefix =~ /availablestudent\&$/) {
+            if ($which > 3) {
+                $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],
@@ -1108,9 +1241,9 @@ sub print_usergroups {
     if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
-            $grp_parm = &valout($coursereply,$resulttype);
+            $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;
@@ -1234,7 +1367,7 @@ sub extractResourceInformation {
             $$mapp{$mapid}=$$mapp{$id};
             $$allmaps{$mapid}=$$mapp{$id};
             if ($mapid eq '1') {
-                $$maptitles{$mapid}=&mt('Main Course Documents');
+                $$maptitles{$mapid}=&mt('Main Content');
             } else {
                 $$maptitles{$mapid}=&Apache::lonnet::gettitle($$mapp{$id});
             }
@@ -1254,6 +1387,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
@@ -1302,8 +1443,9 @@ sub parmmenu {
     }
 
     function checkdisset() {
-    checkthis('discussend','pscat');
+     checkthis('discussend','pscat');
      checkthis('discusshide','pscat');
+     checkthis('discussvote','pscat');
     }
 
     function checkcontdates() {
@@ -1367,8 +1509,8 @@ sub lookUpTableParameter {
         'contentopen' => 'time_settings',
         'contentclose' => 'time_settings',
         'discussend' => 'time_settings',
-	'printopendate' => 'time_settings',
-	'printclosedate' => 'time_settings',
+	'printstartdate' => 'time_settings',
+	'printenddate' => 'time_settings',
         'weight' => 'grading',
         'handgrade' => 'grading',
         'maxtries' => 'tries',
@@ -1401,7 +1543,9 @@ sub lookUpTableParameter {
         'maxcollaborators' => 'misc',
         'scoreformat' => 'misc',
         'lenient' => 'grading',
-
+        'retrypartial' => 'tries',
+        'discussvote'  => 'misc',
+        'examcode' => 'high_level_randomization',
     );    
 }
 
@@ -1478,26 +1622,23 @@ sub parmboxes {
 
     #Print parameters
     for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
-        if(@{$categoryList{$key}} == 0) {
-            next;
-        } else { 
-            $r->print('<div class="LC_Box LC_400Box">'
-                     .'<h4 class="LC_hcell">'
-                     .&mt($categories{$key})
-                     .'</h4>'."\n");
-            foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
-                    $r->print('<span class="LC_nobreak">'
-                             .'<label><input type="checkbox" name="pscat" ');
-                $r->print('value="'.$tempkey.'" ');
-                if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
-                    $r->print(' checked="checked"');
-                }
-                $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
-                                                      : $tempkey)
-                        .'</label></span><br />'."\n");
+        next if(@{$categoryList{$key}} == 0);
+        $r->print('<div class="LC_Box LC_400Box">'
+                  .'<h4 class="LC_hcell">'
+                  .&mt($categories{$key})
+                  .'</h4>'."\n");
+        foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+            $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("</div>\n");
+            $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+                                                      : $tempkey)
+                     .'</label></span><br />'."\n");
         }
+        $r->print("</div>\n");
     }
 
     $r->print("</div>\n");
@@ -1539,8 +1680,12 @@ sub shortCuts {
 
 sub partmenu {
     my ($r,$allparts,$psprt)=@_;
+    my $selsize = 1+scalar(keys(%{$allparts}));
+    if ($selsize > 8) {
+        $selsize = 8;
+    }
 
-    $r->print('<select multiple="multiple" name="psprt" size="8">');
+    $r->print('<select multiple="multiple" name="psprt" size="'.$selsize.'">');
     $r->print('<option value="all"');
     $r->print(' selected="selected"') unless (@{$psprt});
     $r->print('>'.&mt('All Parts').'</option>');
@@ -1661,13 +1806,13 @@ function group_or_section(caller) {
 # This function shows on table Mode the available Parameters for the selected Resources
 #
 sub displaymenu {
-    my ($r,$allparms,$pscat,$psprt,$keyorder)=@_;
+    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,$allparms,$pscat,$keyorder);
-    $r->print(&Apache::loncommon::start_scrollbox());
+    $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
     &parmboxes($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::loncommon::end_scrollbox());
 
@@ -1741,12 +1886,12 @@ sub mapmenu {
            .'</div>'
         );
 
-        $r->print(&Apache::loncommon::start_scrollbox());
-        $r->print(&Apache::loncommon::start_data_table());
+        $r->print(&Apache::loncommon::start_scrollbox('700px','680px','400px','mapmenuscroll'));
+        $r->print(&Apache::loncommon::start_data_table(undef,'mapmenuinner'));
 
         # Display row: "All Maps or Folders"
         $r->print(
-            &Apache::loncommon::start_data_table_row()
+            &Apache::loncommon::start_data_table_row(undef,'picklevel')
            .'<td>'
            .'<label>'
            .'<input type="radio" name="pschp"'
@@ -1760,7 +1905,7 @@ sub mapmenu {
            .&Apache::loncommon::end_data_table_row()
         );
 
-        # Display row: "Main Course Documents"
+        # Display row: "Main Content"
         if (exists($$allmaps{1})) {
             $r->print(
                 &Apache::loncommon::start_data_table_row()
@@ -1821,8 +1966,9 @@ sub mapmenu {
             );
         }
 
-        $r->print(&Apache::loncommon::end_data_table());
-        $r->print(&Apache::loncommon::end_scrollbox());
+        $r->print(&Apache::loncommon::end_data_table().
+                  '<br style="line-height:2px;" />'.
+                  &Apache::loncommon::end_scrollbox());
     }
 }
 
@@ -1948,17 +2094,17 @@ sub standardkeyorder {
         'parameter_0_tol' => 16,
         'parameter_0_sig' => 17,
         'parameter_0_turnoffunit' => 18,
-            'parameter_0_discussend' => 19,
-            'parameter_0_discusshide' => 20,
-	'parameter_0_printopendate'  =>  21,
-	'parameter_0_printclosedate' =>  22);
+        'parameter_0_discussend' => 19,
+        'parameter_0_discusshide' => 20,
+        'parameter_0_discussvote' => 21,
+	'parameter_0_printstartdate'  =>  22,
+	'parameter_0_printenddate' =>  23);
 }
 
 
 sub assessparms {
 
-    my $r=shift;
-
+    my ($r,$parm_permission) = @_;
 
 
 # -------------------------------------------------------- Variable declaration
@@ -2002,6 +2148,15 @@ sub assessparms {
 
     $csec=$env{'form.csec'};
     $cgroup=$env{'form.cgroup'};
+    my $noeditgrp;
+    if ($cgroup ne '') {
+        unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+            if (($env{'request.course.groups'} eq '') ||
+                (!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {
+                $noeditgrp = 1;
+            }
+        }
+    }
 
     if      ($udom=$env{'form.udom'}) {
     } elsif ($udom=$env{'request.role.domain'}) {
@@ -2016,7 +2171,7 @@ sub assessparms {
 
 
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
-    if (!@psprt) { $psprt[0]='all'; }
+    if (!@psprt) { $psprt[0]='0'; }
     if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }
 
     my $pssymb='';
@@ -2109,7 +2264,7 @@ sub assessparms {
     $symbp{'0.0'} = '';
 
 # ---------------------------------------------------------- Anything to store?
-    if ($env{'form.pres_marker'}) {
+    if ($env{'form.pres_marker'} && $parm_permission->{'edit'}) {
         my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
         my @values=split(/\&\&\&/,$env{'form.pres_value'});
         my @types=split(/\&\&\&/,$env{'form.pres_type'});
@@ -2118,8 +2273,7 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
-
-
+        my $now = time;
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer,$name);
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
@@ -2152,18 +2306,35 @@ sub assessparms {
                         }
                     }
                 }
-            } elsif ($markers[$i] =~ /_(type|lenient)\&\d+$/) {
+            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate)\&\d+$/) {
                 $name = $1;
+                my $val = $values[$i];
+                if ($name eq 'examcode') {
+                    if (&Apache::lonnet::validCODE($values[$i])) {
+                        $val = 'valid';
+                    }
+                } elsif ($name eq 'printstartdate') {
+                    if ($val =~ /^\d+$/) {
+                        if ($val > $now) {
+                            $val = 'future';
+                        }
+                    }
+                } elsif ($name eq 'printenddate') {
+                    if ($val =~ /^\d+$/) {
+                        if ($val < $now) {
+                            $val = 'past';
+                        }
+                    }
+                }
                 $needsrelease =
-                    $Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"};
+                    $Apache::lonnet::needsrelease{"parameter:$name:$val"};
                 if ($needsrelease) {
                     unless ($got_chostname) {
                         ($chostname,$cmajor,$cminor) = &parameter_release_vars();
                         $got_chostname = 1;
                     }
-                    $needsnewer = &parameter_releasecheck($name,$values[$i],
+                    $needsnewer = &parameter_releasecheck($name,$val,
                                                           $needsrelease,
-                                                          $chostname,
                                                           $cmajor,$cminor);
                 }
             }
@@ -2194,11 +2365,14 @@ sub assessparms {
 
     &startpage($r,$pssymb);
 
-    foreach ('tolerance','date_default','date_start','date_end',
-        'date_interval','int','float','string') {
+    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') {
         $r->print('<input type="hidden" value="'.
-          &HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').
-          '" name="recent_'.$_.'" />');
+          &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
+          '" name="recent_'.$item.'" />');
     }
 
     # ----- Start Parameter Selection
@@ -2224,27 +2398,15 @@ ENDPARMSELSCRIPT
         }
 
         # Step 1
-        $r->print(&Apache::lonhtmlcommon::topic_bar(1,&mt('Resource Specification')));
-        $r->print(<<COURSECONTENTSCRIPT);
+        $r->print(&Apache::lonhtmlcommon::topic_bar(1,&mt('Resource Specification'),'parmstep1'));
+        $r->print('
 <script type="text/javascript">
-// <![CDATA[
-function showHide_courseContent(){
-        var parmlevValue=document.getElementById("parmlev").value;
-        if (parmlevValue == 'general') {
-            document.getElementById('mapmenu').style.display="none";
-        } else {
-            if ((parmlevValue == "full") || (parmlevValue == "map")) {
-                document.getElementById('mapmenu').style.display ="";
-            } else {
-                document.getElementById('mapmenu').style.display="none";
-            }
-        }        
-    }
+// <![CDATA['.
+                 &showhide_js().'
 // ]]>
 </script>
-COURSECONTENTSCRIPT
-
-        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+');
+        $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);
@@ -2255,11 +2417,11 @@ COURSECONTENTSCRIPT
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
 
         # Step 2
-        $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification')));
-        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder);
+        $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
+        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder,'parmmenuscroll');
 
         # Step 3
-        $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)')));
+        $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
         &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
@@ -2294,6 +2456,12 @@ COURSECONTENTSCRIPT
                   '<br />');
         $r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')).
+                  '<label>'.
+                  '<input type="checkbox" name="psprt" value="all"'.
+                  ($env{'form.psprt'}?' checked="checked"':'').' />'.
+                  &mt('Show all parts').
+                  '</label></td></tr>');
         &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
@@ -2323,6 +2491,10 @@ COURSECONTENTSCRIPT
         my @catmarker=map { tr|.|_|; 'parameter_'.$_; } @pscat;
         my $csuname=$env{'user.name'};
         my $csudom=$env{'user.domain'};
+        my $readonly = 1;
+        if ($parm_permission->{'edit'}) {
+            undef($readonly);
+        }
 
         if ($parmlev eq 'full') {
 #
@@ -2508,7 +2680,7 @@ ENDTABLEHEADFOUR
                             &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
                                        $defbgthree,$parmlev,$uname,$udom,$csec,
-                                                            $cgroup,\@usersgroups);
+                                       $cgroup,\@usersgroups,$noeditgrp,$readonly);
                         }
                     }
                 }
@@ -2631,7 +2803,8 @@ ENDTABLEHEADFOUR
                     $r->print(&Apache::loncommon::start_data_table_row());
                     &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                           $parmlev,$uname,$udom,$csec,$cgroup);
+                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
+                           $readonly);
                 }
                 $r->print(&Apache::loncommon::end_data_table().'</p>'
                          .'</div>'
@@ -2721,8 +2894,9 @@ ENDMAPONE
             foreach (&keysinorder(\%name,\%keyorder)) {
                 $r->print(&Apache::loncommon::start_data_table_row());
                 &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
-                       \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                                   $parmlev,$uname,$udom,$csec,$cgroup);
+                           \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
+                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
+                           $readonly);
             }
             $r->print(&Apache::loncommon::end_data_table()
                      .'</p>'
@@ -2731,7 +2905,6 @@ ENDMAPONE
         } # end of $parmlev eq general
     }
     $r->print('</form>');
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 } # end sub assessparms
 
@@ -2741,12 +2914,19 @@ ENDMAPONE
 my $tableopen;
 
 sub tablestart {
+    my ($readonly) = @_;
     if ($tableopen) {
-    return '';
+        return '';
     } else {
-    $tableopen=1;
-    return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.
-        &mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';
+        $tableopen=1;
+        my $output = &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th>';
+        if ($readonly) {
+            $output .= '<th>'.&mt('Current value').'</th>';
+        } else {
+            $output .= '<th>'.&mt('Delete').'</th><th>'.&mt('Set to ...').'</th>';
+        }
+        $output .= '</tr>';
+        return $output;
     }
 }
 
@@ -2779,7 +2959,11 @@ sub readdata {
         }
     }
     }
-    return $resourcedata;
+    if (wantarray) {
+        return ($resourcedata,$classlist);
+    } else {
+        return $resourcedata;
+    }
 }
 
 
@@ -2795,55 +2979,83 @@ sub storedata {
     my @deldata=();
     undef @deldata;
     my ($got_chostname,$chostname,$cmajor,$cminor);
+    my $now = time;
     foreach my $key (keys(%env)) { 
     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
+        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny');
         my ($tuname,$tudom)=&extractuser($thiskey);
         my $tkey=$thiskey;
             if ($tuname) {
         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
         }
         if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
-        my ($data, $typeof, $text, $name);
+        my ($data, $typeof, $text, $name, $valchk);
         if ($cmd eq 'set') {
             $data=$env{$key};
+            $valchk = $data;
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified parameter for');
             if ($typeof eq 'string_questiontype') {
                 $name = 'type';
             } elsif ($typeof eq 'string_lenient') {
                 $name = 'lenient';
-            }
-            if ($name ne '') {
-                my ($needsrelease,$needsnewer);
-                $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$data"};
-                if ($needsrelease) {
-                    unless ($got_chostname) {
-                        ($chostname,$cmajor,$cminor)=&parameter_release_vars();
-                        $got_chostname = 1;
-                    }
-                    $needsnewer = &parameter_releasecheck($name,$data,
-                                                          $needsrelease,
-                                                          $chostname,$cmajor,
-                                                          $cminor);
+            } elsif ($typeof eq 'string_discussvote') {
+                $name = 'discussvote';
+            } elsif ($typeof eq 'string_examcode') {
+                $name = 'examcode';
+                if (&Apache::lonnet::validCODE($data)) {
+                    $valchk = 'valid';
                 }
-                if ($needsnewer) {
-                    $r->print('<br />'.&oldversion_warning($name,$data,
-                                                           $chostname,$cmajor,
-                                                           $cminor,$needsrelease));
-                    next;
+            } elsif ($typeof eq 'string_yesno') {
+                if ($thiskey =~ /\.retrypartial$/) {
+                    $name = 'retrypartial';
                 }
             }
         } elsif ($cmd eq 'datepointer') {
             $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified date for');
+            if ($typeof eq 'date_start') {
+                if ($thiskey =~ /\.printstartdate$/) {
+                    $name = 'printstartdate';
+                    if (($data) && ($data > $now)) {
+                        $valchk = 'future';
+                    }
+                }
+            } elsif ($typeof eq 'date_end') {
+                if ($thiskey =~ /\.printenddate$/) {
+                    $name = 'printenddate';
+                    if (($data) && ($data < $now)) {
+                        $valchk = 'past';
+                    }
+                }
+            }
         } elsif ($cmd eq 'dateinterval') {
             $data=&get_date_interval_from_form($thiskey);
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified date for');
         }
+        if ($name ne '') {
+            my ($needsrelease,$needsnewer);
+            $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk"};
+            if ($needsrelease) {
+                unless ($got_chostname) {
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                    $got_chostname = 1;
+                }
+                $needsnewer = &parameter_releasecheck($name,$valchk,
+                                                      $needsrelease,
+                                                      $cmajor,$cminor);
+                if ($needsnewer) {
+                    $r->print('<br />'.&oldversion_warning($name,$data,
+                                                           $chostname,$cmajor,
+                                                           $cminor,$needsrelease));
+                    next;
+                }
+            }
+        }
         if (defined($data) and $$olddata{$thiskey} ne $data) {
             if ($tuname) {
             if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
@@ -2886,7 +3098,7 @@ sub storedata {
     if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
         my %loghash=map { $_ => '' } @deldata;
         &log_parmset(\%loghash,1);
-        $r->print('<h2>'.&mt('Deleted [_1] parameter(s)</h2>',$delentries));
+        $r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
     } else {
         $r->print('<div class="LC_error">'.
               &mt('Error deleting parameters').'</div>');
@@ -2896,7 +3108,7 @@ sub storedata {
     if ($putentries) {
     if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
                 &log_parmset(\%newdata,0);
-        $r->print('<h3>'.&mt('Saved [_1] parameter(s)',$putentries/2).'</h3>');
+        $r->print('<h3>'.&mt('Saved [quant,_1,parameter]',$putentries/2).'</h3>');
     } else {
         $r->print('<div class="LC_error">'.
               &mt('Error saving parameters').'</div>');
@@ -2931,7 +3143,7 @@ sub parse_listdata_key {
 }
 
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly)=@_;
 # Start list output
 
     my $oldsection='';
@@ -3041,36 +3253,49 @@ sub listdata {
 # Ready to print
 #
             my $parmitem = &standard_parameter_names($name);
-        $r->print(&tablestart().
+        $r->print(&tablestart($readonly).
               &Apache::loncommon::start_data_table_row().
               '<td><b>'.&mt($parmitem).
-              '</b></td><td><input type="checkbox" name="del_'.
-              $thiskey.'" /></td><td>');
+              '</b></td>');
+        unless ($readonly) {
+            $r->print('<td><input type="checkbox" name="del_'.
+                      $thiskey.'" /></td>');
+        }
+        $r->print('<td>');
         $foundkeys++;
         if (&isdateparm($thistype)) {
-        my $jskey='key_'.$pointer;
-        $pointer++;
-        $r->print(
-              &Apache::lonhtmlcommon::date_setter('parmform',
-                                  $jskey,
-                              $$resourcedata{$thiskey},
-                                  '',1,'','').
+            my $jskey='key_'.$pointer;
+            my $state;
+            $pointer++;
+            if ($readonly) {
+                $state = 'disabled';
+            }
+            $r->print(
+                &Apache::lonhtmlcommon::date_setter('parmform',
+                                                    $jskey,
+                                                    $$resourcedata{$thiskey},
+                                                    '',1,$state));
+            unless ($readonly) {
+                $r->print(
 '<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,
-                          $$resourcedata{$thiskey}));
+            $r->print(&date_interval_selector($thiskey,$name,
+                      $$resourcedata{$thiskey},$readonly));
         } elsif ($thistype =~ m/^string/) {
-        $r->print(&string_selector($thistype,$thiskey,
-                       $$resourcedata{$thiskey},$name));
+            $r->print(&string_selector($thistype,$thiskey,
+                      $$resourcedata{$thiskey},$name,$readonly));
         } else {
-        $r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
+            $r->print(&default_selector($thiskey,$$resourcedata{$thiskey},$readonly));
+        }
+        unless ($readonly) {
+            $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
+                      $thistype.'" />');
         }
-        $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
-              $thistype.'" />');
         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
     }
     }
@@ -3079,8 +3304,9 @@ sub listdata {
 
 
 sub date_interval_selector {
-    my ($thiskey, $showval) = @_;
-    my $result;
+    my ($thiskey, $pname, $showval, $readonly) = @_;
+    my ($result,%skipval);
+    my $currval = $showval;
     foreach my $which (['days', 86400, 31],
                ['hours', 3600, 23],
                ['minutes', 60, 59],
@@ -3091,10 +3317,57 @@ sub date_interval_selector {
     my %select = ((map {$_ => $_} (0..$max)),
               'select_form_order' => [0..$max]);
     $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
-                           \%select);
+                           \%select,'',$readonly);
     $result .= ' '.&mt($name);
     }
-    $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+    if ($pname eq 'interval') {
+        unless ($skipval{'done'}) {
+            my $checkedon = '';
+            my $checkedproc = '';
+            my $currproctorkey = '';
+            my $currprocdisplay = 'hidden';
+            my $currdonetext = &mt('Done');
+            my $checkedoff = ' checked="checked"';
+            if ($currval =~ /^(?:\d+)_done$/) {
+                $checkedon = ' checked="checked"';
+                $checkedoff = '';
+            } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
+                $currdonetext = $1;
+                $checkedon = ' checked="checked"';
+                $checkedoff = '';
+            } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
+                $currproctorkey = $1;
+                $checkedproc = ' checked="checked"';
+                $checkedoff = '';
+                $currprocdisplay = 'text';
+            } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
+                $currdonetext = $1;
+                $currproctorkey = $2;
+                $checkedproc = ' checked="checked"';
+                $checkedoff = '';
+                $currprocdisplay = 'text';
+            }
+            my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
+            my $disabled;
+            if ($readonly) {
+                $disabled = ' disabled="disabled"';
+            }
+            $result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
+                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.$disabled.' />'.
+                       &mt('No').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.$disabled.' />'.
+                       &mt('Yes').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.$disabled.' />'.
+                       &mt('Yes, with proctor key').'</label>'.
+                       '<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
+                       'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'"'.$disabled.' /></span><br />'.
+                       '<span class="LC_nobreak">'.&mt('Button text').': '.
+                       '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
+        }
+    }
+    unless ($readonly) {
+        $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+    }
     return $result;
 
 }
@@ -3116,10 +3389,76 @@ sub get_date_interval_from_form {
 
 
 sub default_selector {
-    my ($thiskey, $showval) = @_;
-    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
+    my ($thiskey, $showval, $readonly) = @_;
+    my $disabled;
+    if ($readonly) {
+        $disabled = ' disabled="disabled"';
+    }
+    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';
+}
+
+sub string_ip_selector {
+    my ($thiskey, $showval, $readonly) = @_;
+    my %access = (
+                   allow => [],
+                   deny  => [],
+                 );
+    if ($showval ne '') {
+        my @current;
+        if ($showval =~ /,/) {
+            @current = split(/,/,$showval);
+        } else {
+            @current = ($showval);
+        }
+        foreach my $item (@current) {
+            if ($item =~ /^\!([\[\]a-zA-Z\.\d\*\-]+)$/) {
+                push(@{$access{'deny'}},$1);
+            } elsif ($item =~ /^([\[\]a-zA-Z\.\d\*\-]+)$/) {
+                push(@{$access{'allow'}},$item);
+            }
+        }
+    }
+    if (!@{$access{'allow'}}) {
+        @{$access{'allow'}} = ('');
+    }
+    if (!@{$access{'deny'}}) {
+        @{$access{'deny'}} = ('');
+    }
+    my ($disabled,$addmore);
+    if ($readonly) {
+        $disabled=' disabled="disabled"';
+    } else {
+        $addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
+    }
+    my $output = '<input type="hidden" name="set_'.$thiskey.'" />
+<table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';
+    foreach my $acctype ('allow','deny') {
+        $output .= '
+<td valign="top">
+<div class="LC_string_ipacc_wrap" id="LC_string_ipacc_'.$acctype.'_'.$thiskey.'">
+  <div class="LC_string_ipacc_inner">'."\n";
+        my $num = 0;
+        foreach my $curr (@{$access{$acctype}}) {
+            $output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'"'.$disabled.' />';
+            if ($num > 0) {
+                $output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>';
+            }
+            $output .= '</div>'."\n";
+            $num ++;
+        }
+        $output .= '
+  </div>'.$addmore.'
+</div>
+</td>';
+   }
+   $output .= '
+</tr>
+</table>'."\n";
+    return $output;
 }
 
+{
+
 my %strings =
     (
      'string_yesno'
@@ -3142,8 +3481,15 @@ my %strings =
      'string_lenient'
              => [['yes', 'Yes' ],
                  [ 'no', 'No' ],
-                 [ 'default', 'Default - only bubblesheet grading is lenient' ]] 
-     );
+                 [ 'default', 'Default - only bubblesheet grading is lenient' ]],
+     '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']],
+    );
 
 sub standard_string_options {
     my ($string_type) = @_;
@@ -3154,15 +3500,17 @@ sub standard_string_options {
 }
 
 sub string_selector {
-    my ($thistype, $thiskey, $showval, $name) = @_;
+    my ($thistype, $thiskey, $showval, $name, $readonly) = @_;
 
     if (!exists($strings{$thistype})) {
-    return &default_selector($thiskey,$showval);
+    return &default_selector($thiskey,$showval,$readonly);
     }
 
     my %skiptype;
     if (($thistype eq 'string_questiontype') || 
-        ($thistype eq 'string_lenient')) {
+        ($thistype eq 'string_lenient') ||
+        ($thistype eq 'string_discussvote') ||
+        ($name eq 'retrypartial')) {
         my ($got_chostname,$chostname,$cmajor,$cminor); 
         foreach my $possibilities (@{ $strings{$thistype} }) {
             next unless (ref($possibilities) eq 'ARRAY');
@@ -3174,17 +3522,23 @@ sub string_selector {
                     $got_chostname = 1;
                 }
                 my $needsnewer=&parameter_releasecheck($name,$parmval,$needsrelease,
-                                                       $chostname,$cmajor,
-                                                       $cminor);
+                                                       $cmajor,$cminor);
                 if ($needsnewer) {
                     $skiptype{$parmval} = 1;
                 }
             }
         }
     }
-    
+ 
+    if ($thistype eq 'string_ip') {
+        return &string_ip_selector($thiskey,$showval,$readonly);
+    }
+
+    my ($result,$disabled);
 
-    my $result;
+    if ($readonly) {
+        $disabled = ' disabled="disabled"';
+    }
     my $numinrow = 3;
     if ($thistype eq 'string_problemstatus') {
         $numinrow = 2;
@@ -3210,7 +3564,7 @@ sub string_selector {
             $result .= '<td class="LC_left_item">'.
                        '<span class="LC_nobreak"><label>'.
                        '<input type="radio" name="set_'.$thiskey.
-                       '" value="'.$name.'"';
+                       '" value="'.$name.'"'.$disabled;
             if ($showval eq $name) {
                 $result .= ' checked="checked"';
             }
@@ -3233,6 +3587,55 @@ sub string_selector {
     return $result;
 }
 
+sub oldversion_warning {
+    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my $desc;
+    my %stringtypes = (
+                        type         => 'string_questiontype',
+                        lenient      => 'string_lenient',
+                        retrypartial => 'string_yesno',
+                        discussvote  => 'string_discussvote',
+                        examcode     => 'string_examcode',
+                      );
+    if (exists($stringtypes{$name})) {
+        if ($name eq 'examcode') {
+            $desc = $value;
+        } elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
+            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
+                next unless (ref($possibilities) eq 'ARRAY');
+                my ($parmval, $description) = @{ $possibilities };
+                if ($parmval eq $value) {
+                    $desc = $description;
+                    last;
+                }
+            }
+        }
+    } elsif (($name eq 'printstartdate') || ($name eq 'printenddate')) {
+        my $now = time;
+        if ($value =~ /^\d+$/) {
+            if ($name eq 'printstartdate') {
+                if ($value > $now) {
+                    $desc = &Apache::lonlocal::locallocaltime($value);
+                }
+            } elsif ($name eq 'printenddate') {
+                if ($value < $now) {
+                    $desc = &Apache::lonlocal::locallocaltime($value);
+                }
+            }
+        }
+    }
+    my $standard_name = &standard_parameter_names($name);
+    return '<p class="LC_warning">'.
+           &mt('[_1] was [_2]not[_3] set to [_4].',
+               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+           $cmajor.'.'.$cminor,$chostname,
+           $needsrelease).
+           '</p>';
+}
+
+}
+
 #
 # Shift all start and end dates by $shift
 #
@@ -3269,16 +3672,34 @@ sub dateshift {
 }
 
 sub newoverview {
-    my ($r) = @_;
+    my ($r,$parm_permission) = @_;
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $readonly = 1;
+    if ($parm_permission->{'edit'}) {
+        undef($readonly);
+    }
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
         text=>"Overview Mode"});
-    my $start_page = &Apache::loncommon::start_page('Set Parameters');
+
+    my %loaditems = (
+                      'onload'   => "showHide_courseContent(); resize_scrollbox('mapmenuscroll','1','1');",
+                    );
+    my $js = '
+<script type="text/javascript">
+// <![CDATA[
+'.
+            &Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
+            &showhide_js()."\n".
+            &done_proctor_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');
     $r->print(<<ENDOVER);
 <form method="post" action="/adm/parmset?action=newoverview" name="parmform">
 ENDOVER
@@ -3307,7 +3728,7 @@ ENDOVER
     my $pschp=$env{'form.pschp'};
 
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
-    if (!@psprt) { $psprt[0]='all'; }
+    if (!@psprt) { $psprt[0]='0'; }
 
     my @selected_sections =
     &Apache::loncommon::get_env_multiple('form.Section');
@@ -3341,7 +3762,7 @@ ENDOVER
     $r->print('<div class="LC_Box">');
     #$r->print('<h2 class="LC_hcell">Step 1</h2>');
     $r->print('<div>');
-    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
         $r->print(&Apache::lonhtmlcommon::row_closure());
@@ -3399,12 +3820,13 @@ ENDOVER
 
 # List data
 
-        &listdata($r,$resourcedata,$listdata,$sortorder);
+        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly);
+    }
+    $r->print(&tableend());
+    unless ($readonly) {
+        $r->print(((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':''));
     }
-    $r->print(&tableend().
-         ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
-          '</form>');
-    &endSettingsScreen($r);
+    $r->print('</form>');
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3444,38 +3866,60 @@ sub secgroup_lister {
 }
 
 sub overview {
-    my ($r) = @_;
+    my ($r,$parm_permission) = @_;
     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".
+             '// ]]>'."\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');
+    my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js);
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
     $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');
 
 # Store modified
-
-    &storedata($r,$crs,$dom);
+    unless ($readonly) {
+        &storedata($r,$crs,$dom);
+    }
 
 # Read modified data
 
-    my $resourcedata=&readdata($crs,$dom);
+    my ($resourcedata,$classlist)=&readdata($crs,$dom);
 
 
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
     &sortmenu($r,$sortorder);
 
+    my $submitbutton = '<input type="submit" value="'.&mt('Save').'" />';
+
+    if ($readonly) {
+        $r->print('<p>'.$submitbutton.'</p>');
+    }
+
+
 # List data
 
-    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder,'overview',$classlist,$readonly);
 
-    $r->print(&tableend().'<p>'.
-    ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':&mt('There are no parameters.')).'</p></form>'.
-          &Apache::loncommon::end_page());
+    $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());
 }
 
 sub clean_parameters {
@@ -3550,8 +3994,9 @@ ENDOVER
         } elsif ($data{'realm_type'} eq 'symb') {
         my ($map,$resid,$url) =
             &Apache::lonnet::decode_symb($data{'realm'});
-        $r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
-                  $url,$resid,$map));
+        $r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',
+                  $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>');
@@ -3561,7 +4006,6 @@ 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());
 }
 
@@ -3575,13 +4019,11 @@ sub date_shift_one {
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
-    $r->print('<form name="shiftform" method="post">'.
+    $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>'.
               '<tr><td>'.&mt('Shifted date:').'</td><td>'.
-                    &Apache::lonhtmlcommon::dshowerfuck.net
-ate_setter('shiftform',
+                    &Apache::lonhtmlcommon::date_setter('shiftform',
                                                         'timeshifted',
                                                         $env{'form.timebase'},,
                                                         '').
@@ -3589,7 +4031,6 @@ ate_setter('shiftform',
               '<input type="hidden" name="action" value="dateshift2" />'.
               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
               '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3602,14 +4043,18 @@ sub date_shift_two {
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
-    $r->print(&mt('Shifting all dates such that [_1] becomes [_2]',
+    $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)));
+              &Apache::lonlocal::locallocaltime($timeshifted)).'</p>');
     my $delta=$timeshifted-$env{'form.timebase'};
     &dateshift($delta);
-    &endSettingsScreen($r);
+    $r->print(
+        &Apache::lonhtmlcommon::confirm_success(&mt('Done')).
+        '<br /><br />'.
+        &Apache::lonhtmlcommon::actionbox(
+            ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3654,7 +4099,7 @@ sub parse_key {
 
 
 sub header {
-    return &Apache::loncommon::start_page('Settings');
+    return &Apache::loncommon::start_page('Content and Problem Settings');
 }
 
 
@@ -3664,7 +4109,9 @@ sub print_main_menu {
     #
     $r->print(&header());
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content and Problem Settings'));
-    &startSettingsScreen($r,'parmset');
+    my $crstype = &Apache::loncommon::course_type();
+    my $lc_crstype = lc($crstype);
+
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -3674,29 +4121,74 @@ ENDMAINFORMHEAD
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr  = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
-
-    my $crstype = &Apache::loncommon::course_type();
-    my $lc_crstype = lc($crstype);
-
+    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,
+            permission => $parm_permission->{'setrestrictmeta'},
             linktitle => "Restrict metadata for this $lc_crstype." ,
             icon =>'contact-new.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 => $linktext{'resettimes'},
+            url => $url{'resettimes'},
+            permission => ($vgr || $mgr),
+            linktitle => $linktitle{'resettimes'},
+            icon => 'start-here.png',
+            },
+          { linktext => 'Blocking Communication/Resource Access',
+            url => '/adm/setblock',
+            permission => ($vcb || $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,
+            permission => $parm_permission->{'setdefaults'},
             linktitle =>'Set default actions for parameters.'  ,
             icon => 'folder-new.png'  ,
             }]},
@@ -3704,43 +4196,43 @@ ENDMAINFORMHEAD
         items => [
           { linktext => 'Edit Resource Parameters - Helper Mode',
             url => '/adm/helper/parameter.helper',
-            permission => $parm_permission,
+            permission => $parm_permission->{'helper'},
             linktitle =>'Set/Modify resource parameters in helper mode.'  ,
             icon => 'dialog-information.png'  ,
             #help => 'Parameter_Helper',
             },
-          { linktext => 'Edit Resource Parameters - Overview Mode',
+          { linktext => $linktext{'newoverview'},
             url => '/adm/parmset?action=newoverview',
-            permission => $parm_permission,
-            linktitle =>'Set/Modify resource parameters in overview mode.'  ,
-            icon => 'edit-find.png'  ,
+            permission => $parm_permission->{'newoverview'},
+            linktitle => $linktitle{'newoverview'},
+            icon => 'edit-find.png',
             #help => 'Parameter_Overview',
             },
-          { linktext => 'Edit Resource Parameters - Table Mode',
+          { linktext => $linktext{'settable'},
             url => '/adm/parmset?action=settable',
-            permission => $parm_permission,
-            linktitle =>'Set/Modify resource parameters in table mode.'  ,
-            icon => 'edit-copy.png'  ,
+            permission => $parm_permission->{'settable'},
+            linktitle => $linktitle{'settable'},
+            icon => 'edit-copy.png',
             #help => 'Table_Mode',
             }]},
            { categorytitle => 'Existing Parameter Settings for Resources',
          items => [
-          { linktext => 'Modify Resource Parameters - Overview Mode',
+          { linktext => $linktext{'setoverview'},
             url => '/adm/parmset?action=setoverview',
-            permission => $parm_permission,
-            linktitle =>'Set/Modify existing resource parameters in overview mode.'  ,
-            icon => 'preferences-desktop-wallpaper.png'  ,
+            permission => $parm_permission->{'setoverview'},
+            linktitle => $linktitle{'setoverview'},
+            icon => 'preferences-desktop-wallpaper.png',
             #help => 'Parameter_Overview',
             },
           { linktext => 'Change Log',
             url => '/adm/parmset?action=parameterchangelog',
-            permission => $parm_permission,
+            permission => $parm_permission->{'parameterchangelog'},
             linktitle =>"View parameter and $lc_crstype blog posting/user notification change log."  ,
             icon => 'document-properties.png',
             }]}
           );
     $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
-    &endSettingsScreen($r);
+    $r->print('</form>'.&Apache::loncommon::end_page());
     return;
 }
 
@@ -3816,7 +4308,6 @@ sub order_meta_fields {
               text=>"Restrict Metadata"},
              {text=>"Order Metadata"});
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
-    &startSettingsScreen($r,'parmset');
     if ($env{'form.storeorder'}) {
         my $newpos = $env{'form.newpos'} - 1;
         my $currentpos = $env{'form.currentpos'} - 1;
@@ -3870,7 +4361,7 @@ sub order_meta_fields {
     foreach my $key (@fields_in_order) {
         $r->print('<tr><td>');
         $r->print('<form method="post" action="">');
-        $r->print('<select name="newpos" onChange="this.form.submit()">');
+        $r->print('<select name="newpos" onchange="this.form.submit()">');
         for (my $i = 1;$i le $num_fields;$i ++) {
             if ($i eq $idx) {
                 $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');
@@ -3886,7 +4377,6 @@ sub order_meta_fields {
         $idx ++;
     }
     $r->print('</table>');
-    &endSettingsScreen($r);
     return 'ok';
 }
 
@@ -3906,7 +4396,6 @@ sub addmetafield {
         text=>"Add Metadata Field"});
     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
-    &startSettingsScreen($r,'parmset');
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (exists($env{'form.undelete'})) {
@@ -3943,12 +4432,11 @@ sub addmetafield {
             $r->print('<input type="submit" name="undelete" value="Undelete" />');
             $r->print('</form>');
         }
-        $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<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="Add Metadata Field" />');
     }
     $r->print('</form>');
-    &endSettingsScreen($r);
 }
 
 
@@ -3963,7 +4451,6 @@ sub setrestrictmeta {
         text=>"Restrict Metadata"});
     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
-    &startSettingsScreen($r,'parmset');
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
@@ -4036,7 +4523,6 @@ ENDButtons
         $buttons
         </form>
 ENDenv
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
 }
@@ -4081,7 +4567,6 @@ sub defaultsetter {
     &Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
     $r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -4228,7 +4713,6 @@ 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;
 }
@@ -4316,19 +4800,25 @@ sub standard_parameter_types {
 }
 
 sub parm_change_log {
-    my ($r)=@_;
+    my ($r,$parm_permission)=@_;
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
     text=>"Parameter Change Log"});
-    $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
+    my $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             &Apache::loncommon::display_filter_js('parmslog')."\n".
+             '// ]]>'."\n".
+             '</script>'."\n";
+    $r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
-    &startSettingsScreen($r,'parmset');
     my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
                       $env{'course.'.$env{'request.course.id'}.'.domain'},
                       $env{'course.'.$env{'request.course.id'}.'.num'});
 
     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
 
-    $r->print('<form action="/adm/parmset?action=parameterchangelog"
+    $r->print('<div class="LC_left_float">'.
+              '<fieldset><legend>'.&mt('Display of Changes').'</legend>'.
+              '<form action="/adm/parmset?action=parameterchangelog"
                      method="post" name="parameterlog">');
 
     my %saveable_parameters = ('show' => 'scalar',);
@@ -4336,17 +4826,22 @@ sub parm_change_log {
                                               \%saveable_parameters);
     &Apache::loncommon::restore_course_settings('parameter_log',
                                                 \%saveable_parameters);
-    $r->print(&Apache::loncommon::display_filter().
-              '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
-          ' '.&mt('Include parameter types').'</label>'.
-          '<input type="submit" value="'.&mt('Display').'" /></form>');
-
+    $r->print(&Apache::loncommon::display_filter('parmslog').'&nbsp;'."\n".
+              '<input type="submit" value="'.&mt('Display').'" />'.
+              '</form></fieldset></div><br clear="all" />');
+    my $readonly = 1;
+    if ($parm_permission->{'edit'}) {
+        undef($readonly);
+    }
     my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
                              $env{'course.'.$env{'request.course.id'}.'.domain'});
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
           '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
-          &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
-          &Apache::loncommon::end_data_table_header_row());
+          &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());
     my $shown=0;
     my $folder='';
     if ($env{'form.displayfilter'} eq 'currentfolder') {
@@ -4379,7 +4874,8 @@ sub parm_change_log {
                            $parmlog{$id}{'exe_uname'},
                            $parmlog{$id}{'exe_udom'});
     my $send_msg_link='';
-    if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
+    if ((!$readonly) && 
+        (($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'),
@@ -4449,27 +4945,31 @@ sub parm_change_log {
             }
         }
         }
-        $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();
+        $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();
     }
         if ($env{'form.displayfilter'} eq 'containing') {
         my $wholeentry=$about_me_link.':'.
@@ -4489,7 +4989,6 @@ sub parm_change_log {
           || $shown<=$env{'form.show'})) { last; }
     }
     $r->print(&Apache::loncommon::end_data_table());
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -4537,10 +5036,10 @@ sub update_slots {
                           action  => 'reserve',
                           context => 'parameter',
                         );
-        &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+        &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
                                         '',$uname,$udom,$cnum,$cdom);
 
-        &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+        &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
                                         '',$uname,$udom,$uname,$udom);
     }
     return $success;
@@ -4571,9 +5070,9 @@ sub delete_slots {
                                   action  => 'release',
                                   context => 'parameter',
                                 );
-                &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+                &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
                                                 1,$uname,$udom,$cnum,$cdom);
-                &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+                &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
                                                 1,$uname,$udom,$uname,$udom);
             }
         }
@@ -4597,7 +5096,7 @@ sub parameter_release_vars {
 }
 
 sub parameter_releasecheck {
-    my ($name,$value,$needsrelease,$chostname,$cmajor,$cminor) = @_;
+    my ($name,$value,$needsrelease,$cmajor,$cminor) = @_;
     my $needsnewer;
     my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
     if (($cmajor < $needsmajor) || 
@@ -4609,33 +5108,44 @@ sub parameter_releasecheck {
     return $needsnewer;
 }
 
-sub oldversion_warning {
-    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
-    my $desc;
-    my %stringtypes = (
-                        type    => 'string_questiontype',
-                        lenient => 'string_lenient'
+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,
                       );
-    if (exists($stringtypes{$name})) {
-        if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
-            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
-                next unless (ref($possibilities) eq 'ARRAY');
-                my ($parmval, $description) = @{ $possibilities };
-                if ($parmval eq $value) {
-                    $desc = $description;
-                    last;
-                }
-            }
-        }
     }
-    my $standard_name = &standard_parameter_names($name);
-    return '<p class="LC_warning">'.
-           &mt('[_1] was [_2]not[_3] set to [_4].',
-               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
-           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
-           $cmajor.'.'.$cminor,$chostname,
-           $needsrelease).
-           '</p>';
+    foreach my $perm (values(%permission)) {
+        if ($perm) { $allowed=1; last; }
+    }
+    return (\%permission,$allowed);
 }
 
 sub handler {
@@ -4665,41 +5175,41 @@ sub handler {
                                             'Parameter_Manager,Course_Environment,Parameter_Helper,Parameter_Overview,Table_Mode'});
 
 # ----------------------------------------------------- Needs to be in a course
-    my $parm_permission =
-    (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
-     &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
-                  $env{'request.course.sec'}));
+    my ($parm_permission,$allowed) = &get_permission();
     my $exists = &check_for_course_info();
 
-    if ($env{'request.course.id'} &&  $parm_permission && $exists) {
+    if ($env{'request.course.id'} && $allowed && $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 ((($env{'form.command'} eq 'set') && ($env{'form.url'})
-         && (!$env{'form.dis'})) || ($env{'form.symb'})) {
-        &assessparms($r);
+        if (($parm_permission->{'set'}) &&
+            ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+               && (!$env{'form.dis'})) || ($env{'form.symb'}))) {
+            &assessparms($r,$parm_permission);
         } 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);
-    } elsif ($env{'form.action'} eq 'addmetadata') {
-        &addmetafield($r);
-    } elsif ($env{'form.action'} eq 'ordermetadata') {
-        &order_meta_fields($r);
+            &overview($r,$parm_permission);
+        } 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);
+            &newoverview($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'setdefaults') {
-        &defaultsetter($r);
-    } elsif ($env{'form.action'} eq 'settable') {
-        &assessparms($r);
+            &defaultsetter($r);
+        } elsif ($env{'form.action'} eq 'settable') {
+            &assessparms($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'parameterchangelog') {
-        &parm_change_log($r);
+            &parm_change_log($r,$parm_permission);
         } 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') {