--- loncom/interface/loncommon.pm	2006/11/29 15:38:22	1.475
+++ loncom/interface/loncommon.pm	2006/11/29 22:02:47	1.478
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.475 2006/11/29 15:38:22 www Exp $
+# $Id: loncommon.pm,v 1.478 2006/11/29 22:02:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1381,17 +1381,18 @@ sub select_form {
 
 sub display_filter {
     if (!$env{'form.show'}) { $env{'form.show'}=10; }
+    if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
     return '<nobr><label>'.&mt('Records [_1]',
 			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
 							   (&mt('all'),10,20,50,100,1000,10000))).
-	   '</label></nobr> <nobr><label>'.
+	   '</label></nobr> <nobr>'.
            &mt('Filter [_1]',
-	   &select_form(($env{'form.displayfilter'}?$env{'form.displayfilter'}:'currentfolder'),
-					'displayfilter',
-					('currentfolder' => 'Current folder',
-					 'containing' => 'Containing phrase',
-					 'none' => 'None'))).
-	   '<input type="text" name="containingphrase" size="30" /></label></nobr>';
+	   &select_form($env{'form.displayfilter'},
+			'displayfilter',
+			('currentfolder' => 'Current folder/page',
+			 'containing' => 'Containing phrase',
+			 'none' => 'None'))).
+			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
 }
 
 sub gradeleveldescription {
@@ -2896,7 +2897,6 @@ sub parse_block_record {
         ($setuname,$setudom) = split(/:/,$record->{'setter'});
         $title = &unescape($record->{'event'});
         $blocks = $record->{'blocks'};
-
     } else {
         my @data = split(/:/,$record,3);
         if (scalar(@data) eq 2) {
@@ -2919,7 +2919,7 @@ sub build_block_table {
         'blse' => 'Block set by'
     );
     my $output;
-    $output = '<br /><br />'.$lt{'cacb'}.':<br /><br />';
+    $output = '<br />'.$lt{'cacb'}.':<br />';
     $output .= &start_data_table();
     $output .= '
 <tr>
@@ -2932,15 +2932,14 @@ sub build_block_table {
         my %courseinfo=&Apache::lonnet::coursedescription($course);
         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
-            my $fullname = &Apache::loncommon::plainname($uname,$udom);
+            my $fullname = &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
             $openblock = &Apache::lonlocal::locallocaltime($openblock);
             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
             $output .= &Apache::loncommon::start_data_table_row().
                        '<td>'.$courseinfo{'description'}.'</td>'.
                        '<td>'.$openblock.' to '.$closeblock.'</td>'.
-                       '<td>'.$fullname.' ('.$uname.':'.$udom.
-                       ')</td>'.
+                       '<td>'.$fullname.'.</td>'.
                         &Apache::loncommon::end_data_table_row();
         }
     }