[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 31 Mar 2005 16:05:13 -0000


albertel		Thu Mar 31 11:05:13 2005 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm 
  Log:
  - remove the tables from the bridge task formatting
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.6 loncom/homework/bridgetask.pm:1.7
--- loncom/homework/bridgetask.pm:1.6	Mon Mar 28 16:50:46 2005
+++ loncom/homework/bridgetask.pm	Thu Mar 31 11:05:13 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.6 2005/03/28 21:50:46 albertel Exp $
+# $Id: bridgetask.pm,v 1.7 2005/03/31 16:05:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -173,7 +173,6 @@
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     if ($target eq 'web') {
-	$result='<table border="1"><tr><td>Closing</td></tr><tr><td>';
     }
     return $result;
 }
@@ -182,7 +181,6 @@
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     if ($target eq 'web') {
-	$result='</td></tr></table>';
     }
     return $result;
 }
@@ -205,14 +203,11 @@
 	#then start repicking
 	my $instance=$dimension{'instances'}->[0];
 	$result=$dimension{'intro'}.
-	    $dimension{$instance.'.text'}.
-	    '<table border="1"><tr><td>Criteria</td></tr><tr><td>';
-	foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-	    $result.=$dimension{$instance.'.criteria.'.$id}.
-		'</td></tr><tr><td>';
-	}
-	$result=~s/<tr><td>$//;
-	$result.='</table>';
+	    $dimension{$instance.'.text'};
+	#FIXME: don't show the criteria yet
+	#foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+	#    $result.=$dimension{$instance.'.criteria.'.$id};
+	#}
     }
     return $result;
 }
@@ -223,8 +218,6 @@
     if ($target eq 'web') {
 	if ($tagstack->[-2] eq 'Dimension') {
 	    &Apache::lonxml::startredirection();
-	} else {
-	    $result='<table border="1"><tr><td>Intro</td></tr><tr><td>';
 	}
     }
     return $result;
@@ -236,8 +229,6 @@
     if ($target eq 'web') {
 	if ($tagstack->[-2] eq 'Dimension') {
 	    $dimension{'intro'}=&Apache::lonxml::endredirection();
-	} else {
-	    $result='</td></tr></table>';
 	}
     }
     return $result;