--- rat/lonpage.pm	2004/11/12 00:21:14	1.61
+++ rat/lonpage.pm	2004/12/10 19:29:19	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.61 2004/11/12 00:21:14 albertel Exp $
+# $Id: lonpage.pm,v 1.63 2004/12/10 19:29:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -417,7 +417,7 @@ sub handler {
 			  $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead ');
 			  if ($number_of_columns le $lcm) {$number_of_columns=$lcm;};
 		      } else {
-			  $r->print('<table cols="'.$lcm.'" border="0">');
+			  $r->print('<table width="100%" cols="'.$lcm.'" border="0">');
 		      }
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
@@ -429,20 +429,18 @@ sub handler {
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
                               my $metainfo = '';
-                              print STDERR "src is $hash{'src_'.$rid}\n";
+			      my $esrc=&Apache::lonnet::declutter($hash{'src_'.$rid});
+			      if ($hash{'encrypted_'.$rid}) {
+				  $esrc=&Apache::lonenc::encrypted($esrc);
+			      }
                               unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { 
-                                  $metainfo ='<a name="'.
-	&Apache::lonnet::escape(&Apache::lonnet::declutter($hash{'src_'.$rid})).'" />'.
+                                  $metainfo ='<a name="'.&Apache::lonnet::escape($esrc).'" />'.
                                   '<a href="'.$metalink{$rid}.'" target="LONcatInfo">'.
                                   '<img src="/adm/lonMisc/cat_button.gif" border=0>'.
                                   '</img></a>';
                               }
-			      my $esrc=$hash{'src_'.$rid};
-			      if ($hash{'encrypted_'.$rid}) {
-				  $esrc=&Apache::lonenc::encrypted($esrc);
-			      }
                               $metainfo .= '<a href="/adm/evaluate?postdata='.
-		    &Apache::lonnet::escape(&Apache::lonnet::declutter($esrc)).
+				  &Apache::lonnet::escape($esrc).
                                   '" target="LONcatInfo">'.
                                   '<img src="/adm/lonMisc/eval_button.gif" border=0>'.
                                   '</img></a>';