Index: trunk/expressoMail1_2/index.php
===================================================================
--- trunk/expressoMail1_2/index.php	(revision 5622)
+++ trunk/expressoMail1_2/index.php	(revision 5636)
@@ -28,4 +28,9 @@
 	//jquery and Editor 
  	        echo '  			
+				<link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.css"></link>
+				<link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.print.css"></link>
+				<link rel="stylesheet" type="text/css" href="../prototype/plugins/icalendar/jquery.icalendar.css"></link>
+			
+			
 					<link rel="Stylesheet" type="text/css" href="templates/default/expressoMail_reset.css" />
 					<script type="text/javascript" src="../prototype/plugins/jquery/jquery.min.js"></script>
@@ -56,4 +61,5 @@
 					<link rel="stylesheet" type="text/css" href="../prototype/plugins/zebradialog/css/zebra_dialog.css"></link>
 					<link rel="stylesheet" type="text/css" href="../prototype/plugins/fileupload/jquery.fileupload-ui.css"></link>
+					
 					<link rel="stylesheet" href="../prototype/plugins/farbtastic/farbtastic.css" type="text/css" >
 					<script type="text/javascript" src="../prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script>
Index: trunk/expressoMail1_2/templates/default/expressoMail_reset.css
===================================================================
--- trunk/expressoMail1_2/templates/default/expressoMail_reset.css	(revision 5592)
+++ trunk/expressoMail1_2/templates/default/expressoMail_reset.css	(revision 5636)
@@ -8,5 +8,5 @@
  * http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/
  */
-
+/*
 .new-event-win.active applet, .new-event-win.active object, .new-event-win.active iframe, .new-event-win.active fieldset, .new-event-win.active div
 .new-event-win.active h1, .new-event-win.active h2, .new-event-win.active h3, .new-event-win.active h4, .new-event-win.active h5, .new-event-win.active h6, .new-event-win.active p, .new-event-win.active blockquote, .new-event-win.active pre,
@@ -27,6 +27,5 @@
 	/*vertical-align: baseline;*/
 /*	font-family: Arial,Helvetica,sans-serif;*/
-}
-
+/*}*/
 .new-event-win.active:focus {
 	outline: 0;
@@ -114,4 +113,32 @@
 	border: 0;
 }
+
+.new-event-win.active .fc-event-skin {
+	border-color: #36C !important;
+	background-color: #36C !important; 
+	color: white !important;
+}
+
+.fc-event-vert .fc-event-bg {
+	display: block !important;
+}
+
+.map-event{
+
+}
+
+#new_event_map .map-event .fc-event-inner.fc-event-skin{
+	border-style: dashed !important;
+	border-width: 2px !important;
+	border-color: #36C !important;
+	background-color: transparent !important;
+}
+
+ #new_event_map .map-event .fc-event-inner.fc-event-skin .fc-event-head{
+	background-color: transparent !important;
+	color: transparent !important;
+}
+
+
 /*#divAppbox
 { background: #fff url( ../images/bgBlockContent.jpg ) repeat-x; border-color: #9c9c9c; }
Index: trunk/expressoMail1_2/js/main.js
===================================================================
--- trunk/expressoMail1_2/js/main.js	(revision 5626)
+++ trunk/expressoMail1_2/js/main.js	(revision 5636)
@@ -3230,11 +3230,14 @@
 		
 		//$.ajax({ url: "../expressoCalendar/index.php", async: false});
-		$.ajax({url: "../prototype/modules/calendar/js/calendar.date.js", async: false});
-		$.ajax({url: "../prototype/modules/calendar/js/helpers.js", async: false});
+		$.ajax({url: "../prototype/modules/calendar/js/calendar.date.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+		$.ajax({url: "../prototype/modules/calendar/js/map.disponibility.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+		$.ajax({url: "../prototype/modules/calendar/js/helpers.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
 		//$.ajax({ url: "../prototype/modules/calendar/js/timezone.js", async: false});
 		//$.ajax({ url: "../prototype/modules/calendar/js/calendar.codecs.js", async: false});
-		$.ajax({url: "../prototype/plugins/encoder/encoder.js", async: false});
-		$.ajax({url: "../prototype/plugins/dateFormat/dateFormat.js", async: false});
-
+		$.ajax({url: "../prototype/plugins/encoder/encoder.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+		$.ajax({url: "../prototype/plugins/dateFormat/dateFormat.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+
+		$.ajax({ url: "../prototype/plugins/fullcalendar/fullcalendar.js", async: false , beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});
+		
 		
 		DataLayer.dispatchPath = "../prototype/";	
