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

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 11 Jan 2007 19:01:40 -0000


albertel		Thu Jan 11 14:01:40 2007 EDT

  Modified files:              
    /loncom/homework	task.css bridgetask.pm 
  Log:
  - some tweaks to tasks look, remove the border around questions when doing the task, leave them in for the feedback display
  
  
Index: loncom/homework/task.css
diff -u loncom/homework/task.css:1.8 loncom/homework/task.css:1.9
--- loncom/homework/task.css:1.8	Fri Dec  1 17:53:08 2006
+++ loncom/homework/task.css	Thu Jan 11 14:01:38 2007
@@ -184,7 +184,7 @@
 	color : blue;
 }
 
-.LC_question {
+#LC_task_feedback .LC_question {
 	border : thin solid black;
 	padding : 4px;
 	margin-bottom : 1em;
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.217 loncom/homework/bridgetask.pm:1.218
--- loncom/homework/bridgetask.pm:1.217	Wed Jan 10 17:46:22 2007
+++ loncom/homework/bridgetask.pm	Thu Jan 11 14:01:38 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.217 2007/01/10 22:46:22 albertel Exp $
+# $Id: bridgetask.pm,v 1.218 2007/01/11 19:01:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -591,7 +591,6 @@
 	    &Apache::structuretags::page_start($target,$token,$tagstack,
 					       $parstack,$parser,$safeeval,
 					       $name,&style($target));
-	$result .= '<div class="LC_task">'."\n";
     }
 
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {
@@ -640,6 +639,11 @@
 					  'slot' => $slot_name});
 	    ($version,$previous)=&get_version();
 	}
+	
+	my $status_id = 
+	    ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
+	                                            : 'LC_task_take';
+	$result .= '<div class="LC_task" id="'.$status_id.'">'."\n";
 
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
@@ -707,6 +711,7 @@
 	      $target eq 'webgrade') {
 	my $webgrade='yes';
 	if ($target eq 'webgrade') {
+	    $result .= '<div class="LC_task">'."\n";
 	    $result.= "\n".'<div class="LC_GRADING_task">'."\n".
 		'<script type="text/javascript" 
                          src="/res/adm/includes/task_grading.js"></script>';