--- loncom/interface/lonparmset.pm	2006/07/14 17:44:11	1.321
+++ loncom/interface/lonparmset.pm	2006/08/09 20:37:52	1.327
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.321 2006/07/14 17:44:11 www Exp $
+# $Id: lonparmset.pm,v 1.327 2006/08/09 20:37:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -524,7 +524,7 @@ sub valout {
     # Values of zero are valid.
     if (! $value && $value ne '0') {
 	if ($editable) {
-	    $result = '<img src="/adm/lonIcons/clickhere.gif" border="0" />';
+	    $result = '<span class="LC_clickhere">*</span>';
 	} else {
 	    $result='&nbsp;';
 	}
@@ -2310,7 +2310,7 @@ sub crsenv {
 	'</script>';
     
     my $start_page = 
-	&Apache::loncommon::start_page('Set Course Environment Parameters',
+	&Apache::loncommon::start_page('Set Course Environment',
 				       $browse_js);
     my $end_page = 
 	&Apache::loncommon::end_page();
@@ -2589,15 +2589,6 @@ sub listdata {
 		$oldpart=$part;
 	    }
 #
-# Preset defaults?
-#
-            my ($hour,$min,$sec,$val)=('','','','');
-	    unless ($$resourcedata{$thiskey}) {
-		my ($parmname)=($thiskey=~/\.(\w+)$/);
-		($hour,$min,$sec,$val)=&preset_defaults($parmname);
-	    }
-
-#
 # Ready to print
 #
 	    $r->print(&tablestart().
@@ -2613,7 +2604,7 @@ sub listdata {
 			  &Apache::lonhtmlcommon::date_setter('parmform',
 							      $jskey,
 						      $$resourcedata{$thiskey},
-							      '',1,'','',$hour,$min,$sec).
+							      '',1,'','').
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
 &date_sanity_info($$resourcedata{$thiskey})
 			  );
@@ -2621,8 +2612,6 @@ sub listdata {
 		my $showval;
 		if (defined($$resourcedata{$thiskey})) {
 		    $showval=$$resourcedata{$thiskey};
-		} else {
-		    $showval=$val;
 		}
 		$r->print('<label><input type="radio" name="set_'.$thiskey.
 			  '" value="yes"');
@@ -2640,8 +2629,6 @@ sub listdata {
 		my $showval;
 		if (defined($$resourcedata{$thiskey})) {
 		    $showval=$$resourcedata{$thiskey};
-		} else {
-		    $showval=$val;
 		}
 		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
 			  $showval.'">');
@@ -3008,10 +2995,12 @@ ENDMAINFORMHEAD
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
 
     my @menu =
-        (
-          { text => 'Set Course Environment Parameters',
+        ( { divider=>'Settings for Your Course',
+	  },
+          { text => 'Set Course Environment',
 	    action => 'crsenv',
             permission => $parm_permission,
+            help => 'Course_Environment',
             },
           { text => 'Set Portfolio Metadata',
 	    action => 'setrestrictmeta',
@@ -3021,29 +3010,34 @@ ENDMAINFORMHEAD
 	    url => '/adm/slotrequest?command=showslots',
 	    permission => $vgr,
             },
-	  { divider => 1,
+          { 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 => 'Modify Resource Parameters - Overview Mode',
-            action => 'setoverview',
-            permission => $parm_permission,
-            },          
-	  { text => 'Set Resource Parameters - Overview Mode',
+ 	  { 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 => 'Cascading_Parameters',
+            help => 'Table_Mode',
             },
-          { text => 'Set Parameter Setting Default Actions',
-            action => 'setdefaults',
+           { 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,
@@ -3052,7 +3046,7 @@ ENDMAINFORMHEAD
     my $menu_html = '';
     foreach my $menu_item (@menu) {
 	if ($menu_item->{'divider'}) {
-	    $menu_html .= '<hr />';
+	    $menu_html .= '<h3>'.&mt($menu_item->{'divider'}).'</h3>';
 	    next;
 	}
         next if (! $menu_item->{'permission'});
@@ -3390,17 +3384,17 @@ sub standard_parameter_names {
 
 sub parm_change_log {
     my ($r)=@_;
-    &startpage($r);
+    $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
+    $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=settable"
-                     method="post" name"parameterlog">
-               <input type="hidden" name="action"
-                      value="parameterchangelog" />');
+    $r->print('<form action="/adm/parmset?action=parameterchangelog"
+                     method="post" name="parameterlog">');
     
     my %saveable_parameters = ('show' => 'scalar',);
     &Apache::loncommon::store_course_settings('parameter_log',
@@ -3414,7 +3408,9 @@ sub parm_change_log {
 				    (&mt('all'),10,20,50,100,1000,10000));
 
     $r->print('<nobr>'.&mt('[_1] Records',$countselect).'</nobr>'.
-	      '<input type="submit" value="'.&mt('Display').'" />');
+              '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
+	      ' '.&mt('Include parameter types').'</label>'.
+	      '<input type="submit" value="'.&mt('Display').'" /></form>');
 
     my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
 						     $env{'course.'.$env{'request.course.id'}.'.domain'});
@@ -3426,6 +3422,7 @@ sub parm_change_log {
     foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
         my @changes=keys(%{$parmlog{$id}{'logentry'}});
 	my $count=$#changes+1;
+	if (!$env{'form.includetypes'}) { $count=$count/2; }
 	my $time =
 	    &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
 	my $plainname = 
@@ -3455,7 +3452,10 @@ sub parm_change_log {
             my $value=$parmlog{$id}{'logentry'}->{$changed};
             my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection,$realmdescription)=
 		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'});
-	    if ($typeflag) { $istype{$parmname}=$value; }
+	    if ($typeflag) {
+		if (!$env{'form.includetypes'}) { next; } 
+		$istype{$parmname}=$value; 
+	    }
 	    if ($makenewrow) { $r->print($row_start); } else { $makenewrow=1; }
 	    $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.
 		      &standard_parameter_names($parmname).'</td><td>'.
@@ -3505,7 +3505,6 @@ sub parm_change_log {
 	      || $shown<=$env{'form.show'})) { last; }
     }
     $r->print(&Apache::loncommon::end_data_table());
-    $r->print('</form>');
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3544,7 +3543,8 @@ sub handler {
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
 					    text=>"Parameter Manager",
 					    faq=>10,
-					    bug=>'Instructor Interface'});
+					    bug=>'Instructor Interface',
+                                            help => 'Parameter_Manager'});
 
 # ----------------------------------------------------- Needs to be in a course
     my $parm_permission =
@@ -3569,6 +3569,8 @@ 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'})) {