--- loncom/interface/lonparmset.pm	2011/01/15 21:49:37	1.510
+++ loncom/interface/lonparmset.pm	2012/05/10 17:50:07	1.522.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.510 2011/01/15 21:49:37 www Exp $
+# $Id: lonparmset.pm,v 1.522.2.2 2012/05/10 17:50:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,33 +137,41 @@ javascript function 'pjump'.
 
 =item extractResourceInformation() : 
 
-Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
+ extractResourceInformation extracts lots of information about all of the the course's resources into a variety of hashes.
 
 Input: See list below:
 
-=item * B<ids> : An array that will contain all of the ids in the course.
+=item * B<env{'user.name'}> : Current username
 
-=item * B<typep> : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
+=item * B<env{'user.domain'}> : Domain of current user.
 
-=item * B<keyp> : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
+=item * b<env{"request.course.fn"} : Course
 
-=item * B<allparms> : hash, name of parameter->display value (what is the display value?)
+Outputs: See list below:
 
-=item * B<allparts> : hash, part identification->text representation of part, where the text representation is "[Part $part]"
+=item * B<ids> (out) : An array that will contain all of the ids in the course.
 
-=item * B<allkeys> : hash, full key to part->display value (what's display value?)
+=item * B<typep>(out) : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
 
-=item * B<allmaps> : hash, ???
+=item * B<keyp> (out) : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
 
-=item * B<fcat> : ???
+=item * B<allparms> (out) : hash, name of parameter->display value (what is the display value?)
 
-=item * B<defp> : hash, ???
+=item * B<allparts> (out) : hash, part identification->text representation of part, where the text representation is "[Part $part]"
+
+=item * B<allmaps> (out) : hash, ???
 
 =item * B<mapp> : ??
 
 =item * B<symbp> : hash, id->full sym?
 
+=item * B<maptitles>
+
+=item * B<uris>
+
+=item * B<keyorder>
 
+=item * B<defkeytype>
 
 =item isdateparm()
 
@@ -196,8 +204,8 @@ Input: See list below:
 Show assessment data and parameters.  This is a large routine that should
 be simplified and shortened... someday.
 
-Inputs: $r
-
+Inputs: $r - the Apache request object.
+  
 Returns: nothing
 
 Variables used (guessed by Jeremy):
@@ -306,27 +314,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,
@@ -805,6 +792,7 @@ sub valout {
         &date_sanity_info($value);
         } else {
             $result = $value;
+            $result=~s/\,/\, /gs;
         $result = &HTML::Entities::encode($result,'"<>&');
         }
     }
@@ -846,16 +834,10 @@ 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();
         if (document.parmform.pres_marker.value!='') {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
@@ -891,12 +873,35 @@ 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 startpage {
-    my ($r) = @_;
+    my ($r,$psymb) = @_;
 
-    my %loaditems = ('onunload' => "pclose()",
-             'onload'   => "showHide_courseContent(); group_or_section('cgroup')",
-        );
+    my %loaditems = (
+                      'onload'   => "group_or_section('cgroup')",
+                    );
+    if (!$psymb) {
+        $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup'); resize_scrollbox('mapmenuscroll','1','1');";
+    }
 
     if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
          && (!$env{'form.dis'})) || ($env{'form.symb'})) {
@@ -907,16 +912,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" />
@@ -1165,6 +1176,7 @@ sub extractResourceInformation {
         $$typep{$id}=$1;
         $$keyp{$id}='';
         $$uris{$id}=$srcf;
+
         foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
             next if ($key!~/^parameter_/);
 
@@ -1288,8 +1300,9 @@ sub parmmenu {
     }
 
     function checkdisset() {
-    checkthis('discussend','pscat');
+     checkthis('discussend','pscat');
      checkthis('discusshide','pscat');
+     checkthis('discussvote','pscat');
     }
 
     function checkcontdates() {
@@ -1353,6 +1366,8 @@ sub lookUpTableParameter {
         'contentopen' => 'time_settings',
         'contentclose' => 'time_settings',
         'discussend' => 'time_settings',
+	'printopendate' => 'time_settings',
+	'printclosedate' => 'time_settings',
         'weight' => 'grading',
         'handgrade' => 'grading',
         'maxtries' => 'tries',
@@ -1384,6 +1399,9 @@ sub lookUpTableParameter {
         'acc' => 'misc',
         'maxcollaborators' => 'misc',
         'scoreformat' => 'misc',
+        'lenient' => 'grading',
+        'retrypartial' => 'tries',
+        'discussvote'  => 'misc',
 
     );    
 }
@@ -1522,8 +1540,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>');
@@ -1724,12 +1746,12 @@ sub mapmenu {
            .'</div>'
         );
 
-        $r->print(&Apache::loncommon::start_scrollbox());
-        $r->print(&Apache::loncommon::start_data_table());
+        $r->print(&Apache::loncommon::start_scrollbox(undef,undef,undef,'mapmenuscroll'));
+        $r->print(&Apache::loncommon::start_data_table(undef,'mapmenuinner'));
 
         # Display row: "All Maps or Folders"
         $r->print(
-            &Apache::loncommon::start_data_table_row()
+            &Apache::loncommon::start_data_table_row(undef,'picklevel')
            .'<td>'
            .'<label>'
            .'<input type="radio" name="pschp"'
@@ -1804,8 +1826,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());
     }
 }
 
@@ -1931,8 +1954,11 @@ sub standardkeyorder {
         'parameter_0_tol' => 16,
         'parameter_0_sig' => 17,
         'parameter_0_turnoffunit' => 18,
-            'parameter_0_discussend' => 19,
-            'parameter_0_discusshide' => 20);
+        'parameter_0_discussend' => 19,
+        'parameter_0_discusshide' => 20,
+        'parameter_0_discussvote' => 21,
+	'parameter_0_printopendate'  =>  22,
+	'parameter_0_printclosedate' =>  23);
 }
 
 
@@ -1940,6 +1966,9 @@ sub assessparms {
 
     my $r=shift;
 
+
+
+# -------------------------------------------------------- Variable declaration
     my @ids=();
     my %symbp=();
     my %mapp=();
@@ -1947,9 +1976,6 @@ sub assessparms {
     my %keyp=();
     my %uris=();
     my %maptitles=();
-
-# -------------------------------------------------------- Variable declaration
-
     my %allmaps=();
     my %alllevs=();
 
@@ -1968,14 +1994,16 @@ sub assessparms {
 
     my %allparms;
     my %allparts;
+# ------------------------------------------------------------------------------
+
 #
 # Order in which these parameters will be displayed
 #
     my %keyorder=&standardkeyorder();
 
-    @ids=();
-    %symbp=();
-    %typep=();
+#    @ids=();
+#    %symbp=();       # These seem defined above already.
+#    %typep=();
 
     my $message='';
 
@@ -2097,8 +2125,10 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
+
+
         for (my $i=0;$i<=$#markers;$i++) {
-            my ($needsrelease,$needsnewer);
+            my ($needsrelease,$needsnewer,$name);
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
@@ -2129,22 +2159,23 @@ sub assessparms {
                         }
                     }
                 }
-            } elsif ($markers[$i] =~ /_type\&\d+$/) {
+            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote)\&\d+$/) {
+                $name = $1;
                 $needsrelease =
-                    $Apache::lonnet::needsrelease{'parameter:type:'.$values[$i]};
+                    $Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"};
                 if ($needsrelease) {
                     unless ($got_chostname) {
-                        ($chostname,$cmajor,$cminor) = &questiontype_release_vars();
+                        ($chostname,$cmajor,$cminor) = &parameter_release_vars();
                         $got_chostname = 1;
                     }
-                    $needsnewer = &questiontype_releasecheck($values[$i],
-                                                             $needsrelease,
-                                                             $chostname,
-                                                             $cmajor,$cminor);
+                    $needsnewer = &parameter_releasecheck($name,$values[$i],
+                                                          $needsrelease,
+                                                          $chostname,
+                                                          $cmajor,$cminor);
                 }
             }
             if ($needsnewer) {
-                $message .= &oldversion_warning($values[$i],$chostname,$cmajor,
+                $message .= &oldversion_warning($name,$values[$i],$chostname,$cmajor,
                                                 $cminor,$needsrelease);
             } else {
                 $message.=&storeparm(split(/\&/,$markers[$i]),
@@ -2168,7 +2199,7 @@ sub assessparms {
     if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
 # ------------------------------------------------------------------ Start page
 
-    &startpage($r);
+    &startpage($r,$pssymb);
 
     foreach ('tolerance','date_default','date_start','date_end',
         'date_interval','int','float','string') {
@@ -2200,27 +2231,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);
@@ -2231,11 +2250,11 @@ COURSECONTENTSCRIPT
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
 
         # Step 2
-        $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification')));
+        $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
         &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder);
 
         # 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));
@@ -2244,7 +2263,7 @@ COURSECONTENTSCRIPT
         # Update Display Button
         $r->print('<p>'
              .'<input type="submit" name="dis"'
-             .' value="'.&mt('Update Parameter Display').'" />'
+             .' value="'.&mt('Update Display').'" />'
              .'<input type="hidden" name="hideparmsel" value="hidden" />'
              .'</p>');
         $r->print('</div>');
@@ -2260,6 +2279,7 @@ COURSECONTENTSCRIPT
              .'</a>'
              .'</p>');
     } else {
+        $r->print();
         # parameter screen for a single resource. 
         my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);
         my $title = &Apache::lonnet::gettitle($pssymb);
@@ -2280,7 +2300,7 @@ COURSECONTENTSCRIPT
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
         $r->print('<p>'
              .'<input type="submit" name="dis"'
-             .' value="'.&mt('Update Parameter Display').'" />'
+             .' value="'.&mt('Update Display').'" />'
              .'<input type="hidden" name="hideparmsel" value="hidden" />'
              .'</p>');
     }
@@ -2315,7 +2335,7 @@ COURSECONTENTSCRIPT
                   $coursespan += 3;
                }
 
-               $r->print('<p><table border="2">');
+               $r->print(&Apache::loncommon::start_data_table());
 #
 # This produces the headers
 #
@@ -2425,7 +2445,6 @@ ENDTABLEHEADFOUR
                     my $uri=&Apache::lonnet::declutter($uris{$rid});
 
                     my $filter=$env{'form.filter'};
-
                     foreach (&keysplit($keyp{$rid})) {
                         my $tempkeyp = $_;
                         if (grep $_ eq $tempkeyp, @catmarker) {
@@ -2480,8 +2499,8 @@ ENDTABLEHEADFOUR
                         $r->print('<td style="background-color:'.$defbgone.';"'.
                                       ' rowspan='.$totalparms.
                                       '>'.$maptitles{$mapp{$rid}}.'</td>');
-
                         foreach (&keysinorder_bytype(\%name,\%keyorder)) {
+
                             unless ($firstrow) {
                                 $r->print('<tr>');
                             } else {
@@ -2496,7 +2515,7 @@ ENDTABLEHEADFOUR
                 }
             } # end foreach ids
 # -------------------------------------------------- End entry for one resource
-            $r->print('</table>');
+            $r->print(&Apache::loncommon::end_data_table);
         } # end of  full
 #--------------------------------------------------- Entry for parm level map
         if ($parmlev eq 'map') {
@@ -2713,7 +2732,6 @@ ENDMAPONE
         } # end of $parmlev eq general
     }
     $r->print('</form>');
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 } # end sub assessparms
 
@@ -2787,25 +2805,38 @@ sub storedata {
         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
         }
         if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
-        my ($data, $typeof, $text);
+        my ($data, $typeof, $text, $name);
         if ($cmd eq 'set') {
             $data=$env{$key};
             $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';
+            } elsif ($typeof eq 'string_discussvote') {
+                $name = 'discussvote';
+            } elsif ($typeof eq 'string_yesno') {
+                if ($thiskey =~ /\.retrypartial$/) {
+                    $name = 'retrypartial';
+                }
+            }
+            if ($name ne '') {
                 my ($needsrelease,$needsnewer);
-                $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$data};
+                $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$data"};
                 if ($needsrelease) {
                     unless ($got_chostname) {
-                        ($chostname,$cmajor,$cminor)=&questiontype_release_vars();
+                        ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                         $got_chostname = 1;
                     }
-                    $needsnewer = &questiontype_releasecheck($data,$needsrelease,
-                                                             $chostname,$cmajor,
-                                                             $cminor);
+                    $needsnewer = &parameter_releasecheck($name,$data,
+                                                          $needsrelease,
+                                                          $chostname,$cmajor,
+                                                          $cminor);
                 }
                 if ($needsnewer) {
-                    $r->print('<br />'.&oldversion_warning($data,$chostname,$cmajor,
+                    $r->print('<br />'.&oldversion_warning($name,$data,
+                                                           $chostname,$cmajor,
                                                            $cminor,$needsrelease));
                     next;
                 }
@@ -3040,7 +3071,7 @@ sub listdata {
                           $$resourcedata{$thiskey}));
         } elsif ($thistype =~ m/^string/) {
         $r->print(&string_selector($thistype,$thiskey,
-                       $$resourcedata{$thiskey}));
+                       $$resourcedata{$thiskey},$name));
         } else {
         $r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
         }
@@ -3114,6 +3145,14 @@ my %strings =
                  [ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],
                  [ 'practice', 'Practice'],
                  [ 'surveycred', 'Survey (credit for submission)']],
+     'string_lenient'
+             => [['yes', 'Yes' ],
+                 [ 'no', 'No' ],
+                 [ 'default', 'Default - only bubblesheet grading is lenient' ]],
+     'string_discussvote'
+             => [['yes','Yes'],
+                 ['notended','Yes, unless discussion ended'],
+                 ['no','No']],
      );
 
 sub standard_string_options {
@@ -3125,33 +3164,37 @@ sub standard_string_options {
 }
 
 sub string_selector {
-    my ($thistype, $thiskey, $showval) = @_;
+    my ($thistype, $thiskey, $showval, $name) = @_;
 
     if (!exists($strings{$thistype})) {
     return &default_selector($thiskey,$showval);
     }
 
     my %skiptype;
-    if ($thistype eq 'string_questiontype') {
+    if (($thistype eq 'string_questiontype') || 
+        ($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');
-            my ($name, $description) = @{ $possibilities };
-            my $needsrelease=$Apache::lonnet::needsrelease{'parameter:type:'.$name};
+            my ($parmval, $description) = @{ $possibilities };
+            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval"};
             if ($needsrelease) {
                 unless ($got_chostname) {
-                    ($chostname,$cmajor,$cminor)=&questiontype_release_vars();
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                     $got_chostname = 1;
                 }
-                my $needsnewer=&questiontype_releasecheck($name,$needsrelease,
-                                                          $chostname,$cmajor,
-                                                          $cminor);
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$needsrelease,
+                                                       $chostname,$cmajor,
+                                                       $cminor);
                 if ($needsnewer) {
-                    $skiptype{$name} = 1;
+                    $skiptype{$parmval} = 1;
                 }
             }
         }
     }
+    
 
     my $result;
     my $numinrow = 3;
@@ -3244,10 +3287,23 @@ sub newoverview {
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     &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".
+'// ]]>
+</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
@@ -3310,7 +3366,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());
@@ -3373,7 +3429,6 @@ ENDOVER
     $r->print(&tableend().
          ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
           '</form>');
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3422,7 +3477,6 @@ sub overview {
     my $start_page=&Apache::loncommon::start_page('Modify Parameters');
     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
@@ -3530,7 +3584,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());
 }
 
@@ -3544,12 +3597,12 @@ 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">'.
               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
               '<tr><td>'.&mt('Shifted date:').'</td><td>'.
-                    &Apache::lonhtmlcommon::date_setter('shiftform',
+                    &Apache::lonhtmlcommon::dshowerfuck.net
+ate_setter('shiftform',
                                                         'timeshifted',
                                                         $env{'form.timebase'},,
                                                         '').
@@ -3557,7 +3610,6 @@ sub date_shift_one {
               '<input type="hidden" name="action" value="dateshift2" />'.
               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
               '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3570,14 +3622,12 @@ 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]',
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
               &Apache::lonlocal::locallocaltime($timeshifted)));
     my $delta=$timeshifted-$env{'form.timebase'};
     &dateshift($delta);
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3622,7 +3672,7 @@ sub parse_key {
 
 
 sub header {
-    return &Apache::loncommon::start_page('Settings');
+    return &Apache::loncommon::start_page('Parameter Manager');
 }
 
 
@@ -3631,8 +3681,7 @@ sub print_main_menu {
     my ($r,$parm_permission)=@_;
     #
     $r->print(&header());
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content and Problem Settings'));
-    &startSettingsScreen($r,'parmset');
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -3642,6 +3691,11 @@ 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 $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'});
+    if ((!$dcm) && ($env{'request.course.sec'} ne '')) {
+        $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
+                                        '/'.$env{'request.course.sec'});
+    }
 
     my $crstype = &Apache::loncommon::course_type();
     my $lc_crstype = lc($crstype);
@@ -3661,7 +3715,12 @@ ENDMAINFORMHEAD
             linktitle => "Reset access times for folders/maps, resources or the $lc_crstype."  ,
             icon => 'start-here.png'  ,
             },
-
+          { linktext => 'Blocking Communication/Resource Access',
+            url => '/adm/setblock',
+            permission => $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,
@@ -3708,7 +3767,6 @@ ENDMAINFORMHEAD
             }]}
           );
     $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
-    &endSettingsScreen($r);
     return;
 }
 
@@ -3784,7 +3842,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;
@@ -3854,7 +3911,6 @@ sub order_meta_fields {
         $idx ++;
     }
     $r->print('</table>');
-    &endSettingsScreen($r);
     return 'ok';
 }
 
@@ -3874,7 +3930,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'})) {
@@ -3916,7 +3971,6 @@ sub addmetafield {
         $r->print('<input type="submit" value="Add Metadata Field" />');
     }
     $r->print('</form>');
-    &endSettingsScreen($r);
 }
 
 
@@ -3931,7 +3985,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'}.'.'};
@@ -4004,7 +4057,6 @@ ENDButtons
         $buttons
         </form>
 ENDenv
-    &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
 }
@@ -4049,7 +4101,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'};
@@ -4196,7 +4247,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;
 }
@@ -4287,16 +4337,22 @@ sub parm_change_log {
     my ($r)=@_;
     &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',);
@@ -4304,10 +4360,9 @@ 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 $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
                              $env{'course.'.$env{'request.course.id'}.'.domain'});
@@ -4457,7 +4512,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());
 }
 
@@ -4555,7 +4609,7 @@ sub check_for_course_info {
     return 0;
 }
 
-sub questiontype_release_vars { 
+sub parameter_release_vars { 
    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
    my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
    my $chostname = &Apache::lonnet::hostname($chome);
@@ -4564,35 +4618,44 @@ sub questiontype_release_vars {
    return ($chostname,$cmajor,$cminor);
 }
 
-sub questiontype_releasecheck {
-    my ($questiontype,$needsrelease,$chostname,$cmajor,$cminor) = @_;
+sub parameter_releasecheck {
+    my ($name,$value,$needsrelease,$chostname,$cmajor,$cminor) = @_;
     my $needsnewer;
     my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
     if (($cmajor < $needsmajor) || 
         ($cmajor == $needsmajor && $cminor < $needsminor)) {
         $needsnewer = 1;
     } else {
-        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:type:'.$questiontype});
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value});
     }
     return $needsnewer;
 }
 
 sub oldversion_warning {
-    my ($questiontype,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
     my $desc;
-    if (ref($strings{'string_questiontype'}) eq 'ARRAY') {
-        foreach my $possibilities (@{ $strings{'string_questiontype'} }) {
-            next unless (ref($possibilities) eq 'ARRAY');
-            my ($name, $description) = @{ $possibilities };
-            if ($name eq $questiontype) {
-                $desc = $description;
-                last;
+    my %stringtypes = (
+                        type         => 'string_questiontype',
+                        lenient      => 'string_lenient',
+                        retrypartial => 'string_yesno',
+                        discussvote  => 'string_discussvote',
+                      );
+    if (exists($stringtypes{$name})) {
+        if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
+            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
+                next unless (ref($possibilities) eq 'ARRAY');
+                my ($parmval, $description) = @{ $possibilities };
+                if ($parmval eq $value) {
+                    $desc = $description;
+                    last;
+                }
             }
         }
     }
+    my $standard_name = &standard_parameter_names($name);
     return '<p class="LC_warning">'.
-           &mt('Question Type was [_1]not[_2] set to [_3].',
-           '<b>','</b>','"'.$desc.'"').'<br />'.
+           &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).
@@ -4619,7 +4682,7 @@ sub handler {
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
-                        text=>"Content and Problem Settings",
+                        text=>"Parameter Manager",
                         faq=>10,
                         bug=>'Instructor Interface',
                                             help =>