--- loncom/interface/lonparmset.pm	2006/11/15 20:13:43	1.345
+++ loncom/interface/lonparmset.pm	2006/11/29 22:02:47	1.349
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.345 2006/11/15 20:13:43 banghart Exp $
+# $Id: lonparmset.pm,v 1.349 2006/11/29 22:02:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3189,8 +3189,8 @@ ENDMAINFORMHEAD
 ### Set portfolio metadata
 sub output_row {
     my ($r, $field_name, $field_text, $added_flag) = @_;
+    my $row_class;
     my $output;
-    $output = "<tr>";
     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
     if (!defined($options)) {
@@ -3198,10 +3198,11 @@ sub output_row {
         $values = '';
     }
     if (!($options =~ /deleted/)) {
-        $output = "<tr>";
-        $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></td>';
-        $output .= '<td><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
-        $output .= "</tr>\n";
+        $output = &Apache::loncommon::start_data_table_row();
+        $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
+        # $output .= '<td><strong>'.$field_text.':</strong></td>';
+        $output .= '<td><span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
+        $output .= &Apache::loncommon::end_data_table_row();
         my @options= ( ['active', 'Show to student'],
 		   ['onlyone','Student may select only one choice'],
 		   ['stuadd', 'Student may type choices']);
@@ -3210,9 +3211,11 @@ sub output_row {
         }
         foreach my $opt (@options) {
 	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
-	    $output .= '<tr><td colspan="2">'.('&nbsp;' x 5).'<span class="LC_metadata"><label><input type="checkbox" name="'.
+	    $output .= &Apache::loncommon::continue_data_table_row();
+	    $output .= '<td colspan="2">'.('&nbsp;' x 5).'<span class="LC_metadata"><label><input type="checkbox" name="'.
 	        $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
-	        &mt($opt->[1]).'</label></span> </td></tr>'."\n";
+	        &mt($opt->[1]).'</label></span> </td>';
+	    $output .= &Apache::loncommon::end_data_table_row();
 	}
 	
     }
@@ -3395,29 +3398,31 @@ sub setrestrictmeta {
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     # Now get possible added metadata fields
     my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);
-    $output .= "<table>";
+    my $row_alt = 1;
+    $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {
         if ($field ne 'courserestricted') {
+            $row_alt = $row_alt ? 0 : 1;
 	    $output.= &output_row($r, $field, $metadata_fields{$field});
 	}
     }
     my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {
-        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag);
+        $row_alt = $row_alt ? 0 : 1;
+        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
     }
-    $output .= "</table>";
+    $output .= &Apache::loncommon::end_data_table();
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
-        <p>
         $output
-        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
+        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions" />
         </form><br />
-        <form method="post" action="/adm/parmset?action=addmetadata" name="form">
-        <input type="submit" name="restrictmeta" value="Add a Metadata Field">
+        <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
+        <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
         </form>
-        </form><br />
-        <form method="post" action="/adm/parmset?action=ordermetadata" name="form">
-        <input type="submit" name="restrictmeta" value="Order Metadata Fields">
+        <br />
+        <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
+        <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
         </form>
 ENDenv
     $r->print(&Apache::loncommon::end_page());
@@ -3701,13 +3706,7 @@ sub parm_change_log {
                                               \%saveable_parameters);
     &Apache::loncommon::restore_course_settings('parameter_log',
                                                 \%saveable_parameters);
-    if (!$env{'form.show'}) { $env{'form.show'}=10; }
-
-    my $countselect =
-	&Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
-				    (&mt('all'),10,20,50,100,1000,10000));
-
-    $r->print('<nobr>'.&mt('[_1] Records',$countselect).'</nobr>'.
+    $r->print(&Apache::loncommon::display_filter().
               '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
 	      ' '.&mt('Include parameter types').'</label>'.
 	      '<input type="submit" value="'.&mt('Display').'" /></form>');
@@ -3719,6 +3718,16 @@ sub parm_change_log {
 	      &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
 	      &Apache::loncommon::end_data_table_header_row());
     my $shown=0;
+    my $folder='';
+    if ($env{'form.displayfilter'} eq 'currentfolder') {
+	my $last='';
+	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+		&GDBM_READER(),0640)) {
+	    $last=$hash{'last_known'};
+	    untie(%hash);
+	}
+	if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
+    }
     foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
         my @changes=keys(%{$parmlog{$id}{'logentry'}});
 	my $count = 0;
@@ -3740,7 +3749,6 @@ sub parm_change_log {
 						   $parmlog{$id}{'exe_udom'});
 	}
 	my $row_start=&Apache::loncommon::start_data_table_row();
-	$r->print($row_start);
 	my $makenewrow=0;
 	my %istype=();
 	my $output;
@@ -3750,6 +3758,11 @@ sub parm_change_log {
 			    !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
 		&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+	    if ($env{'form.displayfilter'} eq 'currentfolder') {
+		if ($folder) {
+		    if ($middle!~/^\Q$folder\E/) { next; }
+		}
+	    }
 	    if ($typeflag) {
 		$istype{$parmname}=$value; 
 		if (!$env{'form.includetypes'}) { next; } 
@@ -3802,13 +3815,20 @@ sub parm_change_log {
 	    }
 	    $output .= '</td>'.&Apache::loncommon::end_data_table_row();
 	}
-	$r->print('<td rowspan="'.$count.'">'.$time.'</td>
+        if ($env{'form.displayfilter'} eq 'containing') {
+	    my $wholeentry=$about_me_link.':'.
+		$parmlog{$id}{'exe_uname'}.':'.$parmlog{$id}{'exe_udom'}.':'.
+		$output;
+	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }        
+	}
+        if ($count) {
+	    $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>'.
 		  $send_msg_link.'</td>'.$output);
-
-	$shown++;
+	    $shown++;
+	}
 	if (!($env{'form.show'} eq &mt('all') 
 	      || $shown<=$env{'form.show'})) { last; }
     }