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

[albertel]

albertel		Tue Mar 28 16:11:04 2006 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm 
  Log:
  - moving task style info to an external file
  - style include in both web and webgrade modes
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.124 loncom/homework/bridgetask.pm:1.125
--- loncom/homework/bridgetask.pm:1.124	Tue Mar 28 16:06:00 2006
+++ loncom/homework/bridgetask.pm	Tue Mar 28 16:11:02 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.124 2006/03/28 21:06:00 albertel Exp $
+# $Id: bridgetask.pm,v 1.125 2006/03/28 21:11:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -259,64 +259,14 @@
 }
 
 sub style {
-    return (<<STYLE);
-<style type="text/css">
-.LC_fail, .LC_pass, .LC_neutral {
-    position: relative;
-    margin : 5px;
-    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>
+    my ($target) = @_;
+    if ($target eq 'web'
+	|| $target eq 'webgrade') {
+	return (<<STYLE);
+<link rel="stylesheet" type="text/css" href="/adm/includes/task.css" />
 STYLE
-
+    }
+    return;
 }
 
 sub show_task {
@@ -429,6 +379,7 @@
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
 	&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
     
+    $head_tag_start .= &style($target);
     $body_tag_start .= '<div class="LC_task">'."\n";
 
     if ($target eq 'web' || $target eq 'webgrade') {
@@ -547,7 +498,7 @@
 	    }
 	} elsif ($target eq 'web') {
 	    $result.="$head_tag_start</head>
-              $body_tag_start \n".&style();
+              $body_tag_start \n";
 	    
 	    $result.=&preserve_grade_info();
 	    $result.=&internal_location();