--- loncom/interface/lonparmset.pm	2011/10/07 15:25:40	1.505.2.1
+++ loncom/interface/lonparmset.pm	2012/12/14 00:46:21	1.522.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.505.2.1 2011/10/07 15:25:40 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.4 2012/12/14 00:46:21 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):
@@ -302,6 +310,7 @@ use Apache::lonlocal;
 use Apache::lonnavmaps;
 use Apache::longroup;
 use Apache::lonrss;
+use HTML::Entities;
 use LONCAPA qw(:DEFAULT :match);
 
 
@@ -631,7 +640,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 {
@@ -738,11 +747,14 @@ sub valout {
     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').'" />';
+        } else {
+            $result='&nbsp;';
+        }
     } else {
         if ($type eq 'date_interval') {
             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
@@ -783,6 +795,7 @@ sub valout {
         &date_sanity_info($value);
         } else {
             $result = $value;
+            $result=~s/\,/\, /gs;
         $result = &HTML::Entities::encode($result,'"<>&');
         }
     }
@@ -824,16 +837,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();
@@ -868,12 +875,36 @@ $selscript
 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'})) {
@@ -884,20 +915,30 @@ 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);
     $r->print(<<ENDHEAD);
-$start_page
-$breadcrumbs
 <form method="post" action="/adm/parmset?action=settable" name="parmform">
 <input type="hidden" value="" name="pres_value" />
 <input type="hidden" value="" name="pres_type" />
 <input type="hidden" value="" name="pres_marker" />
 <input type="hidden" value="1" name="prevvisit" />
+<input type="hidden" value="$escfilter" name="filter" />
+<input type="hidden" value="$escpart" name="part" />
 ENDHEAD
 }
 
@@ -930,7 +971,7 @@ sub print_row {
 
     if ($parmlev eq 'full') {
         $r->print('<td style="background-color:'.$defbgtwo.';" align="center">'
-                  .$$part{$which}.'</td>');
+                  .($$part{$which} eq '0'?'0 ('.&mt('default').')':$$part{$which}).'</td>');
     } else {
         $parm=~s|\[.*\]\s||g;
     }
@@ -1138,6 +1179,7 @@ sub extractResourceInformation {
         $$typep{$id}=$1;
         $$keyp{$id}='';
         $$uris{$id}=$srcf;
+
         foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
             next if ($key!~/^parameter_/);
 
@@ -1237,14 +1279,12 @@ sub parmmenu {
             ele = document.forms.parmform.elements[i];
             if (ele.name == checkName) {
                 document.forms.parmform.elements[i].checked=value;
-                document.getElementById(document.forms.parmform.elements[i].value.concat(li)).style.display = displayOverview;
             }
         }
     }
 
     function checkthis(thisvalue, checkName) {
 
-        document.getElementById(thisvalue.concat("_li")).style.display = "";        
 
     for (i=0; i<document.forms.parmform.elements.length; i++) {
             ele = document.forms.parmform.elements[i];
@@ -1263,8 +1303,9 @@ sub parmmenu {
     }
 
     function checkdisset() {
-    checkthis('discussend','pscat');
+     checkthis('discussend','pscat');
      checkthis('discusshide','pscat');
+     checkthis('discussvote','pscat');
     }
 
     function checkcontdates() {
@@ -1295,57 +1336,13 @@ sub parmmenu {
     checkthis('problemstatus','pscat');
     }
 
-    function hideParms() {
-        document.getElementById('LC_parm_overview_parm_menu').style.display = "none";
-    }
-
-    function showParms() {
-        document.getElementById('LC_parm_overview_parm_menu').style.display = "";
-    }
-
-    function checkboxChecked(id) {
-        var li = "_li";
-        var id_li = id.concat(li);
-        if (document.getElementById(id_li).style.display == "none") {
-            document.getElementById(id_li).style.display = "";
-        }
-        else {
-            document.getElementById(id_li).style.display = "none";
-        }
-    }
 // ]]>
 </script>
 ENDSCRIPT
-    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
-
-    #part to print selected parms overview
-    $r->print(&mt('Selected Parameters:').'<br />');
-
-    #print out all possible parms and hide them by default
-    $r->print('<ul class="LC_parm_parmlist">');
-    foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
-        $r->print('<li id="'.$tempkey.'_li" value="'.$tempkey.'_li" name="pscat_li"');
-        if (!($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat})) {
-            $r->print(' style="display:none"');
-        }
-        $r->print('>'
-                 .($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey} : $tempkey)
-                 .'</li>'
-        );
-    }
-    $r->print('</ul>');
 
     $r->print('<hr />');
     &shortCuts($r,$allparms,$pscat,$keyorder);
     $r->print('<hr />');
-
-    $r->print(
-        '<p><a href="javascript:showParms()">'
-       .&mt('Show detailed Parameter Selection')
-       .'</a></p>'
-    );
-
-    $r->print(&Apache::lonhtmlcommon::row_closure(1));
 }
 # return a hash
 sub categories {
@@ -1372,6 +1369,8 @@ sub lookUpTableParameter {
         'contentopen' => 'time_settings',
         'contentclose' => 'time_settings',
         'discussend' => 'time_settings',
+	'printopendate' => 'time_settings',
+	'printclosedate' => 'time_settings',
         'weight' => 'grading',
         'handgrade' => 'grading',
         'maxtries' => 'tries',
@@ -1403,6 +1402,9 @@ sub lookUpTableParameter {
         'acc' => 'misc',
         'maxcollaborators' => 'misc',
         'scoreformat' => 'misc',
+        'lenient' => 'grading',
+        'retrypartial' => 'tries',
+        'discussvote'  => 'misc',
 
     );    
 }
@@ -1471,24 +1473,12 @@ sub parmboxes {
         'file_submission' => [],
         'misc' => [],
     );
-    my $hidelink =
-        '<p>'
-       .'<a href="javascript:hideParms()">'
-       .&mt('Hide detailed Parameter Selection')
-       .'</a>'
-       .'</p>'
-       ."\n";
-;
+
     foreach $tempparameter (keys %$allparms) {
         &whatIsMyCategory($tempparameter, \%categoryList);
     }
     #part to print the parm-list
-    $r->print(
-        '<div id="LC_parm_overview_parm_menu" class="LC_Box" style="display:none">'."\n"
-       .'<h3>'.&mt('Parameter').'</h3>'."\n"
-       .$hidelink
-       .'<div class="LC_columnSection">'."\n"
-    );
+    $r->print('<div class="LC_columnSection">'."\n");
 
     #Print parameters
     for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
@@ -1503,7 +1493,6 @@ sub parmboxes {
                     $r->print('<span class="LC_nobreak">'
                              .'<label><input type="checkbox" name="pscat" ');
                 $r->print('value="'.$tempkey.'" ');
-                $r->print('onclick="checkboxChecked(\''.$tempkey.'\')"');
                 if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
                     $r->print(' checked="checked"');
                 }
@@ -1515,12 +1504,7 @@ sub parmboxes {
         }
     }
 
-    #&shortCuts($r,$allparms,$pscat,$keyorder);
-    $r->print(
-        "</div>\n"
-       .$hidelink
-       ."</div>\n"
-    );
+    $r->print("</div>\n");
 }
 #
 # This function offers some links on the parameter section to get with one click a group a parameters
@@ -1559,8 +1543,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>');
@@ -1681,11 +1669,19 @@ function group_or_section(caller) {
 # This function shows on table Mode the available Parameters for the selected Resources
 #
 sub displaymenu {
-    my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;
+    my ($r,$allparms,$pscat,$psprt,$keyorder)=@_;
+
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
+
     &parmmenu($r,$allparms,$pscat,$keyorder);
-    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+    $r->print(&Apache::loncommon::start_scrollbox());
     &parmboxes($r,$allparms,$pscat,$keyorder);
+    $r->print(&Apache::loncommon::end_scrollbox());
+
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ 
 }
 
 sub mapmenu {
@@ -1749,15 +1745,16 @@ sub mapmenu {
         $r->print(
             '<div class="LC_info">'
            .&mt('You can only select maps and folders which have modifiable settings.')
-           .' '.&Apache::loncommon::help_open_topic('Parameter_Set_Folder')
+           .' '.&Apache::loncommon::help_open_topic('Parameter_Set_Folder') 
            .'</div>'
         );
 
-        $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"'
@@ -1832,7 +1829,9 @@ sub mapmenu {
             );
         }
 
-        $r->print(&Apache::loncommon::end_data_table());
+        $r->print(&Apache::loncommon::end_data_table().
+                  '<br style="line-height:2px;" />'.
+                  &Apache::loncommon::end_scrollbox());
     }
 }
 
@@ -1958,8 +1957,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);
 }
 
 
@@ -1967,6 +1969,9 @@ sub assessparms {
 
     my $r=shift;
 
+
+
+# -------------------------------------------------------- Variable declaration
     my @ids=();
     my %symbp=();
     my %mapp=();
@@ -1974,9 +1979,6 @@ sub assessparms {
     my %keyp=();
     my %uris=();
     my %maptitles=();
-
-# -------------------------------------------------------- Variable declaration
-
     my %allmaps=();
     my %alllevs=();
 
@@ -1995,14 +1997,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='';
 
@@ -2019,8 +2023,11 @@ sub assessparms {
 
     my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
     my $pschp=$env{'form.pschp'};
+
+
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
+    if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }
 
     my $pssymb='';
     my $parmlev='';
@@ -2121,8 +2128,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);
@@ -2153,22 +2162,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]),
@@ -2192,7 +2202,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') {
@@ -2224,27 +2234,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 +2253,11 @@ COURSECONTENTSCRIPT
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
 
         # Step 2
-        $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification')));
-        &displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
+        $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));
@@ -2268,7 +2266,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>');
@@ -2284,6 +2282,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);
@@ -2304,7 +2303,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>');
     }
@@ -2330,13 +2329,19 @@ COURSECONTENTSCRIPT
         my $csudom=$env{'user.domain'};
 
         if ($parmlev eq 'full') {
+#
+# This produces the cascading table output of parameters
+#
                my $coursespan=$csec?8:5;
                my $userspan=3;
                if ($cgroup ne '') {
                   $coursespan += 3;
                }
 
-               $r->print('<p><table border="2">');
+               $r->print(&Apache::loncommon::start_data_table());
+#
+# This produces the headers
+#
                $r->print('<tr><td colspan="5"></td>');
                $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
                if ($uname) {
@@ -2400,7 +2405,9 @@ ENDTABLEHEADFOUR
                }
 
                $r->print('</tr>');
-
+#
+# Done with the headers
+# 
                my $defbgone='';
                my $defbgtwo='';
                my $defbgthree = '';
@@ -2440,11 +2447,18 @@ ENDTABLEHEADFOUR
                     my %default=();
                     my $uri=&Apache::lonnet::declutter($uris{$rid});
 
+                    my $filter=$env{'form.filter'};
                     foreach (&keysplit($keyp{$rid})) {
                         my $tempkeyp = $_;
                         if (grep $_ eq $tempkeyp, @catmarker) {
+                          my $parmname=&Apache::lonnet::metadata($uri,$_.'.name');
+# We may only want certain parameters listed
+                          if ($filter) {
+                             unless ($filter=~/\Q$parmname\E/) { next; }
+                          }
+                          $name{$_}=$parmname;
                           $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
-                          $name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
+
                           my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
                           if ($allparms{$name{$_}} ne '') {
                               my $identifier;
@@ -2488,8 +2502,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 {
@@ -2504,7 +2518,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') {
@@ -2720,7 +2734,8 @@ ENDMAPONE
             );
         } # end of $parmlev eq general
     }
-    $r->print('</form>'.&Apache::loncommon::end_page());
+    $r->print('</form>');
+    $r->print(&Apache::loncommon::end_page());
 } # end sub assessparms
 
 ##################################################
@@ -2793,25 +2808,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;
                 }
@@ -3046,7 +3074,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}));
         }
@@ -3120,6 +3148,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 {
@@ -3131,33 +3167,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;
@@ -3250,11 +3290,24 @@ 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);
     $r->print(<<ENDOVER);
-$start_page
-$breadcrumbs
 <form method="post" action="/adm/parmset?action=newoverview" name="parmform">
 ENDOVER
     my @ids=();
@@ -3280,6 +3333,7 @@ ENDOVER
 
     my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
     my $pschp=$env{'form.pschp'};
+
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
 
@@ -3315,7 +3369,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());
@@ -3327,10 +3381,7 @@ ENDOVER
 
     $r->print('<div class="LC_Box">');
     $r->print('<div>');
-    $r->print(&Apache::lonhtmlcommon::start_pick_box());
-    &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-    $r->print(&Apache::lonhtmlcommon::end_pick_box());
-    &parmboxes($r,\%allparms,\@pscat,\%keyorder);
+    &displaymenu($r,\%allparms,\@pscat,\%keyorder);
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
     $r->print('<table>'.
@@ -3380,7 +3431,8 @@ ENDOVER
     }
     $r->print(&tableend().
          ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
-          '</form>'.&Apache::loncommon::end_page());
+          '</form>');
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub secgroup_lister {
@@ -3427,11 +3479,9 @@ sub overview {
     text=>"Overview Mode"});
     my $start_page=&Apache::loncommon::start_page('Modify Parameters');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
-    $r->print(<<ENDOVER);
-$start_page
-$breadcrumbs
-<form method="post" action="/adm/parmset?action=setoverview" name="parmform">
-ENDOVER
+    $r->print($start_page.$breadcrumbs);
+    $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');
+
 # Store modified
 
     &storedata($r,$crs,$dom);
@@ -3450,7 +3500,7 @@ ENDOVER
     my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
 
     $r->print(&tableend().'<p>'.
-    ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':&mt('There are no parameters.')).'</p></form>'.
+    ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':'<span class="LC_info">'.&mt('There are no parameters.').'</span>').'</p></form>'.
           &Apache::loncommon::end_page());
 }
 
@@ -3536,8 +3586,8 @@ ENDOVER
     }
     $r->print(&Apache::loncommon::end_data_table().'<p>'.
           '<input type="submit" value="'.&mt('Delete Selected').'" />'.
-          '</p></form>'.
-          &Apache::loncommon::end_page());
+          '</p></form>');
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub date_shift_one {
@@ -3549,15 +3599,13 @@ sub date_shift_one {
         text=>"Shifting Dates"});
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
-    $r->print(<<ENDOVER);
-$start_page
-$breadcrumbs
-ENDOVER
+    $r->print($start_page.$breadcrumbs);
     $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'},,
                                                         '').
@@ -3576,10 +3624,7 @@ sub date_shift_two {
         text=>"Shifting Dates"});
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
-    $r->print(<<ENDOVER);
-$start_page
-$breadcrumbs
-ENDOVER
+    $r->print($start_page.$breadcrumbs);
     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'}),
@@ -3630,7 +3675,7 @@ sub parse_key {
 
 
 sub header {
-    return &Apache::loncommon::start_page('Parameter Manager');
+    return &Apache::loncommon::start_page('Content and Problem Settings');
 }
 
 
@@ -3639,7 +3684,7 @@ sub print_main_menu {
     my ($r,$parm_permission)=@_;
     #
     $r->print(&header());
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content and Problem Settings'));
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -3649,12 +3694,17 @@ 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);
 
     my @menu =
-        ( { categorytitle=>"Settings for this $crstype",
+        ( { categorytitle=>"Content Settings for this $crstype",
         items => [
           { linktext => 'Portfolio Metadata',
             url => '/adm/parmset?action=setrestrictmeta',
@@ -3668,7 +3718,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,
@@ -4048,11 +4103,8 @@ sub defaultsetter {
     my $start_page =
     &Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
-    $r->print(<<ENDDEFHEAD);
-$start_page
-$breadcrumbs
-<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">
-ENDDEFHEAD
+    $r->print($start_page.$breadcrumbs);
+    $r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -4197,8 +4249,8 @@ ENDYESNO
     }
     $r->print(&Apache::loncommon::end_data_table().
           "\n".'<input type="submit" name="storerules" value="'.
-          &mt('Save').'" /></form>'."\n".
-          &Apache::loncommon::end_page());
+          &mt('Save').'" /></form>'."\n");
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -4288,16 +4340,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'));
-
     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',);
@@ -4305,10 +4363,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'});
@@ -4505,10 +4562,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;
@@ -4539,9 +4596,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);
             }
         }
@@ -4555,7 +4612,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 +4621,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).
@@ -4613,12 +4679,13 @@ sub handler {
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
+                                             'filter','part',
                                              'udom','uname','symb','serial','timebase']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
-                        text=>"Parameter Manager",
+                        text=>"Content and Problem Settings",
                         faq=>10,
                         bug=>'Instructor Interface',
                                             help =>