Index: trunk/webapps/einotebook/scripts/Event.js
===================================================================
--- trunk/webapps/einotebook/scripts/Event.js	(revision 418)
+++ trunk/webapps/einotebook/scripts/Event.js	(revision 515)
@@ -146,14 +146,14 @@
 	function html()
 	{
-        //console.log("building html for event: ", this.eventHeaderID, incidentColor[this.incident.number]);
+        //console.log("building html for event: ", this.eventHeaderID, this.incident.color); //incidentColor[this.incident.number]);
 
 		return "<table class='event'>" +
 			   "<tr>" +
-			   "<td class='eventHeader' style='background-color:" + incidentColor[this.incident.number] + "'" +
+			   "<td class='eventHeader' style='background-color:" + this.incident.color + "'" +
                "id='" + this.eventHeaderID + "'>" + 
 			      this.headerHTML() + "</td>" +
 			   "</tr>" +
 			   "<tr>" + 
-			   "<td class='eventData' style='background-color:" + incidentColor[this.incident.number] + "' id='" + this.dataID + "'>" + 
+			   "<td class='eventData' style='background-color:" + this.incident.color + "' id='" + this.dataID + "'>" + 
 			   (this.expanded ? this.dataHTML() : "") + 
 			   "</td>" +
@@ -187,5 +187,5 @@
 		events.doc.getElementById(this.eventHeaderID).style.color = "black";
 		events.doc.getElementById(this.dataID).style.color = "black";
-        events.doc.getElementById(this.dataID).style.backgroundColor = incidentColor[this.incident.number];
+        events.doc.getElementById(this.dataID).style.backgroundColor = this.incident.color;
 		
 		// IF this event is expanded THEN
@@ -220,5 +220,5 @@
 	function normalize()
 	{
-        var myColor = incidentColor[this.incident.number];
+        var myColor = this.incident.color;
 		events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "white";
 		events.doc.getElementById(this.eventHeaderID).style.borderColor = "black";