loncom/homework/bridgetask.pm - diff

Return to bridgetask.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.123 and 1.128.2.2

version 1.123, 2006/03/28 20:45:58	version 1.128.2.2, 2006/03/29 20:33:50
Line 259 sub preserve_grade_info {	Line 259 sub preserve_grade_info {
}	}

sub style {	sub style {
return (<<STYLE);	my ($target) = @_;
<style type="text/css">	if ($target eq 'web'
.LC_fail, .LC_pass, .LC_neutral {	\|\| $target eq 'webgrade') {
position: relative;	return (<<STYLE);
margin : 5px;	<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
margin-bottom :10px;
padding : 4px;
padding-left : 75px;
border : thin solid;
font-weight : bolder;
font-size: smaller;
font-family: Arial;
background-color : rgb(255,240,225);
}

.LC_fail h4, .LC_pass h4 {
position:absolute;
left: -4px;
top: -8px;
padding:2px;
margin:0;
background-color : rgb(255,240,225);
border : thin solid;
}

.LC_fail {
color: red;
}

.LC_pass {
color : green;
}

.LC_neutral {
color : blue;
}

.LC_question {
border : thin solid black;
padding : 4px;
margin-bottom : 1em;
}

.LC_grade {
font-size: x-large;
font-family: Arial;
position:absolute;
left: 5px;
top: -5px;
width: 70px;
}

div#feedback h1 {
color : inherit;
}
</style>
STYLE	STYLE
	}
	return;
}	}

sub show_task {	sub show_task {
Line 429 sub start_Task {	Line 379 sub start_Task {
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=	my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);	&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);

	$head_tag_start .= &style($target);
$body_tag_start .= '<div class="LC_task">'."\n";	$body_tag_start .= '<div class="LC_task">'."\n";

if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
Line 504 sub start_Task {	Line 455 sub start_Task {
my $files = '<ul>';	my $files = '<ul>';
foreach my $file (@files) {	foreach my $file (@files) {
my $url="/uploaded/$domain/$user/portfolio$file";	my $url="/uploaded/$domain/$user/portfolio$file";
if (! &Apache::lonnet::stat_file($url)) {	$file = '<tt>'.$file.'</tt>';
$file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
} else {
$file = '<tt>'.$file.'</tt>';
}
$files .= '<li>'.$file.'</li>';	$files .= '<li>'.$file.'</li>';
}	}
$files.='</ul>';	$files.='</ul>';
Line 547 DONESCREEN	Line 494 DONESCREEN
}	}
} elsif ($target eq 'web') {	} elsif ($target eq 'web') {
$result.="$head_tag_start</head>	$result.="$head_tag_start</head>
$body_tag_start \n".&style();	$body_tag_start \n";

$result.=&preserve_grade_info();	$result.=&preserve_grade_info();
$result.=&internal_location();	$result.=&internal_location();
Line 559 DONESCREEN	Line 506 DONESCREEN
$target eq 'webgrade') {	$target eq 'webgrade') {
my $webgrade='yes';	my $webgrade='yes';
if ($target eq 'webgrade') {	if ($target eq 'webgrade') {
$result.=$head_tag_start.'</head>'.$body_tag_start;	$result.=$head_tag_start.
	'</head>'.$body_tag_start.
	"\n".'<div class="LC_GRADING_task">'."\n".
	'<script type="text/javascript"
	src="/res/adm/includes/task_grading.js"></script>';
#$result.='<br />Review'.&show_queue('reviewqueue');	#$result.='<br />Review'.&show_queue('reviewqueue');
#$result.='<br />Grade'.&show_queue('gradingqueue');	#$result.='<br />Grade'.&show_queue('gradingqueue');
}	}
Line 1019 DONEBUTTON	Line 970 DONEBUTTON
&Apache::structuretags::finalize_storage();	&Apache::structuretags::finalize_storage();
}	}
} elsif ($target eq 'webgrade') {	} elsif ($target eq 'webgrade') {
$result.="</div>\n<hr />";	$result.="</div>";
#$result.='<input type="submit" name="next" value="'.	#$result.='<input type="submit" name="next" value="'.
# &mt('Save & Next').'" /> ';	# &mt('Save & Next').'" /> ';
#$result.='<input type="submit" name="end" value="'.	#$result.='<input type="submit" name="end" value="'.
Line 1028 DONEBUTTON	Line 979 DONEBUTTON
# &mt('Throw Away & Stop Grading').'" /> ';	# &mt('Throw Away & Stop Grading').'" /> ';
#$result.='<input type="submit" name="save" value="'.	#$result.='<input type="submit" name="save" value="'.
# &mt('Save Partial Grade and Continue Grading').'" /> ';	# &mt('Save Partial Grade and Continue Grading').'" /> ';
$result.='</form>'."\n</div>\n".	$result.='</form>'."\n</div>\n</div>\n".
&Apache::loncommon::endbodytag().'</html>';	&Apache::loncommon::endbodytag().'</html>';
} elsif ($target eq 'meta') {	} elsif ($target eq 'meta') {
$result.=&Apache::response::meta_package_write('Task');	$result.=&Apache::response::meta_package_write('Task');
Line 1919 sub start_IntroParagraph {	Line 1870 sub start_IntroParagraph {
if ($tagstack->[-2] eq 'Dimension') {	if ($tagstack->[-2] eq 'Dimension') {
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);	$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);

} elsif ($target eq 'webgrade') {	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
	&Apache::lonxml::startredirection();
	} else {
	&Apache:;lonxml::error("Invalid use of <IntroParagraph> inside of <".$tagstack->[-2].">");
&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);	&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
}	}

Line 1928 sub start_IntroParagraph {	Line 1882 sub start_IntroParagraph {
}	}

sub end_IntroParagraph {	sub end_IntroParagraph {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
	my $result = &Apache::lonxml::endredirection();
	}
}	}

sub start_Instance {	sub start_Instance {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.123
changed lines
	Added in v.1.128.2.2