[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm task_ie.css task_ie7.css doc/loncapafiles loncapafiles.lpml

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 06 Nov 2006 16:54:47 -0000


albertel		Mon Nov  6 11:54:47 2006 EDT

  Added files:                 
    /loncom/homework	task_ie7.css task_ie.css 

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml 
    /loncom/homework	bridgetask.pm 
  Log:
  - IE specific styles for tasks
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.513 doc/loncapafiles/loncapafiles.lpml:1.514
--- doc/loncapafiles/loncapafiles.lpml:1.513	Fri Oct 13 17:04:24 2006
+++ doc/loncapafiles/loncapafiles.lpml	Mon Nov  6 11:54:29 2006
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.513 2006/10/13 21:04:24 albertel Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.514 2006/11/06 16:54:29 albertel Exp $ -->
 
 <!--
 
@@ -5810,6 +5810,22 @@
   </description>
 </file>
 <file>
+  <source>loncom/homework/task_ie.css</source>
+  <target dist='default'>home/httpd/html/res/adm/includes/task_ie.css</target>
+  <categoryname>handler</categoryname>
+  <description>
+    Style definitions for task display for IE 6 and earlier
+  </description>
+</file>
+<file>
+  <source>loncom/homework/task.css</source>
+  <target dist='default'>home/httpd/html/res/adm/includes/task_ie7.css</target>
+  <categoryname>handler</categoryname>
+  <description>
+    Style definitions for task display for IE 7
+  </description>
+</file>
+<file>
   <source>loncom/homework/task_grading.js</source>
   <target dist='default'>home/httpd/html/res/adm/includes/task_grading.js</target>
   <categoryname>handler</categoryname>
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.191 loncom/homework/bridgetask.pm:1.192
--- loncom/homework/bridgetask.pm:1.191	Mon Nov  6 11:07:06 2006
+++ loncom/homework/bridgetask.pm	Mon Nov  6 11:54:46 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.191 2006/11/06 16:07:06 albertel Exp $
+# $Id: bridgetask.pm,v 1.192 2006/11/06 16:54:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -326,9 +326,22 @@
     my ($target) = @_;
     if ($target eq 'web'
 	|| $target eq 'webgrade') {
-	return (<<STYLE);
+	my $style = (<<STYLE);
 <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
 STYLE
+        if ($env{'browser.type'} eq 'explorer'
+	    && $env{'browser.os'} eq 'win' ) {
+	    if ($env{'browser.version'} < 7) {
+		$style .= (<<STYLE);
+<link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie.css" />
+STYLE
+            } else {
+		$style .= (<<STYLE);
+<link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie7.css" />
+STYLE
+	    }
+	}
+
     }
     return;
 }

Index: loncom/homework/task_ie7.css
+++ loncom/homework/task_ie7.css
LC_grade {
  margin-top: 1em;
}


Index: loncom/homework/task_ie.css
+++ loncom/homework/task_ie.css
div.LC_GRADING_criteriatext {
	height: 5em;
}
LC_fail, .LC_pass, .LC_neutral {
	position: static;
}
LC_fail h4, .LC_pass h4 {
	position: static;
	margin:-4em 0 0 -5em;
	width: 9em;
}
LC_grade {
	left: -5em;
	top: -15em;
	width: 2em;
	border: 1px solid;
	position: static;
}