diff -r cf7cec096e74 subsystem/maintenance/nav/web/templates/MaintenanceCalTemplate.tmpl
--- a/subsystem/maintenance/nav/web/templates/MaintenanceCalTemplate.tmpl	Mon Jun 08 15:41:48 2009 +0200
+++ b/subsystem/maintenance/nav/web/templates/MaintenanceCalTemplate.tmpl	Thu Jun 25 16:51:58 2009 +0200
@@ -27,6 +27,7 @@
 #extends MaintenanceTemplate
 #import calendar
 #import time
+#import mx.DateTime
 
 #block tabcontent
 #set $cal = calendar.monthcalendar(int($year), int($month))
@@ -82,24 +83,31 @@
 
             #if $tasks.has_key($date)
                 #for $task in $tasks[$date]
+                        
+            <div class="vevent">
             <strong>$task.maint_start.strftime('%H:%M'):</strong>
-            <a href="view?id=$task.maint_taskid" title="$task.description">
+            <abbr class="summary" title="NAV task: $task.description"/>
+
+            <abbr class="dtstart" title="$task.maint_start.strftime('%Y-%m-%d %H:%M%z')"/>
+            <abbr class="dtend"   title="$task.maint_end.strftime(  '%Y-%m-%d %H:%M%z')"/>
+            <a class="url" href="view?id=$task.maint_taskid" title="$task.description">
                     #if len($task.description) > 16
             $task.description[:16]...</a>
                     #else
             $task.description</a>
                     #end if
-                    #if $task.interval.days > 0
-                        #set $interval = $task.interval.days
+                    #if int($task.interval.strftime('%d')) > 0
+                        #set $interval = int($task.interval.strftime('%d'))
             ($(interval)d)
                     #else
-                        #set $interval = $task.interval.seconds / 3600
+                        #set $interval = int($task.interval.strftime('%H'))
             ($(interval)h)
                     #end if
             <br />
                 #end for
             #else
             &nbsp;
+            </div>
             #end if
         </td>
         #end if
diff -r cf7cec096e74 subsystem/maintenance/nav/web/templates/MaintenanceListTemplate.tmpl
--- a/subsystem/maintenance/nav/web/templates/MaintenanceListTemplate.tmpl	Mon Jun 08 15:41:48 2009 +0200
+++ b/subsystem/maintenance/nav/web/templates/MaintenanceListTemplate.tmpl	Thu Jun 25 16:51:58 2009 +0200
@@ -55,14 +55,19 @@
         #else
             #set $comp = 0
         #end if
-        <tr class="$rowcycler">
-            <td>$task.maint_start.strftime('%Y-%m-%d %H:%M')</td>
-            <td>$task.maint_end.strftime('%Y-%m-%d %H:%M')</td>
-            <td><a href="view?id=$task.maint_taskid">$desc</a></td>
+        <tr class="vevent $rowcycler">
+            <td class="dtstart" title="$task.maint_start.strftime('%Y-%m-%d %H:%M%z')">
+                $task.maint_start.strftime('%Y-%m-%d %H:%M') 
+            </td>
+            <td class="dtend" title="$task.maint_end.strftime('%Y-%m-%d %H:%M%z')">
+                $task.maint_end.strftime('%Y-%m-%d %H:%M') 
+            </td>
+            <td><a class="url" href="view?id=$task.maint_taskid"><span class="summary">$desc</span></a></td>
             <td><a href="view?id=$task.maint_taskid">$comp</a></td>
             <td>$task.author</td>
             <td>$task.state</td>
         </tr>
+        </div>
     #end for
 
     </tbody>