--- loncom/interface/lonparmset.pm	2006/05/01 14:59:38	1.297
+++ loncom/interface/lonparmset.pm	2006/05/10 22:27:29	1.302
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.297 2006/05/01 14:59:38 raeburn Exp $
+# $Id: lonparmset.pm,v 1.302 2006/05/10 22:27:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -649,8 +649,7 @@ sub startpage {
 				       &page_js(),
 				       {'add_entries' => \%loaditems,});
     my $breadcrumbs = 
-	&Apache::lonhtmlcommon::breadcrumbs(undef,
-					    'Table Mode Parameter Setting');
+	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting');
     $r->print(<<ENDHEAD);
 $start_page
 $breadcrumbs
@@ -1118,21 +1117,15 @@ sub usermenu {
 		    'oi'    => "or ID",
 		    'ad'    => "at Domain"
 				       );
-    my %sectionhash=();
     my $sections='';
-    my $numsec = &Apache::loncommon::get_sections(
-                 $env{'course.'.$env{'request.course.id'}.'.domain'},
-                 $env{'course.'.$env{'request.course.id'}.'.num'},
-					 \%sectionhash);
+    my %sectionhash = &Apache::loncommon::get_sections();
+
     my $groups;
-    my %grouphash;
-    my $numgrp = &Apache::loncommon::coursegroups(
-                 \%grouphash,
-                 $env{'course.'.$env{'request.course.id'}.'.domain'},
-                 $env{'course.'.$env{'request.course.id'}.'.num'});
-    if ($numsec > 0) {
+    my %grouphash = &Apache::loncommon::coursegroups();
+
+    if (%sectionhash) {
         $sections=$lt{'se'}.': <select name="csec"';
-        if ($numsec && $numgrp && $parmlev ne 'full') {
+        if (%grouphash && $parmlev ne 'full') {
             $sections .= qq| onchange="group_or_section('csec')" |;
         }
         $sections .= '>';
@@ -1143,7 +1136,7 @@ sub usermenu {
         }
         $sections.='</select>';
     }
-    if ($numsec && $numgrp && $parmlev ne 'full') {
+    if (%sectionhash && %grouphash && $parmlev ne 'full') {
         $sections .= '&nbsp;or&nbsp;';
         $sections .= qq|
 <script type="text/javascript">
@@ -1169,9 +1162,10 @@ function group_or_section(caller) {
 </script>
 |;
     } 
-    if ($numgrp > 0) {
+
+    if (%grouphash) {
         $groups=$lt{'gr'}.': <select name="cgroup"';
-        if ($numsec && $numgrp && $env{'form.action'} eq 'settable') {
+        if (%sectionhash && $env{'form.action'} eq 'settable') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
         $groups .= '>';
@@ -1248,49 +1242,40 @@ sub levelmenu {
 
 sub sectionmenu {
     my ($r,$selectedsections)=@_;
-    my %sectionhash=();
-    my $sections='';
-    my $numsec = &Apache::loncommon::get_sections(
-                 $env{'course.'.$env{'request.course.id'}.'.domain'},
-                 $env{'course.'.$env{'request.course.id'}.'.num'},
-					 \%sectionhash);
-    if ($numsec) {
-	$r->print('<select name="Section" multiple="true" size="8" >');
-	foreach my $s ('all',sort keys %sectionhash) {
-	    $r->print('    <option value="'.$s.'"');
-	    foreach (@{$selectedsections}) {
-		if ($s eq $_) {
-		    $r->print(' selected');
-		    last;
-		}
+    my %sectionhash = &Apache::loncommon::get_sections();
+    return if (!%sectionhash);
+
+    $r->print('<select name="Section" multiple="true" size="8" >');
+    foreach my $s ('all',sort keys %sectionhash) {
+	$r->print('    <option value="'.$s.'"');
+	foreach (@{$selectedsections}) {
+	    if ($s eq $_) {
+		$r->print(' selected');
+		last;
 	    }
-	    $r->print('>'.$s."</option>\n");
 	}
-        $r->print("</select>\n");
-   }
+	$r->print('>'.$s."</option>\n");
+    }
+    $r->print("</select>\n");
 }
 
 sub groupmenu {
     my ($r,$selectedgroups)=@_;
-    my %grouphash;
-    my $numgrp = &Apache::loncommon::coursegroups(
-                 \%grouphash,
-                 $env{'course.'.$env{'request.course.id'}.'.domain'},
-                 $env{'course.'.$env{'request.course.id'}.'.num'});
-    if ($numgrp) {
-        $r->print('<select name="Group" multiple="true" size="8" >');
-        foreach my $group (sort(keys(%grouphash))) {
-            $r->print('    <option value="'.$group.'"');
-            foreach (@{$selectedgroups}) {
-                if ($group eq $_) {
-                    $r->print(' selected');
-                    last;
-                }
-            }
-            $r->print('>'.$group."</option>\n");
-        }
-        $r->print("</select>\n");
+    my %grouphash = &Apache::loncommon::coursegroups();
+    return if (!%grouphash);
+
+    $r->print('<select name="Group" multiple="true" size="8" >');
+    foreach my $group (sort(keys(%grouphash))) {
+	$r->print('    <option value="'.$group.'"');
+	foreach (@{$selectedgroups}) {
+	    if ($group eq $_) {
+		$r->print(' selected');
+		last;
+	    }
+	}
+	$r->print('>'.$group."</option>\n");
     }
+    $r->print("</select>\n");
 }
 
 
@@ -1984,8 +1969,8 @@ sub crsenv {
     my $r=shift;
     my $setoutput='';
 
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,
-						    'Edit 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'};
 
@@ -2088,7 +2073,7 @@ sub crsenv {
     }
 # ------------------------- Re-init course environment entries for this session
 
-    &Apache::lonnet::coursedescription($env{'request.course.id'}
+    &Apache::lonnet::coursedescription($env{'request.course.id'},
 				       {'freshen_cache' => 1});
 
 # -------------------------------------------------------- Get parameters again
@@ -2647,7 +2632,7 @@ sub newoverview {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $start_page = &Apache::loncommon::start_page('Set Parameters');
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print(<<ENDOVER);
 $start_page
 $breadcrumbs
@@ -2801,7 +2786,7 @@ sub overview {
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $start_page=&Apache::loncommon::start_page('Modify Parameters');
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print(<<ENDOVER);
 $start_page
 $breadcrumbs
@@ -3091,8 +3076,7 @@ sub setrestrictmeta {
     my $put_result;
     
     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
-						    'Restrict Metadata'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
@@ -3149,7 +3133,7 @@ sub defaultsetter {
 
     my $start_page = 
 	&Apache::loncommon::start_page('Parameter Setting Default Actions');
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Defaults');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
     $r->print(<<ENDDEFHEAD);
 $start_page
 $breadcrumbs
@@ -3357,12 +3341,15 @@ sub parm_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); }
+
     my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
 						     $env{'course.'.$env{'request.course.id'}.'.domain'});
-    $r->print('<table border="2">');
-    my $bgcolor='#EEEEEE';
+    $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
+	      '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
+	      &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
+	      &Apache::loncommon::end_data_table_header_row());
     foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
-	if ($bgcolor eq '#EEEEEE') { $bgcolor='#FFFFCC'; } else { $bgcolor='#EEEEEE'; }
         my @changes=keys(%{$parmlog{$id}{'logentry'}});
 	my $count=$#changes+1;
 	my $time =
@@ -3382,7 +3369,8 @@ sub parm_change_log {
 						   $parmlog{$id}{'exe_uname'},
 						   $parmlog{$id}{'exe_udom'});
 	}
-	$r->print('<tr bgcolor="'.$bgcolor.'"><td rowspan="'.$count.'">'.$time.'</td>
+	my $row_start=&Apache::loncommon::start_data_table_row();
+	$r->print($row_start.'<td rowspan="'.$count.'">'.$time.'</td>
                        <td rowspan="'.$count.'">'.$about_me_link.
 		  '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
 			          ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
@@ -3394,7 +3382,7 @@ sub parm_change_log {
             my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection)=
 		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'});
 	    if ($typeflag) { $istype{$parmname}=$value; }
-	    if ($makenewrow) { $r->print('<tr bgcolor="'.$bgcolor.'">'); } else { $makenewrow=1; }
+	    if ($makenewrow) { $r->print($row_start); } else { $makenewrow=1; }
 	    $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.
 		      &standard_parameter_names($parmname).'</td><td>'.
 		      ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>');
@@ -3429,10 +3417,10 @@ sub parm_change_log {
 	    } else {
 		$r->print('<td>&nbsp;</td>');
 	    }
-	    $r->print('</tr>');
+	    $r->print(&Apache::loncommon::end_data_table_row());
 	}
     }
-    $r->print('</table>');
+    $r->print(&Apache::loncommon::end_data_table());
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3500,8 +3488,7 @@ sub handler {
 
         } elsif (! exists($env{'form.action'})) {
             $r->print(&header());
-            $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
-							 'Parameter Manager'));
+            $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',