# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1251899050 -7200
# Node ID 4f4ad6f5021211251ef90bb0be09fb0a1a58ad8c
# Parent  12a69f7f963bfdf3b27f66e28a27c13a70cb825d# Parent  a7adeca85656f74cfb3a16cb2aa571098b062442
merge

diff -r 12a69f7f963b -r 4f4ad6f50212 web/data/cubicweb.calendar.js
--- a/web/data/cubicweb.calendar.js	Wed Sep 02 09:31:22 2009 +0200
+++ b/web/data/cubicweb.calendar.js	Wed Sep 02 15:44:10 2009 +0200
@@ -112,7 +112,8 @@
 	this.domtable = TABLE({'class': this.cssclass},
 			      THEAD(null, TR(null,
 					     TH(null, A({'href' : prevlink}, "<<")),
-					     TH({'colspan' : 5, 'style' : "text-align: center;"}, monthname),
+					     // IE 6/7 requires colSpan instead of colspan
+					     TH({'colSpan': 5, 'colspan':5, 'style' : "text-align: center;"}, monthname),
 					     TH(null, A({'href' : nextlink}, ">>")))),
 			      TBODY(null,
 				    this._headdisplay(),
diff -r 12a69f7f963b -r 4f4ad6f50212 web/data/cubicweb.calendar_popup.css
--- a/web/data/cubicweb.calendar_popup.css	Wed Sep 02 09:31:22 2009 +0200
+++ b/web/data/cubicweb.calendar_popup.css	Wed Sep 02 15:44:10 2009 +0200
@@ -24,17 +24,16 @@
 table.popupCalendar {
   text-align: center;
   border: 1px solid #ccc;
-  z-index: 100;
+  z-index: 400;
 }
 
-
 table.popupCalendar th {
+  border:1px solid #ccc;
   background : #d9d9c1;
   color: black;
   padding: 2px 3px;
 }
 
-
 table.popupCalendar th.calTitle,
 table.popupCalendar th.prev,
 table.popupCalendar th.next {
@@ -51,12 +50,12 @@
   padding: 2px 0px;
 }
 
-
 table.popupCalendar td {
   width: 2em;
   height: 2em;
   background : #f6f5e1;
   font-size: 85%;
+  border:1px solid #ccc;
 }
 
 table.popupCalendar td.today {
diff -r 12a69f7f963b -r 4f4ad6f50212 web/data/cubicweb.compat.js
--- a/web/data/cubicweb.compat.js	Wed Sep 02 09:31:22 2009 +0200
+++ b/web/data/cubicweb.compat.js	Wed Sep 02 15:44:10 2009 +0200
@@ -172,7 +172,7 @@
 		}
 		node[key] = value;
 	    } else { // normal node attribute
-		node.setAttribute(key, params[key]);
+		jQuery(node).attr(key, params[key]);
 	    }
 	}
 	if (children) {
diff -r 12a69f7f963b -r 4f4ad6f50212 web/views/plots.py
--- a/web/views/plots.py	Wed Sep 02 09:31:22 2009 +0200
+++ b/web/views/plots.py	Wed Sep 02 15:44:10 2009 +0200
@@ -103,7 +103,7 @@
 
     def _render(self, req, width=500, height=400):
         # XXX IE requires excanvas.js
-        req.add_js( ('jquery.flot.js', 'cubicweb.flot.js') )
+        req.add_js( ('jquery.flot.js', 'cubicweb.flot.js', 'excanvas.js') )
         figid = u'figure%s' % make_uid('foo')
         plotdefs = []
         plotdata = []