[LON-CAPA-cvs] cvs: loncom /interface lonsearchcat.pm

bisitz lon-capa-cvs-allow@mail.lon-capa.org
Fri, 08 Aug 2008 08:51:41 -0000


bisitz		Fri Aug  8 04:51:41 2008 EDT

  Modified files:              
    /loncom/interface	lonsearchcat.pm 
  Log:
  - Replaced search status table with LON-CAPA standard table
  - Set status fields to readonly
  
  
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.297 loncom/interface/lonsearchcat.pm:1.298
--- loncom/interface/lonsearchcat.pm:1.297	Mon Aug  4 11:28:21 2008
+++ loncom/interface/lonsearchcat.pm	Fri Aug  8 04:51:39 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.297 2008/08/04 15:28:21 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.298 2008/08/08 08:51:39 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2501,7 +2501,7 @@
         pop(@Lines);
     }
     if (@Lines > 2) {
-        $pretty_string = join '<br />',(@Lines[0..2],'....<br />');
+        $pretty_string = join '<br />',(@Lines[0..2],'...<br />');
     }
     $r->print(&mt("Search: [_1]",$pretty_string));
     $r->rflush();
@@ -2556,21 +2556,22 @@
     my $server; 
     my $status;
     my $revise = &revise_button();
-    my $txt_total = &mt('Total Matches');
-    my $txt_remain = &mt('Time Remaining');
-    my $txt_status = &mt('Status');
-    $r->print(<<END);
-<table>
-<tr><th>$txt_status</th><th>$txt_total</th><th>$txt_remain</th><th></th></tr>
-<tr>
-<td><input type="text" name="status"  value="" size="50" /></td>
-<td><input type="text" name="count"   value="" size="10" /></td>
-<td><input type="text" name="seconds" value="" size="8" /></td>
-<td>$revise</td>
-</tr>
-</table>
-</form>
-END
+    $r->print(&Apache::loncommon::start_data_table());
+    $r->print(&Apache::loncommon::start_data_table_header_row()
+             .'<th>'.&mt('Status').'</th>'
+             .'<th>'.&mt('Total Matches').'</th>'
+             .'<th>'.&mt('Time Remaining').'</th>'
+#             .'<th>&nbsp;</th>'
+             .&Apache::loncommon::end_data_table_header_row());
+    $r->print(&Apache::loncommon::start_data_table_row()
+             .'<td><input type="text" name="status"  value="" size="50" readonly="readonly" /></td>'
+             .'<td><input type="text" name="count"   value="" size="10" readonly="readonly" /></td>'
+             .'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'
+#             ."<td>$revise</td>"
+             .&Apache::loncommon::end_data_table_row());
+    $r->print(&Apache::loncommon::start_data_table());
+    $r->print($revise
+             .'</form>');
     $r->rflush();
     &reset_timing();
     &update_seconds($r);