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

[albertel]

albertel		Fri Dec  1 17:53:10 2006 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm task.css 
  Log:
  - move the overall status message back into the existing div.
  - some updates to the css
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.212 loncom/homework/bridgetask.pm:1.213
--- loncom/homework/bridgetask.pm:1.212	Tue Nov 28 11:43:51 2006
+++ loncom/homework/bridgetask.pm	Fri Dec  1 17:53:08 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.212 2006/11/28 16:43:51 albertel Exp $
+# $Id: bridgetask.pm,v 1.213 2006/12/01 22:53:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1061,27 +1061,30 @@
 		    $start_time=&Apache::lonlocal::locallocaltime($start_time);
 
 		    my $status = 
-			"\n<div class='LC_$bt_status LC_criteria'>\n\t";
+			"\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t";
 		    
+		    my $dim = $top;
+		    my %counts = &get_counts($dim,undef,$parstack,
+					     $safeeval);
+		    my $question_status ="\n\t<p>".
+			&question_status_message(\%counts,-1).
+			"</p>\n";
+
 		    if ($bt_status eq 'pass')  {
 			$status.='<h2>You passed the '.$title.' given on '.
 			    $start_time.'</h2>';
+			$status.=$question_status;
 		    }
 		    if ($bt_status eq 'fail')  {
 			$status.='<h2>You did not pass the '.$title.' given on '.
 			    $start_time.'</h2>';
+			$status.=$question_status;
 			if (!$previous) {
 			    $status.=&add_request_another_attempt_button();
 			}
 		    }
-		    $status.="\n".'</div>'."\n";
-		    my $dim = $top;
-		    my %counts = &get_counts($dim,undef,$parstack,
-					     $safeeval);
-		    $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t<p>".
-			&question_status_message(\%counts,-1).
-			"</p>\n</div>\n";
 		    
+		    $status.="\n".'</div>'."\n";
 
 		    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
 			my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
@@ -2431,7 +2434,7 @@
 	foreach my $type ('cri','dim') {
 	    if ($counts->{$req.'_'.$type}) {
 		push(@sections,
-		     $counts->{$req.'_'.$type.'_passed'}.' of '.
+		     $counts->{$req.'_'.$type.'_passed'}.' of the '.
 		     $counts->{$req.'_'.$type}.' '.
 		     $req{$req}.' '.$type{$type});
 	    }
Index: loncom/homework/task.css
diff -u loncom/homework/task.css:1.7 loncom/homework/task.css:1.8
--- loncom/homework/task.css:1.7	Tue Nov 28 12:55:25 2006
+++ loncom/homework/task.css	Fri Dec  1 17:53:08 2006
@@ -3,6 +3,8 @@
 	padding-bottom: 6em;
 	font-family:Verdana, Arial, Helvetica, sans-serif;
 	font-size: small;
+	color: #0a6331;
+	background-color: white;
 }
 
 /*
@@ -166,8 +168,8 @@
 	margin: 0;
 }
 
-.LC_question_grade {
-	
+div.LC_question_grade {
+	padding-left: 3em;
 }
 
 .LC_fail {
@@ -217,4 +219,4 @@
 div.LC_criteria h4 + p:before { content: "Criteria: ";}
 /* div.LC_criteria p.LC_comment:before { content: "Comment: "; } */
 div.LC_criteria p.LC_comment { color: black; }
-div.LC_criteria form + p, div.LC_criteria h2 + p { display: none; }
+/* div.LC_criteria form + p, div.LC_criteria h2 + p { display: none; } */