--- loncom/interface/lonparmset.pm	2007/12/01 03:45:17	1.388
+++ loncom/interface/lonparmset.pm	2008/12/03 21:20:57	1.418
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.388 2007/12/01 03:45:17 albertel Exp $
+# $Id: lonparmset.pm,v 1.418 2008/12/03 21:20:57 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,36 +44,11 @@ This module sets coursewide and assessme
 
 =head1 INTERNAL SUBROUTINES
 
-=over 4
-
-=cut
-
-###################################################################
-###################################################################
-
-package Apache::lonparmset;
-
-use strict;
-use Apache::lonnet;
-use Apache::Constants qw(:common :http REDIRECT);
-use Apache::lonhtmlcommon();
-use Apache::loncommon;
-use GDBM_File;
-use Apache::lonhomework;
-use Apache::lonxml;
-use Apache::lonlocal;
-use Apache::lonnavmaps;
-use Apache::longroup;
-use Apache::lonrss;
-use LONCAPA qw(:DEFAULT :match);
-
-
-##################################################
-##################################################
+=over
 
 =pod
 
-=item parmval
+=item parmval()
 
 Figure out a cascading parameter.
 
@@ -98,9 +73,282 @@ Returns:  A list, the first item is the
 2 - Map or Folder level for specific student
 1 - resource level for specific student
 
+=item parmval_by_symb()
+
+=item reset_caches()
+
+=item cacheparmhash() 
+
+=item parmhash()
+
+=item symbcache()
+
+=item preset_defaults()
+
+=item date_sanity_info()
+
+=item storeparm()
+
+Store a parameter by symb
+
+    Takes
+    - symb
+    - name of parameter
+    - level
+    - new value
+    - new type
+    - username
+    - userdomain
+
+=item log_parmset()
+
+=item storeparm_by_symb_inner()
+
+=item valout()
+
+Format a value for output.
+
+Inputs:  $value, $type, $editable
+
+Returns: $value, formatted for output.  If $type indicates it is a date,
+localtime($value) is returned.
+$editable will return an icon to click on
+
+=item plink()
+
+Produces a link anchor.
+
+Inputs: $type,$dis,$value,$marker,$return,$call
+
+Returns: scalar with html code for a link which will envoke the 
+javascript function 'pjump'.
+
+=item page_js()
+
+=item startpage()
+
+=item print_row()
+
+=item print_td()
+
+=item print_usergroups()
+
+=item parm_control_group()
+
+=item extractResourceInformation() : 
+
+Given the course data hash, extractResourceInformation extracts lots of information about 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<typep> : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
+
+=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<allparms> : hash, name of parameter->display value (what is the display value?)
+
+=item * B<allparts> : hash, part identification->text representation of part, where the text representation is "[Part $part]"
+
+=item * B<allkeys> : hash, full key to part->display value (what's display value?)
+
+=item * B<allmaps> : hash, ???
+
+=item * B<fcat> : ???
+
+=item * B<defp> : hash, ???
+
+=item * B<mapp> : ??
+
+=item * B<symbp> : hash, id->full sym?
+
+
+
+=item isdateparm()
+
+=item parmmenu()
+
+=item partmenu()
+
+=item usermenu()
+
+=item displaymenu()
+
+=item mapmenu()
+
+=item levelmenu()
+
+=item sectionmenu()
+
+=item keysplit()
+
+=item keysinorder()
+
+=item keysinorder_bytype()
+
+=item keysindisplayorder()
+
+=item standardkeyorder()
+
+=item assessparms() : 
+
+Show assessment data and parameters.  This is a large routine that should
+be simplified and shortened... someday.
+
+Inputs: $r
+
+Returns: nothing
+
+Variables used (guessed by Jeremy):
+
+=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?
+
+=item * B<@catmarker> contains list of all possible parameters including part #s
+
+=item * B<$fullkeyp> contains the full part/id # for the extraction of proper parameters
+
+=item * B<$tempkeyp> contains part 0 only (no ids - ie, subparts)
+        When storing information, store as part 0
+        When requesting information, request from full part
+
+=item crsenv()
+
+Show and set course data and parameters.  This is a large routine that should
+be simplified and shortened... someday.
+
+Inputs: $r
+
+Returns: nothing
+
+=item can_modify_catsettings()
+
+=item assign_course_categories()
+
+=item tablestart()
+
+=item tableend()
+
+=item extractuser()
+
+=item parse_listdata_key()
+
+=item listdata()
+
+=item date_interval_selector()
+
+=item get_date_interval_from_form()
+
+=item default_selector()
+
+=item string_selector()
+
+=item dateshift()
+
+=item newoverview()
+
+=item secgroup_lister()
+
+=item overview()
+
+=item clean_parameters()
+
+=item date_shift_one()
+
+=item date_shift_two()
+
+=item parse_key()
+
+=item check_cloners() :
+
+Checks if new users included in list of allowed cloners
+are valid users.  Replaces supplied list with 
+cleaned list containing only users with valid usernames
+and domains.
+
+Inputs: $clonelist, $oldcloner 
+where $clonelist is ref to array of requested cloners,
+and $oldcloner is ref to array of currently allowed
+cloners.
+
+Returns: string - comma separated list of requested
+cloners (username:domain) who do not exist in system.
+
+=item change_clone() :
+
+Modifies the list of courses a user can clone (stored
+in the user's environment.db file), called when a
+change is made to the list of users allowed to clone
+a course.
+
+Inputs: $action,$cloner
+where $action is add or drop, and $cloner is identity of 
+user for whom cloning ability is to be changed in course. 
+
+
+=item check_cloners()
+
+=item change_clone()
+
+=item header()
+
+Output html header for page
+
+=item print_main_menu()
+
+=item output_row()
+
+Set portfolio metadata
+
+=item order_meta_fields()
+
+=item addmetafield()
+
+=item setrestrictmeta()
+
+=item get_added_meta_fieldnames()
+
+=item get_deleted_meta_fieldnames()
+
+=item defaultsetter()
+
+=item components()
+
+=item load_parameter_names()
+
+=item parm_change_log()
+
+=item handler() : 
+
+Main handler.  Calls &assessparms and &crsenv subroutines.
+
+
+=back
+
 =cut
 
-##################################################
+###################################################################
+###################################################################
+
+package Apache::lonparmset;
+
+use strict;
+use Apache::lonnet;
+use Apache::Constants qw(:common :http REDIRECT);
+use Apache::lonhtmlcommon();
+use Apache::loncommon;
+use GDBM_File;
+use Apache::lonhomework;
+use Apache::lonxml;
+use Apache::lonlocal;
+use Apache::lonnavmaps;
+use Apache::longroup;
+use Apache::lonrss;
+use LONCAPA qw(:DEFAULT :match);
+
+
 sub parmval {
     my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
     return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
@@ -302,6 +550,8 @@ sub reset_caches {
     }
 }
 
+
+
 sub preset_defaults {
     my $type=shift;
     if (&rulescache($type.'_action') eq 'default') {
@@ -316,7 +566,8 @@ sub preset_defaults {
     }
 }
 
-##################################################
+
+
 
 sub date_sanity_info {
    my $checkdate=shift;
@@ -325,14 +576,31 @@ sub date_sanity_info {
    my $crsprefix='course.'.$env{'request.course.id'}.'.';
    if ($env{$crsprefix.'default_enrollment_end_date'}) {
       if ($checkdate>$env{$crsprefix.'default_enrollment_end_date'}) {
-         $result.='<br />'.&mt('After course enrollment end!');
+         $result.='<div class="LC_warning">'
+                 .&mt('After course enrollment end!')
+                 .'</div>';
       }
    }
    if ($env{$crsprefix.'default_enrollment_start_date'}) {
       if ($checkdate<$env{$crsprefix.'default_enrollment_start_date'}) {
-         $result.='<br />'.&mt('Before course enrollment start!');
+         $result.='<div class="LC_warning">'
+                 .&mt('Before course enrollment start!')
+                 .'</div>';
       }
    }
+# Preparation for additional warnings about dates in the past/future.
+# An improved, more context sensitive version is recommended,
+# e.g. warn for due and answer dates which are defined before the corresponding open date, etc.
+#   if ($checkdate<time) {
+#      $result.='<div class="LC_info">'
+#              .'('.&mt('in the past').')'
+#              .'</div>';
+#      }
+#   if ($checkdate>time) {
+#      $result.='<div class="LC_info">'
+#              .'('.&mt('in the future').')'
+#              .'</div>';
+#      }
    return $result;
 }
 ##################################################
@@ -354,17 +622,6 @@ sub storeparm {
     &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,'',$cgroup);
 }
 
-#
-# Store a parameter by symb
-#
-# Takes
-# - symb
-# - name of parameter
-# - level
-# - new value
-# - new type
-# - username
-# - userdomain
 my %recstack;
 sub storeparm_by_symb {
     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
@@ -519,25 +776,7 @@ sub storeparm_by_symb_inner {
     return '';
 }
 
-##################################################
-##################################################
-
-=pod
 
-=item valout
-
-Format a value for output.
-
-Inputs:  $value, $type, $editable
-
-Returns: $value, formatted for output.  If $type indicates it is a date,
-localtime($value) is returned.
-$editable will return an icon to click on
-
-=cut
-
-##################################################
-##################################################
 sub valout {
     my ($value,$type,$editable)=@_;
     my $result = '';
@@ -551,27 +790,38 @@ sub valout {
     } else {
         if ($type eq 'date_interval') {
             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+            my @timer;
             $year=$year-70;
             $mday--;
             if ($year) {
-		$result.=$year.' yrs ';
+#               $result.=&mt('[quant,_1,yr]',$year).' ';
+                push(@timer,&mt('[quant,_1,yr]',$year));
             }
             if ($mon) {
-		$result.=$mon.' mths ';
+#               $result.=&mt('[quant,_1,mth]',$mon).' ';
+                push(@timer,&mt('[quant,_1,mth]',$mon));
             }
             if ($mday) {
-		$result.=$mday.' days ';
+#               $result.=&mt('[quant,_1,day]',$mday).' ';
+                push(@timer,&mt('[quant,_1,day]',$mday));
             }
             if ($hour) {
-		$result.=$hour.' hrs ';
+#               $result.=&mt('[quant,_1,hr]',$hour).' ';
+                push(@timer,&mt('[quant,_1,hr]',$hour));
             }
             if ($min) {
-		$result.=$min.' mins ';
+#               $result.=&mt('[quant,_1,min]',$min).' ';
+                push(@timer,&mt('[quant,_1,min]',$min));
             }
             if ($sec) {
-		$result.=$sec.' secs ';
+#               $result.=&mt('[quant,_1,sec]',$sec).' ';
+                push(@timer,&mt('[quant,_1,sec]',$sec));
+            }
+#           $result=~s/\s+$//;
+            if (!@timer) { # Special case: all entries 0 -> display "0 secs" intead of empty field to keep this field editable
+                push(@timer,&mt('[quant,_1,sec]',0));
             }
-            $result=~s/\s+$//;
+            $result.=join(", ",@timer);
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
 		&date_sanity_info($value);
@@ -583,24 +833,7 @@ sub valout {
     return $result;
 }
 
-##################################################
-##################################################
-
-=pod
-
-=item plink
 
-Produces a link anchor.
-
-Inputs: $type,$dis,$value,$marker,$return,$call
-
-Returns: scalar with html code for a link which will envoke the 
-javascript function 'pjump'.
-
-=cut
-
-##################################################
-##################################################
 sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     my $winvalue=$value;
@@ -683,6 +916,15 @@ sub startpage {
     my %loaditems = ('onunload' => "pclose()",
 		     'onload'   => "group_or_section('cgroup')",);
 
+    if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+	&Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
+	    text=>"Problem Parameters"});
+    } else {
+	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+	   text=>"Table Mode",
+	   help => 'Course_Setting_Parameters'});
+    }
     my $start_page = 
 	&Apache::loncommon::start_page('Set/Modify Course Parameters',
 				       &page_js(),
@@ -899,39 +1141,7 @@ sub parm_control_group {
     return($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
 }
 
-=pod
 
-=item B<extractResourceInformation>: Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
-
-Input: See list below:
-
-=over 4
-
-=item B<ids>: An array that will contain all of the ids in the course.
-
-=item B<typep>: hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
-
-=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<allparms>: hash, name of parameter->display value (what is the display value?)
-
-=item B<allparts>: hash, part identification->text representation of part, where the text representation is "[Part $part]"
-
-=item B<allkeys>: hash, full key to part->display value (what's display value?)
-
-=item B<allmaps>: hash, ???
-
-=item B<fcat>: ???
-
-=item B<defp>: hash, ???
-
-=item B<mapp>: ??
-
-=item B<symbp>: hash, id->full sym?
-
-=back
-
-=cut
 
 sub extractResourceInformation {
     my $ids = shift;
@@ -973,7 +1183,7 @@ sub extractResourceInformation {
 	    if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
 		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
 		my $parmdis = $display;
-		$parmdis =~ s/\[Part.*$//g;
+		$parmdis =~ s/\s*\[Part.*$//g;
 		$$allparms{$name}=$parmdis;
 		if (ref($defkeytype)) {
 		    $$defkeytype{$name}=
@@ -985,7 +1195,7 @@ sub extractResourceInformation {
 # allparts is a hash of all parts
 #
 	    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
-	    $$allparts{$part} = "Part: $part";
+	    $$allparts{$part} = &mt('Part: [_1]',$part);
 #
 # Remember all keys going with this resource
 #
@@ -1010,7 +1220,7 @@ sub extractResourceInformation {
 	    $$mapp{$mapid}=$$mapp{$id};
 	    $$allmaps{$mapid}=$$mapp{$id};
 	    if ($mapid eq '1') {
-		$$maptitles{$mapid}='Main Course Documents';
+		$$maptitles{$mapid}=&mt('Main Course Documents');
 	    } else {
 		$$maptitles{$mapid}=
 		    &Apache::lonnet::gettitle($$mapp{$id});    
@@ -1025,8 +1235,6 @@ sub extractResourceInformation {
 }
 
 
-##################################################
-##################################################
 
 sub isdateparm {
     my $type=shift;
@@ -1107,8 +1315,8 @@ ENDSCRIPT
 	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
 	    $r->print(' checked');
 	}
-	$r->print('>'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
-		                                  : $tempkey)
+	$r->print('>'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
+		                                  : &mt($tempkey))
 		  .'</label></td>');
  	$cnt++;
         if ($cnt==3) {
@@ -1116,28 +1324,53 @@ ENDSCRIPT
 	    $cnt=0;
 	}
     }
-    $r->print('
-</tr><tr id=\"LC_parm_overview_parm_menu_selectors\"><td>
-<a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
-<a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
-</td><td>
-<a href="javascript:checkdates()">Add&nbsp;Problem&nbsp;Dates</a>
-<a href="javascript:checkcontdates()">Add&nbsp;Content&nbsp;Dates</a><br />
-<a href="javascript:checkdisset()">Add&nbsp;Discussion&nbsp;Settings</a>
-<a href="javascript:checkvisi()">Add&nbsp;Visibilities</a><br />
-<a href="javascript:checkparts()">Add&nbsp;Part&nbsp;Parameters</a>
-</td><td>
-<a href="javascript:checkall(false, \'pscat\')">Unselect&nbsp;All</a>
-</td>
-');
-    $r->print('</tr></table>');
+    $r->print('</tr>'
+             .'<tr id=\"LC_parm_overview_parm_menu_selectors\">'
+             .'<td valign="top">'
+             .'<fieldset><legend><b>'.&mt('Parameter Selection').'</b></legend>'
+             .'<span class="LC_nobreak">'
+             .'&bull; <a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>'
+             .'</span>'
+             .'<br />'
+             .'<span class="LC_nobreak">'
+             .'&bull; <a href="javascript:checkstandard()">'.&mt('Select Common Only').'</a>'
+             .'</span>'
+             .'<br />'
+             .'<span class="LC_nobreak">'
+             .'&bull; <a href="javascript:checkall(false, \'pscat\')">'.&mt('Unselect All').'</a>'
+             .'</span>'
+             .'</fieldset>'
+             .'</td>'
+             .'<td colspan="2" valign="top">'
+             .'<fieldset><legend><b>'.&mt('Add Selection for...').'</b></legend>'
+             .'<span class="LC_nobreak">'
+             .'&bull; <a href="javascript:checkdates()">'.&mt('Problem Dates').'</a>'
+             .'</span>'
+             .'<span class="LC_nobreak">'
+             .' &bull; <a href="javascript:checkcontdates()">'.&mt('Content Dates').'</a>'
+             .'</span>'
+#            .'<br />'
+             .'<span class="LC_nobreak">'
+             .' &bull; <a href="javascript:checkdisset()">'.&mt('Discussion Settings').'</a>'
+             .'</span>'
+             .'<span class="LC_nobreak">'
+             .' &bull; <a href="javascript:checkvisi()">'.&mt('Visibilities').'</a>'
+             .'</span>'
+#            .'<br />'
+             .'<span class="LC_nobreak">'
+             .' &bull; <a href="javascript:checkparts()">'.&mt('Part Parameters').'</a>'
+             .'</span>'
+             .'</fieldset>'
+             .'</td>'
+             .'</tr></table>'
+    );
 }
 
 sub partmenu {
     my ($r,$allparts,$psprt)=@_;
     $r->print('<select multiple name="psprt" size="8">');
     $r->print('<option value="all"');
-    $r->print(' selected') unless (@{$psprt});
+    $r->print(' selected="selected"') unless (@{$psprt});
     $r->print('>'.&mt('All Parts').'</option>');
     my %temphash=();
     foreach (@{$psprt}) { $temphash{$_}=1; }
@@ -1147,7 +1380,7 @@ sub partmenu {
 	unless ($tempkey =~ /\./) {
 	    $r->print('<option value="'.$tempkey.'"');
 	    if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
-		$r->print(' selected');
+		$r->print(' selected="selected"');
 	    }
 	    $r->print('>'.$$allparts{$tempkey}.'</option>');
 	}
@@ -1160,21 +1393,18 @@ sub usermenu {
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
-    my %lt=&Apache::lonlocal::texthash(
-		    'se'    => "Section",
-                    'gr'    => "Group",
-		    'fu'    => "For User",
-		    'oi'    => "or ID",
-		    'ad'    => "at Domain"
-				       );
+
     my $sections='';
     my %sectionhash = &Apache::loncommon::get_sections();
 
     my $groups;
     my %grouphash = &Apache::longroup::coursegroups();
 
+    my $g_s_header='';
+    my $g_s_footer='';
+
     if (%sectionhash) {
-        $sections=$lt{'se'}.': <select name="csec"';
+        $sections=&mt('Section:').' <select name="csec"';
         if (%grouphash && $parmlev ne 'full') {
             $sections .= qq| onchange="group_or_section('csec')" |;
         }
@@ -1186,8 +1416,9 @@ sub usermenu {
         }
         $sections.='</select>';
     }
+
     if (%sectionhash && %grouphash && $parmlev ne 'full') {
-        $sections .= '&nbsp;or&nbsp;';
+        $sections .= '&nbsp;'.&mt('or').'&nbsp;';
         $sections .= qq|
 <script type="text/javascript">
 function group_or_section(caller) {
@@ -1214,7 +1445,7 @@ function group_or_section(caller) {
     } 
 
     if (%grouphash) {
-        $groups=$lt{'gr'}.': <select name="cgroup"';
+        $groups=&mt('Group:').' <select name="cgroup"';
         if (%sectionhash && $env{'form.action'} eq 'settable') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
@@ -1236,19 +1467,25 @@ function group_or_section(caller) {
         }
         $groups.='</select>';
     }
-    $r->print(<<ENDMENU);
-<b>
-$sections
-$groups
-<br />
-$lt{'fu'} 
-<input type="text" value="$uname" size="12" name="uname" />
-$lt{'oi'}
-<input type="text" value="$id" size="12" name="id" /> 
-$lt{'ad'}
-$chooseopt
-</b>
-ENDMENU
+
+    if (%sectionhash || %grouphash) {
+        $g_s_header='<fieldset><legend>'.&mt('Group/Section').'</legend><div>';
+        $g_s_footer='</div></fieldset>';
+    }
+
+    $r->print('<b>'
+             .$g_s_header
+             .$sections
+             .$groups
+             .$g_s_footer
+             .'<fieldset><legend>'.&mt('User').'</legend><div>'
+             .&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+                 ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
+                 ,'<input type="text" value="'.$id.'" size="12" name="id" /> '
+                 ,$chooseopt)
+             .'</div></fieldset>'
+             .'</b>'
+    );
 }
 
 sub displaymenu {
@@ -1256,7 +1493,7 @@ sub displaymenu {
     $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
 	     &mt('Select Parts to View').'</th></tr><tr><td>');  
     &parmmenu($r,$allparms,$pscat,$keyorder);
-    $r->print('</td><td>');
+    $r->print('</td><td valign="top" align="center">');
     &partmenu($r,$allparts,$psprt);
     $r->print('</td></tr></table>');
 }
@@ -1268,7 +1505,7 @@ sub mapmenu {
     $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
     foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
 	$r->print('<option value="'.$_.'"');
-	if (($pschp eq $_)) { $r->print(' selected'); }
+	if (($pschp eq $_)) { $r->print(' selected="selected"'); }
 	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
     }
     $r->print("</select>");
@@ -1282,9 +1519,9 @@ sub levelmenu {
     foreach (reverse sort keys %{$alllevs}) {
 	$r->print('<option value="'.$$alllevs{$_}.'"');
 	if ($parmlev eq $$alllevs{$_}) {
-	    $r->print(' selected'); 
+	    $r->print(' selected="selected"'); 
 	}
-	$r->print('>'.$_.'</option>');
+	$r->print('>'.&mt($_).'</option>');
     }
     $r->print("</select>");
 }
@@ -1300,7 +1537,7 @@ sub sectionmenu {
 	$r->print('    <option value="'.$s.'"');
 	foreach (@{$selectedsections}) {
 	    if ($s eq $_) {
-		$r->print(' selected');
+		$r->print(' selected="selected"');
 		last;
 	    }
 	}
@@ -1319,7 +1556,7 @@ sub groupmenu {
 	$r->print('    <option value="'.$group.'"');
 	foreach (@{$selectedgroups}) {
 	    if ($group eq $_) {
-		$r->print(' selected');
+		$r->print(' selected="selected"');
 		last;
 	    }
 	}
@@ -1398,36 +1635,7 @@ sub standardkeyorder {
             'parameter_0_discusshide' => 20);
 }
 
-##################################################
-##################################################
-
-=pod
-
-=item assessparms
-
-Show assessment data and parameters.  This is a large routine that should
-be simplified and shortened... someday.
-
-Inputs: $r
-
-Returns: nothing
-
-Variables used (guessed by Jeremy):
-
-=over 4
-
-=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?
-
-=item B<allmaps>:
-
-=back
-
-=cut
 
-##################################################
-##################################################
 sub assessparms {
 
     my $r=shift;
@@ -1881,29 +2089,30 @@ ENDTABLEHEADFOUR
 #---------------------------------------------------- print header information
                 my $foldermap=&mt($maptitle=~/^uploaded/?'Folder':'Map');
                 my $showtitle=$maptitles{$maptitle}.($maptitle!~/^uploaded/?' ['.$maptitle.']':'');
-                $r->print(<<ENDMAPONE);
-<center><h4>
-Set Defaults for All Resources in $foldermap<br />
-<font color="red"><i>$showtitle</i></font><br />
-Specifically for
-ENDMAPONE
+                my $tmp="";
                 if ($uname) {
 		    my $person=&Apache::loncommon::plainname($uname,$udom);
-                    $r->print(&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
-                        &mt('in')." \n");
+                    $tmp.=&mt("User")." <font color=\"red\"><i>$uname \($person\) </i></font> ".
+                        &mt('in')." \n";
                 } else {
-                    $r->print("<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n");
+                    $tmp.="<font color=\"red\"><i>".&mt('all').'</i></font> '.&mt('users in')." \n";
                 }
                 if ($cgroup) {
-                    $r->print(&mt("Group")." <font color=\"red\"><i>$cgroup".
-                              "</i></font> ".&mt('of')." \n");
+                    $tmp.=&mt("Group")." <font color=\"red\"><i>$cgroup".
+                              "</i></font> ".&mt('of')." \n";
                     $csec = '';
                 } elsif ($csec) {
-                    $r->print(&mt("Section")." <font color=\"red\"><i>$csec".
-                              "</i></font> ".&mt('of')." \n");
+                    $tmp.=&mt("Section")." <font color=\"red\"><i>$csec".
+                              "</i></font> ".&mt('of')." \n";
                 }
-                $r->print("<font color=\"red\"><i>$coursename</i></font><br />");
-                $r->print("</h4>\n");
+                $r->print('<div align="center"><h4>'
+                         .&mt('Set Defaults for All Resources in [_1]Specifically for [_2][_3]'
+                             ,$foldermap.'<br /><font color="red"><i>'.$showtitle.'</i></font><br />'
+                             ,$tmp
+                             ,'<font color="red"><i>'.$coursename.'</i></font>'
+                             )
+                         ."<br /></h4>\n"
+                         );
 #---------------------------------------------------------------- print table
                 $r->print('<p><table border="2">');
                 $r->print('<tr><th>'.&mt('Parameter Name').'</th>');
@@ -1916,7 +2125,7 @@ ENDMAPONE
                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
                            $parmlev,$uname,$udom,$csec,$cgroup);
                 }
-                $r->print("</table></center>");
+                $r->print("</table></div>");
             } # end each map
         } # end of $parmlev eq map
 #--------------------------------- Entry for parm level general (Course level)
@@ -1999,33 +2208,20 @@ ENDMAPONE
 } # end sub assessparms
 
 
-##################################################
-##################################################
-
-=pod
-
-=item crsenv
-
-Show and set course data and parameters.  This is a large routine that should
-be simplified and shortened... someday.
-
-Inputs: $r
-
-Returns: nothing
 
-=cut
-
-##################################################
-##################################################
 sub crsenv {
     my $r=shift;
     my $setoutput='';
 
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
+	text=>"Course Environment"});
     my $breadcrumbs = 
 	&Apache::lonhtmlcommon::breadcrumbs('Edit Course Environment');
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
+    my (%crsinfo,$chome);
+
     #
     # Go through list of changes
     foreach (keys %env) {
@@ -2120,19 +2316,41 @@ sub crsenv {
             my $put_result = &Apache::lonnet::put('environment',
                                                   {$name=>$value},$dom,$crs);
             if ($put_result eq 'ok') {
-                $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>'.$value.'</b>.<br />';
+                $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>';
+                if ($name =~ /^default_enrollment_(start|end)_date$/) {
+                    $setoutput .= &Apache::lonlocal::locallocaltime($value);
+                } elsif ($name eq 'categories') {
+                    $setoutput .= $env{'form.categories_display'};
+                } else {
+                    $setoutput .= $value;
+                }
+                $setoutput .= '</b>.<br />';
                 if ($name eq 'cloners') {
                     &change_clone($value,\@oldcloner);
                 }
                 # Update environment and nohist_courseids.db
+                if (($name eq 'description') || ($name eq 'cloners') || 
+                    ($name eq 'hidefromcat') || ($name eq 'categories')) {
+                    if ($chome eq '') {
+                        %crsinfo =
+                            &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
+                                                 $crs,undef,undef,'.');
+                        $chome = &Apache::lonnet::homeserver($crs,$dom);
+                    }
+                }
                 if ($name eq 'description' && defined($value)) {
-                    my %crsinfo = 
-                        &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
-                                                 $crs,undef,undef,'Course');
-                    &Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.description' => $value);
+                    &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.description' => $value});
                     if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
                         $crsinfo{$env{'request.course.id'}}{'description'} = $value; 
-                        my $chome = &Apache::lonnet::homeserver($crs,$dom);
+                        my $putresult =
+                            &Apache::lonnet::courseidput($dom,\%crsinfo,
+                                                         $chome,'notime');
+                    }
+                }
+                if (($name eq 'cloners') || ($name eq 'hidefromcat') || ($name eq 'categories')) {
+                    if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
+                        &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$name => $value});
+                        $crsinfo{$env{'request.course.id'}}{$name} = $value;
                         my $putresult =
                             &Apache::lonnet::courseidput($dom,\%crsinfo,
                                                          $chome,'notime');
@@ -2188,76 +2406,75 @@ sub crsenv {
     my $SelectStyleFile=&mt('Select Style File');
     my $SelectSpreadsheetFile=&mt('Select Spreadsheet File');
     my $output='';
+    my $can_categorize;
     if (! exists($values{'con_lost'})) {
         my %descriptions=
-	    ('url'            => '<b>'.&mt('Top Level Map').'</b> '.
+	    ('url'            => '<b>'.&mt('Top Level Map').'</b><br />'.
                                  '<a href="javascript:openbrowser'.
                                  "('envform','url','sequence')\">".
                                  &mt('Select Map').'</a><br /><span class="LC_warning"> '.
-                                 &mt('Modification may make assessment data inaccessible').
+                                 &mt('Modification may make assessment data inaccessible!').
                                  '</span>',
              'description'    => '<b>'.&mt('Course Description').'</b>',
              'courseid'       => '<b>'.&mt('Course ID or number').
                                  '</b><br />'.
-                                 '('.&mt('internal').', '.&mt('optional').')',
-             'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br /><tt>(user:domain,user:domain,*:domain)</tt><br />'.&mt('Users with active Course Coordinator role in course are permitted to clone and need not be included.<br />
-Use *:domain to allow course to be cloned by anyone in the specified domain.<br />
-Use * to allow unrestricted cloning in all domains.'),
+                                 '('.&mt('internal, optional').')',
+             'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br />'
+                                .'("<tt>'.&mt('user:domain,user:domain,*:domain').'</tt>")<br />'
+                                .&mt('Users with active Course Coordinator role in this course are permitted to clone and need not be included.').'<br />'
+                                .&mt('Use [_1] to allow course to be cloned by anyone in the specified domain.','"<tt>*:domain</tt>"').'<br />'
+                                .&mt('Use [_1] to allow unrestricted cloning in all domains.','"<tt>*</tt>"'),
              'grading'        => '<b>'.&mt('Grading').'</b><br />'.
-                                 '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
-	     'task_grading'   => '<b>'.&mt('Bridge Task Grading').'</b><br />'.
-                                 &mt('Instructors and TAs in sections, when grading bridge tasks, should be allowed to grade other sections, "[_1]" they are allowed (this is the default), "[_2]" no, they can only grade their own section','<tt>any</tt>','<tt>section</tt>'),
-             'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
+                                 &mt('[_1], [_2], or [_3]','"<tt>standard</tt>"','"<tt>external</tt>"','"<tt>spreadsheet</tt>"').&Apache::loncommon::help_open_topic('GradingOptions'),
+	     'task_grading'   => '<b>'.&mt('Bridge Task Grading').'</b><br />'
+                                .&mt('Instructors and TAs in sections, when grading bridge tasks, should be allowed to grade other sections.').'<br />'
+                                .'('.&mt('[_1]: they are allowed (this is the default). [_2]: no, they can only grade their own section.','"<tt>any</tt>"','"<tt>section</tt>"').')',
+             'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b><br />'.
                     '<a href="javascript:openbrowser'.
                     "('envform','default_xml_style'".
                     ",'sty')\">$SelectStyleFile</a><br />",
-             'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
-                                 '</b><br />(<tt>user:domain,'.
-                                 'user:domain(section;section;...;*;...),...</tt>)',
-             'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').
-                                 '</b>',
-             'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
-                                 '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
-             'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').
-                                 '</b>',
-             'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
-                                 '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
-             'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').
-                                 '</b>',
-             'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
-                                 '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
-             'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
-                                 '('.&mt('"[_1]" for visible separation','<tt>yes</tt>').', '.
-                                 &mt('changes will not show until next login').')',
-             'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b><br />'.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.)'),
-             'student_classlist_portfiles' => '<b>'.&mt('Include link to accessible portfolio files').'</b><br />'.&mt('"[_1]" for link to each a listing of each student\'s files.','<tt>yes</tt>'),
-             'student_classlist_opt_in' => '<b>'.&mt("Student's agreement needed for listing in student-viewable roster").'</b><br />'.&mt('"[_1]" to require students to opt-in to listing in the roster (on the roster page).','<tt>yes</tt>'),
-             'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').
-                                  '</b><br />("<tt>st</tt>": '.
-                                  &mt('student').', "<tt>ta</tt>": '.
-                                  'TA, "<tt>in</tt>": '.
-                                  &mt('instructor').';<br /><tt>'.&mt('role,role,...').'</tt>) '.
-	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
+             'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').'</b><br />'
+                                .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
+             'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').'</b>',
+             'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'
+                                .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
+             'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').'</b>',
+             'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b><br />'
+                                 .'("<tt>'.&mt('user:domain,user:domain(section;section;...;*;...),...').'</tt>")',
+             'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').'</b>',
+             'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'
+                                .'('.&mt('[_1] for default hiding','"<tt>yes</tt>"').')',
+             'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'
+                                 .'('.&mt('[_1] for visible separation.','"<tt>yes</tt>"').' '
+                                 .&mt('Changes will not show until next login.').')',
+             'student_classlist_view' => '<b>'.&mt('Allow students to view classlist.').'</b><br />'
+                                        .'('.&mt('[_1]: students can view all sections. [_2]: students can only view their own section. blank or [_3] prevents student view.','"<tt>all</tt>"','"<tt>section</tt>"','"<tt>disabled</tt>"').')',
+             'student_classlist_portfiles' => '<b>'.&mt('Include link to accessible portfolio files').'</b><br />'
+                                             .'('.&mt('[_1] for link to each a listing of each student\'s files.','"<tt>yes</tt>"').')',
+             'student_classlist_opt_in' => '<b>'.&mt("Student's agreement needed for listing in student-viewable roster").'</b><br />'
+                                           .'('.&mt('[_1] to require students to opt-in to listing in the roster (on the roster page).','"<tt>yes</tt>"').')',
+             'plc.roles.denied'=> '<b>'.&mt('Disallow live chatroom use for Roles').'</b><br />'
+                                 .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"').')<br />'
+                                 .'("<tt>'.&mt('role,role,...').'</tt>") '
+	                         .Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
              'plc.users.denied' => 
                           '<b>'.&mt('Disallow live chatroom use for Users').'</b><br />'.
-                                 '(<tt>user:domain,user:domain,...</tt>)',
+                                  '("<tt>'.&mt('user:domain,user:domain,...').'</tt>")',
 
-             'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').
-                                  '</b><br />("<tt>st</tt>": '.
-                                  'student, "<tt>ta</tt>": '.
-                                  'TA, "<tt>in</tt>": '.
-                                  'instructor;<br /><tt>role,role,...</tt>) '.
-	       Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
+             'pch.roles.denied'=> '<b>'.&mt('Disallow Resource Discussion for Roles').'</b><br />'
+                                 .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"')
+                                 .'("<tt>'.&mt('role,role,...').'</tt>") '
+                                 .Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
              'pch.users.denied' => 
                           '<b>'.&mt('Disallow Resource Discussion for Users').'</b><br />'.
-                                 '(<tt>user:domain,user:domain,...</tt>)',
+                                 '("<tt>'.&mt('user:domain,user:domain,...').'</tt>")',
              'spreadsheet_default_classcalc' 
                  => '<b>'.&mt('Default Course Spreadsheet').'</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_classcalc'".
                     ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
              'spreadsheet_default_studentcalc' 
-                 => '<b>'.&mt('Default Student Spreadsheet').'</b> '.
+                 => '<b>'.&mt('Default Student Spreadsheet').'</b><br />'.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_calc'".
                     ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
@@ -2268,43 +2485,45 @@ Use * to allow unrestricted cloning in a
                     ",'spreadsheet')\">$SelectSpreadsheetFile</a><br />",
 	     'allow_limited_html_in_feedback'
 	         => '<b>'.&mt('Allow limited HTML in discussion posts').'</b><br />'.
-	            '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
+	            '('.&mt('Set value to [_1] to allow.','"<tt>yes</tt>"').')',
              'allow_discussion_post_editing'
-                 => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />"<tt>st</tt>": '.
-                                  &mt('student').', "<tt>ta</tt>": '.
-                                  'TA, "<tt>in</tt>": '.
-                                  &mt('instructor').';&nbsp;(<tt>'.&mt('role:section,role:section,..., e.g., st:001,st:002,in,cc would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').'</tt>)<br />'.
-                    '('.&mt('or set value to "[_1]" to allow all roles',"<tt>yes</tt>").')',
+                 => '<b>'.&mt('Allow users with specified roles to edit/delete their own discussion posts').'</b><br />'
+                   .'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"<tt>st</tt>"','"<tt>ta</tt>"','"<tt>in</tt>"').')<br />'
+                   .'('.&mt('Set value to [_1] to allow all roles.','"<tt>yes</tt>"').')'
+                   .'("<tt>'.&mt('role:section,role:section,...').'</tt>")<br />'
+                   .'('.&mt('Example: "<tt>st:001,st:002,in,cc</tt>" would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').')',
 	     'rndseed'
-	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
-                    '<span class="LC_error">'.&mt('Modifying this will make problems').' '.
-                    &mt('have different numbers and answers').'</span>',
+	         => '<b>'.&mt('Randomization algorithm used').'</b><br />'
+                   .'<span class="LC_error">'
+                   .&mt('Modifying this will make problems have different numbers and answers!')
+                   .'</span>',
 	     'receiptalg'
 	         => '<b>'.&mt('Receipt algorithm used').'</b> <br />'.
                     &mt('This controls how receipt numbers are generated.'),
              'suppress_tries'
                  => '<b>'.&mt('Suppress number of tries in printing').'</b><br />'.
-                    ' ('.&mt('"[_1]" to suppress, anything else to not suppress','<tt>yes</tt>').')',
+                    ' ('.&mt('[_1] to suppress, anything else to not suppress','"<tt>yes</tt>"').')',
              'problem_stream_switch'
                  => '<b>'.&mt('Allow problems to be split over pages').'</b><br />'.
-                    ' ('.&mt('"[_1]" if allowed, anything else if not','<tt>yes</tt>').')',
+                    ' ('.&mt('[_1] if allowed, anything else if not','"<tt>yes</tt>"').')',
              'default_paper_size' 
                  => '<b>'.&mt('Default paper type').'</b><br />'.
                     ' ('.&mt('supported types').': Letter [8 1/2x11 in], Legal [8 1/2x14 in],'. 
                     ' Tabloid [11x17 in], Executive [7 1/2x10 in], A2 [420x594 mm],'. 
                     ' A3 [297x420 mm], A4 [210x297 mm], A5 [148x210 mm], A6 [105x148 mm])',
 	     'print_header_format'
-	         => &mtn('<b> Print header format; substitutions </b>:  %n student name %c course id %a assignment note, numbers after the % limit the field size.').'</b>',
+	         => ' <b>'.&mt('Print header format').'</b><br />'
+                   .&mt('Substitutions:<br />[_1]: student name, [_2]: course id, [_3]: assignment note. Numbers after the <tt>%</tt> limit the field size.','"<tt>%n</tt>"','"<tt>%c</tt>"','"<tt>%a</tt>"'),
              'default_enrollment_start_date' => '<b>'.&mt('Default beginning date for student access.').'</b>',
              'default_enrollment_end_date'   => '<b>'.&mt('Default ending date for student access.').'</b>',
-             'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b>'.
-                                 '<br />(<tt>user:domain,user:domain,...</tt>)',
+             'nothideprivileged'   => '<b>'.&mt('Privileged users that should not be hidden on staff listings').'</b><br />'
+                                     .'("<tt>'.&mt('user:domain,user:domain,*:domain').'</tt>")',
              'languages' => '<b>'.&mt('Languages used').'</b>',
              'disable_receipt_display'
                  => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
 	     'task_messages'
-	         => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').')',
+	         => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','"<tt>only_student</tt>"','"<tt>student_and_user_notes_screen</tt>"').')',
 	     'disablesigfigs'
 	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
@@ -2317,12 +2536,36 @@ Use * to allow unrestricted cloning in a
 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>',
 
 	     'texengine'
-	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'.&mt('(Valid options are [_1].)','"tth", "jsMath", "mimetex"').'</b>',
-             ); 
-        my @Display_Order = ('url','description','courseid','cloners','grading',
+	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'
+                   .'('.&mt('[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student\'s preference','"<tt>jsMath</tt>"','"<tt>mimetex</tt>"','"<tt>tth</tt>"').')',
+             'timezone'
+                 => '<b>'.&mt('Timezone in which the course takes place').'</b>',
+
+             'suppress_embed_prompt'
+                 => '<b>'.&mt('Suppress prompt to upload items referenced in a web page being uploaded to portfolio, when current role is student.').'</b><br />'.
+                    ' ('.&mt('[_1] to suppress, anything else to not suppress','"<tt>yes</tt>"').')',
+             'hidefromcat'
+                 => '<b>'.&mt('Exclude from course catalog').'</b><br />'.
+                    ' ('.&mt('[_1] to exclude, anything else to include - included if assigned an institutional code, or manually catagorized','"<tt>yes</tt>"').')',
+             'categories'
+                 => '<b>'.&mt('Categorize course').'</b> <a href="javascript:catsbrowser()">'.
+                    &mt('Display Categories').'</a>',
+             'datelocale' 
+                 => '<b>'.&mt('Locale used for course calendar').'</b>',
+             );
+        my @Display_Order = ('url','description','courseid','cloners');
+        (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
+        if ($can_toggle_cat) {
+            push(@Display_Order,'hidefromcat');
+        }
+        if ($can_categorize) {
+            push(@Display_Order,'categories');
+        }
+        push (@Display_Order,('grading',
                              'externalsyllabus',
                              'default_xml_style','pageseparators',
-                             'question.email','question.email.text','comment.email','comment.email.text','policy.email','policy.email.text',
+                             'question.email','question.email.text','comment.email',
+                             'comment.email.text','policy.email','policy.email.text',
                              'student_classlist_view',
                              'student_classlist_opt_in',
                              'student_classlist_portfiles',
@@ -2331,11 +2574,14 @@ Use * to allow unrestricted cloning in a
                              'allow_limited_html_in_feedback',
                              'allow_discussion_post_editing',
                              'languages',
+                             'timezone',
+                             'datelocale',
 			     'nothideprivileged',
                              'rndseed',
                              'receiptalg',
                              'problem_stream_switch',
 			     'suppress_tries',
+                             'suppress_embed_prompt',
                              'default_paper_size',
 			     'print_header_format',
                              'disable_receipt_display',
@@ -2349,10 +2595,11 @@ Use * to allow unrestricted cloning in a
 			     'texengine',
 			     'disablesigfigs',
 			     'disableexampointprint',
-			     'task_messages','task_grading',
-                             );
+			     'task_messages','task_grading'));
 	foreach my $parameter (sort(keys(%values))) {
-            unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
+            unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
+                    ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
+                    || ($parameter eq 'type')) {
                 if (! $descriptions{$parameter}) {
                     $descriptions{$parameter}=$parameter;
                     push(@Display_Order,$parameter);
@@ -2375,6 +2622,39 @@ Use * to allow unrestricted cloning in a
                                                         $values{$parameter},
                                                         $onchange).
                                                         '</td>';
+            } elsif ($parameter eq 'timezone') {
+                my $includeempty = 1;
+                my $timezone = &Apache::lonlocal::gettimezone();
+                $output .= '<td>'.
+                    &Apache::loncommon::select_timezone($parameter.'_value',
+                                                        $timezone,
+                                                        $onchange,$includeempty).'</td>';
+            } elsif ($parameter eq 'datelocale') {
+                my $includeempty = 1;
+                my $locale_obj = &Apache::lonlocal::getdatelocale();
+                my $currdatelocale;
+                if (ref($locale_obj)) {
+                    $currdatelocale = $locale_obj->id();
+                }
+                $output .= '<td>'.
+                    &Apache::loncommon::select_datelocale($parameter.'_value',
+                                                          $currdatelocale,
+                                                          $onchange,$includeempty).'</td>'; 
+            } elsif ($parameter eq 'categories') {
+                my $catdisplay;
+                if ($values{'categories'} ne '') {
+                    my @curritems = split(/\&/,$values{'categories'});
+                    foreach my $item (@curritems) {
+                        my ($name,$parent,$pos) = split(/:/,$item);
+                        $catdisplay .= &unescape($name).'&';
+                    }
+                    $catdisplay =~ s/\&$//;
+                } 
+                $output .= '<td>'.
+                           '<input type="hidden" name="categories_value" value="'.
+                           $values{'categories'}.'" />'.
+                           '<input type="textbox" name="categories_display" value="'.
+                           $catdisplay.'" readonly="readonly" size="40" /></td>';
             } else {
                 $output .= '<td>'.
                     &Apache::lonhtmlcommon::textbox($parameter.'_value',
@@ -2401,21 +2681,33 @@ Use * to allow unrestricted cloning in a
     my %lt=&Apache::lonlocal::texthash(
 		    'par'   => 'Parameter',
 		    'val'   => 'Value',
-		    'set'   => 'Set',
-		    'sce'   => 'Set Course Environment'
+		    'set'   => 'Set?',
+		    'sav'   => 'Save'
 				       );
 
     my $Parameter=&mt('Parameter');
     my $Value=&mt('Value');
     my $Set=&mt('Set');
-    my $browse_js=
-	'<script type="text/javascript" language="Javascript">'.
-	&Apache::loncommon::browser_and_searcher_javascript('parmset').
-	'</script>';
-    
+    my ($jscript,$categorize_js);
+    my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
+    if ($can_categorize) {
+        $categorize_js = <<ENDSCRIPT;
+function catsbrowser() {
+    var catswin = null;
+    var url = '/adm/parmset?action=categorizecourse';
+    if (!catswin || catswin.closed) {
+        catswin=window.open(url,'categorieswin','height=480,width=600,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+    } else {
+        catswin.focus();
+    }
+} 
+ENDSCRIPT
+    }
+    $jscript = '<script type="text/javascript" language="Javascript">'."\n".
+               $browse_js."\n".$categorize_js."\n".'</script>';
     my $start_page = 
 	&Apache::loncommon::start_page('Set Course Environment',
-				       $browse_js);
+				       $jscript);
     my $end_page = 
 	&Apache::loncommon::end_page();
     my $end_table=&Apache::loncommon::end_data_table();
@@ -2424,17 +2716,110 @@ $start_page
 $breadcrumbs
 <form method="post" action="/adm/parmset?action=crsenv" name="envform">
 $setoutput
+<div><input type="submit" name="crsenv" value="$lt{'sav'}" /></div>
 $start_table
 $start_header_row
-<th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}?</th>
+<th>$lt{'par'}</th><th>$lt{'val'}</th><th>$lt{'set'}</th>
 $end_header_row
 $output
 $end_table
-<input type="submit" name="crsenv" value="$lt{'sce'}" />
+<input type="submit" name="crsenv" value="$lt{'sav'}" />
 </form>
 $end_page
 ENDENV
 }
+
+sub can_modify_catsettings {
+    my ($dom) = @_;
+    my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
+    my ($can_toggle_cat,$can_categorize);
+    if (ref($domconf{'coursecategories'}) eq 'HASH') {
+        if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+            $can_toggle_cat = 1;
+        }
+        if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+            $can_categorize = 1;
+        }
+    }
+    return ($can_toggle_cat,$can_categorize);
+}
+
+sub assign_course_categories {
+    my ($r) = @_;
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $hascats = 0;
+    my $cathash;
+    my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+    if (ref($domconf{'coursecategories'}) eq 'HASH') {
+        $cathash = $domconf{'coursecategories'}{'cats'};
+        if (ref($cathash) eq 'HASH') {
+            $hascats = 1;   
+        }
+    }
+    my $catwin_js;
+    if ($hascats) {
+        my $alert = &mt('Use \"Save\" in the main window to save course categories');
+        $catwin_js = <<ENDSCRIPT;
+<script type="text/javascript">
+
+function updateCategories() {
+    var newcategories = '';
+    var unescapedcats = '';
+    if (document.chgcats.usecategory.length) {
+        for (var i=0; i<document.chgcats.usecategory.length; i++) {
+            if (document.chgcats.usecategory[i].checked == true) {
+                newcategories = newcategories + document.chgcats.usecategory[i].value + '&';
+                unescapedcats = unescapedcats + document.chgcats.catname[i].value + ' & ';
+            }
+        }
+        if (newcategories.length > 0) {
+            newcategories = newcategories.slice(0,-1);
+        }
+        if (unescapedcats.length > 0) {
+            unescapedcats = unescapedcats.slice(0,-3);
+        }
+    } else {
+         if (document.chgcats.usecategory.checked == true) {
+             newcategories = document.chgcats.usecategory.value;
+             unescapedcats = document.chgcats.catname.value;
+         }
+    }
+    opener.document.envform.categories_value.value = newcategories;
+    opener.document.envform.categories_display.value = unescapedcats;
+    opener.document.envform.categories_setparmval.checked = true;
+    alert("$alert");
+    self.close();
+    return;
+}
+
+</script>
+ENDSCRIPT
+    } else {
+        my $onload; 
+    }
+    my $start_page =
+        &Apache::loncommon::start_page('Course Categories',$catwin_js,
+                                       {'only_body'      => 1,});
+    my $end_page = &Apache::loncommon::end_page();
+    my $categoriesform = '<h3>'.&mt('Categorize Course').'</h3>';
+    if ($hascats) {
+        my %currsettings =
+            &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
+        $categoriesform .= &mt('Assign one or more categories to this course.').'<br /><br />'.
+                               '<form name="chgcats" action="/adm/parmset" method="post">'."\n"
+                               .&Apache::loncommon::assign_categories_table($cathash,
+                                                       $currsettings{'categories'})."\n"
+                               .'<br /><input type="button" name="changes" value="'
+                               .&mt('Copy to main window').'" '
+                               .'onclick="javascript:updateCategories()" /></form><br />';
+    } else {
+        $categoriesform .= &mt('No categories defined for this domain');
+    }
+    $r->print($start_page.$categoriesform.$end_page);
+    return;
+}
+
 ##################################################
 # Overview mode
 ##################################################
@@ -2729,6 +3114,8 @@ sub listdata {
 						      $$resourcedata{$thiskey},
 							      '',1,'','').
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
+(($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
+&mt('Shift all dates based on this date').'</a></span>':'').
 &date_sanity_info($$resourcedata{$thiskey})
 			  );
 	    } elsif ($thistype eq 'date_interval') {
@@ -2798,7 +3185,7 @@ my %strings =
 		 [ 'no', 'No' ]],
      'string_problemstatus'
              => [[ 'yes', 'Yes' ],
-		 [ 'answer', 'Yes, and show correct answer if they exceed the maxium number of tries.' ],
+		 [ 'answer', 'Yes, and show correct answer if they exceed the maximum number of tries.' ],
 		 [ 'no', 'No, don\'t show correct/incorrect feedback.' ],
 		 [ 'no_feedback_ever', 'No, show no feedback at all.' ]],
      );
@@ -2824,11 +3211,48 @@ sub string_selector {
     return $result;
 }
 
+#
+# Shift all start and end dates by $shift
+#
+
+sub dateshift {
+    my ($shift)=@_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+# ugly retro fix for broken version of types
+    foreach my $key (keys %data) {
+        if ($key=~/\wtype$/) {
+            my $newkey=$key;
+            $newkey=~s/type$/\.type/;
+            $data{$newkey}=$data{$key};
+            delete $data{$key};
+        }
+    }
+    my %storecontent=();
+# go through all parameters and look for dates
+    foreach my $key (keys %data) {
+       if ($data{$key.'.type'}=~/^date_(start|end)$/) {
+          my $newdate=$data{$key}+$shift;
+          $storecontent{$key}=$newdate;
+       }
+    }
+    my $reply=&Apache::lonnet::cput
+                ('resourcedata',\%storecontent,$dom,$crs);
+    if ($reply eq 'ok') {
+       &log_parmset(\%storecontent);
+    }
+    &Apache::lonnet::devalidatecourseresdata($crs,$dom);
+    return $reply;
+}
+
 sub newoverview {
     my ($r) = @_;
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     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 $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print(<<ENDOVER);
@@ -2989,6 +3413,8 @@ sub overview {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     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('Modify Parameters');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print(<<ENDOVER);
@@ -3023,6 +3449,8 @@ sub clean_parameters {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
+    	text=>"Clean Parameters"});
     my $start_page=&Apache::loncommon::start_page('Clean Parameters');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Clean');
     $r->print(<<ENDOVER);
@@ -3043,7 +3471,7 @@ ENDOVER
     $r->print('<h3>'.
 	      &mt('These parameters refer to resources that do not exist.').
 	      '</h3>'.
-	      '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.'<br />'.
+	      '<input type="submit" value="'.&mt('Delete Selected').'" />'.'<br />'.
 	      '<br />');
     $r->print(&Apache::loncommon::start_data_table().
 	      '<tr>'.
@@ -3096,11 +3524,60 @@ ENDOVER
 	}
     }
     $r->print(&Apache::loncommon::end_data_table().'<p>'.
-	      '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.
+	      '<input type="submit" value="'.&mt('Delete Selected').'" />'.
 	      '</p></form>'.
 	      &Apache::loncommon::end_page());
 }
 
+sub date_shift_one {
+    my ($r) = @_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+    	text=>"Shifting Dates"});
+    my $start_page=&Apache::loncommon::start_page('Shift Dates');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+    $r->print(<<ENDOVER);
+$start_page
+$breadcrumbs
+ENDOVER
+    $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',
+                                                        'timeshifted',
+                                                        $env{'form.timebase'},,
+                                                        '').
+              '</td></tr></table>'.
+              '<input type="hidden" name="action" value="dateshift2" />'.
+              '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
+              '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+    $r->print(&Apache::loncommon::end_page());
+}
+
+sub date_shift_two {
+    my ($r) = @_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+    	text=>"Shifting Dates"});
+    my $start_page=&Apache::loncommon::start_page('Shift Dates');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+    $r->print(<<ENDOVER);
+$start_page
+$breadcrumbs
+ENDOVER
+    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);
+    $r->print(&Apache::loncommon::end_page());
+}
+
 sub parse_key {
     my ($key) = @_;
     my %data;
@@ -3140,41 +3617,7 @@ sub parse_key {
     return %data;
 }
 
-##################################################
-##################################################
-
-=pod
 
-=item check_cloners
-
-Checks if new users included in list of allowed cloners
-are valid users.  Replaces supplied list with 
-cleaned list containing only users with valid usernames
-and domains.
-
-Inputs: $clonelist, $oldcloner 
-where $clonelist is ref to array of requested cloners,
-and $oldcloner is ref to array of currently allowed
-cloners.
-
-Returns: string - comma separated list of requested
-cloners (username:domain) who do not exist in system.
-
-=item change_clone
-
-Modifies the list of courses a user can clone (stored
-in the user's environment.db file), called when a
-change is made to the list of users allowed to clone
-a course.
-
-Inputs: $action,$cloner
-where $action is add or drop, and $cloner is identity of 
-user for whom cloning ability is to be changed in course. 
-
-=cut
-
-##################################################
-##################################################
 
 sub extract_cloners {
     my ($clonelist,$allowclone) = @_;
@@ -3291,27 +3734,18 @@ sub change_clone {
 }
 
 
-##################################################
-##################################################
-
-=pod
-
-=item * header
-
-Output html header for page
-
-=cut
 
-##################################################
-##################################################
 sub header {
     return &Apache::loncommon::start_page('Parameter Manager');
 }
-##################################################
-##################################################
+
+
+
 sub print_main_menu {
     my ($r,$parm_permission)=@_;
     #
+    $r->print(&header());
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -3322,86 +3756,87 @@ ENDMAINFORMHEAD
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr  = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
 
+
     my @menu =
-        ( { divider=>'Settings for Your Course',
-	  },
-          { text => 'Set Course Environment',
-	    action => 'crsenv',
-            permission => $parm_permission,
-            help => 'Course_Environment',
-            },
-          { text => 'Set Portfolio Metadata',
-	    action => 'setrestrictmeta',
-            permission => $parm_permission,
-            },
-	  { text => 'Manage Course Slots',
-	    url => '/adm/slotrequest?command=showslots',
-	    permission => $vgr,
-            },
-	  { text => 'Reset Student Access Times',
-	    url => '/adm/helper/resettimes.helper',
-	    permission => $mgr,
-            },
-
-          { text => 'Set Parameter Setting Default Actions',
-            action => 'setdefaults',
-            permission => $parm_permission,
-            },          
-	  { divider => 'New and Existing Parameter Settings for Your Resources',
-	    },
-          { text => 'Set/Modify Resource Parameters - Helper Mode',
-            url => '/adm/helper/parameter.helper',
-            permission => $parm_permission,
-            help => 'Parameter_Helper',
-            },
- 	  { text => 'Set/Modify Resource Parameters - Overview Mode',
-            action => 'newoverview',
-            permission => $parm_permission,
-            help => 'Parameter_Overview',
-            },
-          { text => 'Set/Modify Resource Parameters - Table Mode',
-            action => 'settable',
-            permission => $parm_permission,
-            help => 'Table_Mode',
-            },
-           { divider => 'Existing Parameter Settings for Your Resources',
-	  },
-	  { text => 'Modify Resource Parameters - Overview Mode',
-            action => 'setoverview',
-            permission => $parm_permission,
-            help => 'Parameter_Overview',
- 	    },          
-	  { text => 'Parameter Change Log and Course Blog Posting/User Notification',
-            action => 'parameterchangelog',
-            permission => $parm_permission,
-            },
+        ( { categorytitle=>'Settings for this Course',
+	    items => [
+		  { linktext => 'Course Environment',
+		    url => '/adm/parmset?action=crsenv',
+		    permission => $parm_permission,
+		    linktitle =>'Edit environment settings for this course.'  ,
+		    icon => 'preferences-desktop-remote-desktop.png'  ,
+		    #help => 'Course_Environment',
+		    },
+		  { linktext => 'Portfolio Metadata',
+		    url => '/adm/parmset?action=setrestrictmeta',
+		    permission => $parm_permission,
+		    linktitle => 'Restrict metadata for this course.' ,
+		    icon =>'contact-new.png'   ,
+		    },
+		  { linktext => 'Manage Course Slots',
+		    url => '/adm/slotrequest?command=showslots',
+		    permission => $vgr,
+		    linktitle =>'Manage slots for this course.'  ,
+		    icon => 'format-justify-fill.png'  ,
+		    },
+		  { linktext => 'Reset Student Access Times',
+		    url => '/adm/helper/resettimes.helper',
+		    permission => $mgr,
+		    linktitle =>'Reset access times for folders/maps, resources or the course.'  ,
+		    icon => 'start-here.png'  ,
+		    },
+
+		  { linktext => 'Set Parameter Setting Default Actions',
+		    url => '/adm/parmset?action=setdefaults',
+		    permission => $parm_permission,
+		    linktitle =>'Set default actions for parameters.'  ,
+		    icon => 'folder-new.png'  ,
+		    }]},          
+	  { categorytitle => 'New and Existing Parameter Settings for Resources',
+	    items => [
+		  { linktext => 'Edit Resource Parameters - Helper Mode',
+		    url => '/adm/helper/parameter.helper',
+		    permission => $parm_permission,
+		    linktitle =>'Set/Modify resource parameters in helper mode.'  ,
+		    icon => 'dialog-information.png'  ,
+		    #help => 'Parameter_Helper',
+		    },
+		  { linktext => 'Edit Resource Parameters - Overview Mode',
+		    url => '/adm/parmset?action=newoverview',
+		    permission => $parm_permission,
+		    linktitle =>'Set/Modify resource parameters in overview mode.'  ,
+		    icon => 'edit-find.png'  ,
+		    #help => 'Parameter_Overview',
+		    },
+		  { linktext => 'Edit Resource Parameters - Table Mode',
+		    url => '/adm/parmset?action=settable',
+		    permission => $parm_permission,
+		    linktitle =>'Set/Modify resource parameters in table mode.'  ,
+		    icon => 'edit-copy.png'  ,
+		    #help => 'Table_Mode',
+		    }]},
+           { categorytitle => 'Existing Parameter Settings for Resources',
+	     items => [
+		  { linktext => 'Modify Resource Parameters - Overview Mode',
+		    url => '/adm/parmset?action=setoverview',
+		    permission => $parm_permission,
+		    linktitle =>'Set/Modify existing resource parameters in overview mode.'  ,
+		    icon => 'preferences-desktop-wallpaper.png'  ,
+		    #help => 'Parameter_Overview',
+		    },          
+		  { linktext => 'Change Log',
+		    url => '/adm/parmset?action=parameterchangelog',
+		    permission => $parm_permission,
+		    linktitle =>'View parameter and course blog posting/user notification change log.'  ,
+		    icon => 'emblem-system.png'   ,
+		    }]}
           );
-    my $menu_html = '';
-    foreach my $menu_item (@menu) {
-	if ($menu_item->{'divider'}) {
-	    $menu_html .= '<h3>'.&mt($menu_item->{'divider'}).'</h3>';
-	    next;
-	}
-        next if (! $menu_item->{'permission'});
-        $menu_html.='<p>';
-        $menu_html.='<span class="LC_parm_menu_item">';
-        if (exists($menu_item->{'url'})) {
-            $menu_html.=qq{<a href="$menu_item->{'url'}">};
-        } else {
-            $menu_html.=
-                qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
-        }
-        $menu_html.= &mt($menu_item->{'text'}).'</a></span>';
-        if (exists($menu_item->{'help'})) {
-            $menu_html.=
-                &Apache::loncommon::help_open_topic($menu_item->{'help'});
-        }
-        $menu_html.='</p>'.$/;
-    }
-    $r->print($menu_html);
+    $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
     return;
 }
-### Set portfolio metadata
+
+
+
 sub output_row {
     my ($r, $field_name, $field_text, $added_flag) = @_;
     my $output;
@@ -3413,7 +3848,7 @@ sub output_row {
     }
     if (!($options =~ /deleted/)) {
         my @options= ( ['active', 'Show to student'],
-                    ['stuadd', 'Provide text area for students to type catalog information'],
+                    ['stuadd', 'Provide text area for students to type metadata'],
                     ['choices','Provide choices for students to select from']);
 #		   ['onlyone','Student may select only one choice']);
         if ($added_flag) {
@@ -3446,22 +3881,27 @@ sub output_row {
 	$output .= &Apache::loncommon::continue_data_table_row();
 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
 	            <input type="radio" name="'.$field_name.'_onlyone" value="multiple" '.$multiple_checked .'/>
-	            Student may select multiple choices from list</span></td>';
+	            '.&mt('Student may select multiple choices from list').'</span></td>';
 	$output .= &Apache::loncommon::end_data_table_row();
 	$output .= &Apache::loncommon::continue_data_table_row();
 	$output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
 	            <input type="radio" name="'.$field_name.'_onlyone"  value="single" '.$single_checked.'/>
-	            Student may select only one choice from list</span></td>';
+	            '.&mt('Student may select only one choice from list').'</span></td>';
 	$output .= &Apache::loncommon::end_data_table_row();
     }
     return ($output);
 }
+
+
+
 sub order_meta_fields {
     my ($r)=@_;
     my $idx = 1;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+    	text=>"Add Metadata Field"});
     &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"/adm/parmset?action=setrestrictmeta",
               text=>"Restrict Metadata"},
@@ -3501,7 +3941,7 @@ sub order_meta_fields {
 	my $ordered_fields = join ",", @neworder;
         my $put_result = &Apache::lonnet::put('environment',
                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs); 	
-	&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
+	&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
     }
     my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $ordered_fields;
@@ -3538,6 +3978,8 @@ sub order_meta_fields {
     $r->print('</table>');
     return 'ok';
 }
+
+
 sub continue {
     my $output;
     $output .= '<form action="" method="post">';
@@ -3545,8 +3987,12 @@ sub continue {
     $output .= '<input type="submit" value="Continue" />';
     return ($output);
 }
+
+
 sub addmetafield {
     my ($r)=@_;
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+    	text=>"Add Metadata Field"});
     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -3591,12 +4037,17 @@ sub addmetafield {
     }
     $r->print('</form>');
 }
+
+
+
 sub setrestrictmeta {
     my ($r)=@_;
     my $next_meta;
     my $output;
     my $item_num;
     my $put_result;
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
+    	text=>"Restrict Metadata"});
     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -3674,7 +4125,9 @@ ENDenv
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
 }
-##################################################
+
+
+
 sub get_added_meta_fieldnames {
     my ($cid) = @_;
     my %fields;
@@ -3687,6 +4140,9 @@ sub get_added_meta_fieldnames {
     }
     return \%fields;
 }
+
+
+
 sub get_deleted_meta_fieldnames {
     my ($cid) = @_;
     my %fields;
@@ -3704,6 +4160,8 @@ sub get_deleted_meta_fieldnames {
 sub defaultsetter {
     my ($r) = @_;
 
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
+    	text=>"Set Defaults"});
     my $start_page = 
 	&Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
@@ -3900,6 +4358,8 @@ sub components {
 }
 
 my %standard_parms;
+
+
 sub load_parameter_names {
     open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
     while (my $configline=<$config>) {
@@ -3929,13 +4389,12 @@ sub standard_parameter_names {
     }
 }
 
-#
-# Parameter Change Log
-#
 
 
 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'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
 
@@ -4097,36 +4556,22 @@ sub check_for_course_info {
     return 0;
 }
 
-##################################################
-##################################################
-
-=pod
-
-=item * handler
-
-Main handler.  Calls &assessparms and &crsenv subroutines.
-
-=cut
-
-##################################################
-##################################################
 
 sub handler {
     my $r=shift;
 
     &reset_caches();
 
-    if ($r->header_only) {
-	&Apache::loncommon::content_type($r,'text/html');
-	$r->send_http_header;
-	return OK;
-    }
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+    return OK if $r->header_only;
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['action','state',
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
-                                             'udom','uname','symb','serial']);
+                                             'udom','uname','symb','serial','timebase']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -4144,12 +4589,6 @@ sub handler {
     my $exists = &check_for_course_info();
 
     if ($env{'request.course.id'} &&  $parm_permission && $exists) {
-
-        # Start Page
-        &Apache::loncommon::content_type($r,'text/html');
-        $r->send_http_header;
-
-
         #
         # Main switch on form.action and form.state, as appropriate
         #
@@ -4157,56 +4596,36 @@ sub handler {
         #  the table mode
         if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
 	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
-            &Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
-						    text=>"Problem Parameters"});
 	    &assessparms($r);
-
         } elsif (! exists($env{'form.action'})) {
-            $r->print(&header());
-            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
             &print_main_menu($r,$parm_permission);
-        } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
-						    text=>"Course Environment"});
+        } elsif ($env{'form.action'} eq 'crsenv') {
             &crsenv($r); 
-        } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
-						    text=>"Overview Mode"});
+        } elsif ($env{'form.action'} eq 'setoverview') {
 	    &overview($r);
-	} elsif ($env{'form.action'} eq 'addmetadata' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
-						    text=>"Add Metadata Field"});
+	} elsif ($env{'form.action'} eq 'addmetadata') {
 	    &addmetafield($r);
-	} elsif ($env{'form.action'} eq 'ordermetadata' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
-						    text=>"Add Metadata Field"});
+	} elsif ($env{'form.action'} eq 'ordermetadata') {
 	    &order_meta_fields($r);
-        } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
-						    text=>"Restrict Metadata"});
+        } elsif ($env{'form.action'} eq 'setrestrictmeta') {
 	    &setrestrictmeta($r);
-        } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
-						    text=>"Overview Mode"});
+        } elsif ($env{'form.action'} eq 'newoverview') {
 	    &newoverview($r);
-        }  elsif ($env{'form.action'} eq 'setdefaults' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
-						    text=>"Set Defaults"});
+        } elsif ($env{'form.action'} eq 'setdefaults') {
 	    &defaultsetter($r);
-	} elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
-						    text=>"Table Mode",
-						    help => 'Course_Setting_Parameters'});
+	} elsif ($env{'form.action'} eq 'settable') {
 	    &assessparms($r);
-        } elsif ($env{'form.action'} eq 'parameterchangelog' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
-						    text=>"Parameter Change Log"});
+        } elsif ($env{'form.action'} eq 'parameterchangelog') {
 	    &parm_change_log($r);
-        } elsif ($env{'form.action'} eq 'cleanparameters' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
-						    text=>"Clean Parameters"});
+        } elsif ($env{'form.action'} eq 'cleanparameters') {
 	    &clean_parameters($r);
-	}       
+        } elsif ($env{'form.action'} eq 'dateshift1') {
+            &date_shift_one($r);
+        } elsif ($env{'form.action'} eq 'dateshift2') {
+            &date_shift_two($r);
+	} elsif ($env{'form.action'} eq 'categorizecourse') {
+            &assign_course_categories($r);
+        } 
     } else {
 # ----------------------------- Not in a course, or not allowed to modify parms
 	if ($exists) {
@@ -4226,11 +4645,4 @@ sub handler {
 1;
 __END__
 
-=pod
-
-=back
-
-=cut
-
-