From 60a3503d1c0d60dd3cc4d6f3aeeda1e0d7bf9d3b Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <timeless%mozdev.org>
Date: Fri, 3 Oct 2003 15:19:45 +0000
Subject: [PATCH] Rewrap xul lines to make future diffs easier Move some
 unlocalizable strings to dtds Add accesskeys for various items Make menus
 more consistent with seamonkey (To => to) Make accesskeys more consistent
 with seamonkey (Pr_eferences) Hide clipboard items for minicalendar Possibly
 other stuff rs=mostafah

---
 calendar/resources/content/alertDialog.xul    |   15 +-
 calendar/resources/content/calendar.xul       |  276 +-
 calendar/resources/content/dayView.xul        |  323 ++-
 calendar/resources/content/eventDialog.xul    |  346 ++-
 .../content/importDuplicatesDialog.xul        |   16 +-
 calendar/resources/content/localCalDialog.xul |    3 +-
 calendar/resources/content/menuOverlay.xul    |  221 +-
 calendar/resources/content/printDialog.xul    |   58 +-
 calendar/resources/content/repeatOverlay.xul  |  173 +-
 calendar/resources/content/serverDialog.xul   |    4 +-
 calendar/resources/content/toDoDialog.xul     |  517 ++--
 calendar/resources/content/weekView.xul       | 2256 ++++++++++++++---
 calendar/resources/content/wizard.xul         |  137 +-
 calendar/resources/locale/en-US/calendar.dtd  |   86 +-
 .../resources/locale/en-US/menuOverlay.dtd    |   49 +-
 calendar/resources/locale/en-US/prefs.dtd     |    2 +-
 16 files changed, 3610 insertions(+), 872 deletions(-)

diff --git a/calendar/resources/content/alertDialog.xul b/calendar/resources/content/alertDialog.xul
index 3f9d69b8acf5..4e2d557b03ac 100644
--- a/calendar/resources/content/alertDialog.xul
+++ b/calendar/resources/content/alertDialog.xul
@@ -109,9 +109,18 @@
                                
                         <menulist name="alarm-length-units" labelnumber="labelplural" crop="none">
                            <menupopup >
-                              <menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;"   labelsingular="&alarm.units.minutes.singular;"  value="minutes"/>
-                              <menuitem label="&alarm.units.hours;"   labelplural="&alarm.units.hours;"     labelsingular="&alarm.units.hours.singular;"    value="hours"/>
-                              <menuitem label="&alarm.units.days;"    labelplural="&alarm.units.days;"      labelsingular="&alarm.units.days.singular;"     value="days"/>
+                              <menuitem label="&alarm.units.minutes;"
+                                        labelplural="&alarm.units.minutes;"
+                                        labelsingular="&alarm.units.minutes.singular;"
+                                        value="minutes"/>
+                              <menuitem label="&alarm.units.hours;"
+                                        labelplural="&alarm.units.hours;"
+                                        labelsingular="&alarm.units.hours.singular;"
+                                        value="hours"/>
+                              <menuitem label="&alarm.units.days;"
+                                        labelplural="&alarm.units.days;"
+                                        labelsingular="&alarm.units.days.singular;"
+                                        value="days"/>
                            </menupopup>
                         </menulist>
                      </box>       
diff --git a/calendar/resources/content/calendar.xul b/calendar/resources/content/calendar.xul
index dea44229cbd2..ba729256bc1b 100644
--- a/calendar/resources/content/calendar.xul
+++ b/calendar/resources/content/calendar.xul
@@ -82,7 +82,9 @@
    persist="screenX screenY width height sizemode"
 	height="550"
 	width="710"> 
- 
+<broadcasterset id="calendar_broadcasters">
+   <broadcaster id="is_editable" hidden="false"/>
+</broadcasterset> 
 <commandset id="calendar_commands">
    <command id="new_command" oncommand="newEventCommand( event )"/>
    <command id="delete_command" oncommand="deleteEventCommand( )" disabled="true" disabledwhennoeventsselected="true"/>
@@ -212,36 +214,92 @@
 <!--<script type="application/x-javascript" src="chrome://calendar/content/email.js"/>-->
 
 <!-- GENERAL CONTEXT MENU -->
-<popup id="context-menu" onpopuphidden="gNewDateVariable = null;">
-   <menuitem label="&calendar.context.newevent.label;" accesskey="&calendar.context.newevent.accesskey;" observes="new_command"/>
-   <menuitem label="&calendar.context.newtodo.label;" accesskey="&calendar.context.newtodo.accesskey;" observes="new_todo_command"/>
-   <menuitem label="&calendar.context.modifyevent.label;" accesskey="&calendar.context.modifyevent.accesskey;" observes="modify_command" />
-   <menuitem label="&calendar.context.deleteevent.label;" accesskey="&calendar.context.deleteevent.accesskey;" observes="delete_command"/>
+<popup id="context-menu"
+       onpopuphidden="gNewDateVariable = null;"
+       onpopupshowing="dump(document.popupNode.getAttribute('id'));
+                       document.getElementById('is_editable').hidden = (document.popupNode.getAttribute('id') == 'lefthandcalendar')"
+  >
+   <menuitem label="&calendar.context.newevent.label;"
+             accesskey="&calendar.context.newevent.accesskey;"
+             observes="new_command"/>
+   <menuitem label="&calendar.context.newtodo.label;"
+             accesskey="&calendar.context.newtodo.accesskey;"
+             observes="new_todo_command"/>
+   <menuitem label="&calendar.context.modifyevent.label;"
+             accesskey="&calendar.context.modifyevent.accesskey;"
+             observes="modify_command" />
+   <menuitem label="&calendar.context.deleteevent.label;"
+             accesskey="&calendar.context.deleteevent.accesskey;"
+             observes="delete_command"/>
 
    <menuseparator/>
-   <menuitem label="&calendar.context.cutevent.label;" accesskey="&calendar.context.cutevent.accesskey;" observes="cut_command"/>
-   <menuitem label="&calendar.context.copyevent.label;" accesskey="&calendar.context.copyevent.accesskey;" observes="copy_command"/>
-   <menuitem label="&calendar.context.pasteevent.label;" accesskey="&calendar.context.pasteevent.accesskey;" observes="paste_command"/>
+   <menuitem label="&calendar.context.cutevent.label;"
+             accesskey="&calendar.context.cutevent.accesskey;"
+             observes="cut_command">
+      <observes element="is_editable" attribute="hidden"/>
+   </menuitem>
+   <menuitem label="&calendar.context.copyevent.label;"
+             accesskey="&calendar.context.copyevent.accesskey;"
+             observes="copy_command">
+      <observes element="is_editable" attribute="hidden"/>
+   </menuitem>
+   <menuitem label="&calendar.context.pasteevent.label;"
+             accesskey="&calendar.context.pasteevent.accesskey;"
+             observes="paste_command">
+      <observes element="is_editable" attribute="hidden"/>
+   </menuitem>
+   <menuseparator>
+      <observes element="is_editable" attribute="hidden"/>
+   </menuseparator>
+   <menuitem label="&calendar.context.selectall.label;"
+             accesskey="&calendar.context.selectall.accesskey;"
+             observes="select_all_command">
+      <observes element="is_editable" attribute="hidden"/>
+   </menuitem>
+   <menuseparator>
+      <observes element="is_editable" attribute="hidden"/>
+   </menuseparator>
+   <menuitem label="&calendar.context.gototoday.label;"
+             accesskey="&calendar.context.gototoday.accesskey;"
+             observes="go_today_command"/>
    <menuseparator/>
-   <menuitem label="&calendar.context.selectall.label;" accesskey="&calendar.context.selectall.accesskey;" observes="select_all_command"/>
-   <menuseparator/>
-   <menuitem label="&calendar.context.gototoday.label;" accesskey="&calendar.context.gototoday.accesskey;" observes="go_today_command"/>
-   <menuseparator/>
-   <menuitem label="&calendar.context.dayview.label;" accesskey="&calendar.context.dayview.accesskey;" observes="day_view_command"/>
-   <menuitem label="&calendar.context.weekview.label;" accesskey="&calendar.context.weekview.accesskey;" observes="week_view_command"/>
-   <menuitem label="&calendar.context.monthview.label;" accesskey="&calendar.context.monthview.accesskey;" observes="month_view_command"/>
-   <menuitem label="&calendar.context.multiweekview.label;" accesskey="&calendar.context.multiweekview.accesskey;" observes="multiweek_view_command"/>
+   <menuitem label="&calendar.context.dayview.label;"
+             accesskey="&calendar.context.dayview.accesskey;"
+             observes="day_view_command"/>
+   <menuitem label="&calendar.context.weekview.label;"
+             accesskey="&calendar.context.weekview.accesskey;"
+             observes="week_view_command"/>
+   <menuitem label="&calendar.context.monthview.label;"
+             accesskey="&calendar.context.monthview.accesskey;"
+             observes="month_view_command"/>
+   <menuitem label="&calendar.context.multiweekview.label;"
+             accesskey="&calendar.context.multiweekview.accesskey;"
+             observes="multiweek_view_command"/>
 
    <menuseparator/>
-   <menuitem id="only-workday-checkbox-2" type="checkbox" label="&calendar.onlyworkday.checkbox.label;" oncommand="changeOnlyWorkdayCheckbox(2);" persist="checked" disabled="true"/>
-   <menuitem id="display-todo-inview-checkbox-2" type="checkbox" label="&calendar.displaytodos.checkbox.label;" oncommand="changeDisplayToDoInViewCheckbox(2);" persist="checked" disabled="true"/>
+   <menuitem id="only-workday-checkbox-2"
+             type="checkbox"
+             label="&calendar.onlyworkday.checkbox.label;"
+             accesskey="&calendar.onlyworkday.checkbox.accesskey;"
+             oncommand="changeOnlyWorkdayCheckbox(2);"
+             persist="checked"
+             disabled="true"/>
+   <menuitem id="display-todo-inview-checkbox-2"
+             type="checkbox"
+             label="&calendar.displaytodos.checkbox.label;"
+             accesskey="&calendar.displaytodos.checkbox.accesskey;"
+             oncommand="changeDisplayToDoInViewCheckbox(2);"
+             persist="checked"
+             disabled="true"/>
 
 <!--
    <menuitem label="test" observes="change_display_todo_in_view"  checked="true"/>
 -->   
 
    <menuseparator/>
-   <menuitem label="&calendar.context.emailevent.label;" accesskey="&calendar.context.emailevent.accesskey;" observes="send_event_command"/>
+   <menuitem label="&calendar.context.emailevent.label;"
+             accesskey="&calendar.context.emailevent.accesskey;"
+             observes="send_event_command"/>
    <!--
    <menuseparator/>
    <menuitem label="&calendar.context.reload.label;" accesskey="&calendar.context.reload.accesskey;" oncommand="window.location = 'chrome://calendar/content/calendar.xul';"/>
@@ -250,37 +308,89 @@
 
 <!-- TASK ITEM CONTEXT MENU -->
 <popup id="taskitem-context-menu" onpopupshowing="changeContextMenuForToDo( event );">
-   <menuitem label="&calendar.context.newtodo.label;" accesskey="&calendar.context.newtodo.accesskey;" observes="new_todo_command"/>
+   <menuitem label="&calendar.context.newtodo.label;"
+             accesskey="&calendar.context.newtodo.accesskey;"
+             observes="new_todo_command"/>
    <!--
    Currently no way to get the item that we clicked on originally 
    <menuitem label="&calendar.context.modifytask.label;" accesskey="&calendar.context.modifytask.accesskey;" observes="modify_todo_command"/>-->
-   <menuitem label="&calendar.context.deletetask.label;" accesskey="&calendar.context.deletetask.accesskey;" observes="delete_todo_command"/>
-   <menu label="&calendar.context.progress.label;" accesskey="&calendar.context.progress.accesskey;">
+   <menuitem label="&calendar.context.deletetask.label;"
+             accesskey="&calendar.context.deletetask.accesskey;"
+             observes="delete_todo_command"/>
+   <menu label="&calendar.context.progress.label;"
+         accesskey="&calendar.context.progress.accesskey;">
       <menupopup>
-         <menuitem type="checkbox" id="percent-0-menuitem" label="0%"   oncommand="contextChangeProgress( event, 0 );"/>
-         <menuitem type="checkbox" id="percent-25-menuitem" label="25%"  oncommand="contextChangeProgress( event, 25 );"/>
-         <menuitem type="checkbox" id="percent-50-menuitem" label="50%"  oncommand="contextChangeProgress( event, 50 );"/>
-         <menuitem type="checkbox" id="percent-75-menuitem" label="75%"  oncommand="contextChangeProgress( event, 75 );"/>
-         <menuitem type="checkbox" id="percent-100-menuitem" label="100%" oncommand="contextChangeProgress( event, 100 );"/>
+         <menuitem type="checkbox"
+                   id="percent-0-menuitem"
+                   label="&progress.level.0;"
+                   accesskey="&progress.level.0.accesskey;"
+                   oncommand="contextChangeProgress( event, 0 );"/>
+         <menuitem type="checkbox"
+                   id="percent-25-menuitem"
+                   label="&progress.level.25;"
+                   accesskey="&progress.level.25.accesskey;"
+                   oncommand="contextChangeProgress( event, 25 );"/>
+         <menuitem type="checkbox"
+                   id="percent-50-menuitem"
+                   label="&progress.level.50;"
+                   accesskey="&progress.level.50.accesskey;"
+                   oncommand="contextChangeProgress( event, 50 );"/>
+         <menuitem type="checkbox"
+                   id="percent-75-menuitem"
+                   label="&progress.level.75;"
+                   accesskey="&progress.level.75.accesskey;"
+                   oncommand="contextChangeProgress( event, 75 );"/>
+         <menuitem type="checkbox"
+                   id="percent-100-menuitem"
+                   label="&progress.level.100;"
+                   accesskey="&progress.level.100.accesskey;"
+                   oncommand="contextChangeProgress( event, 100 );"/>
       </menupopup>
    </menu>
-   <menu label="&calendar.context.priority.label;" accesskey="&calendar.context.priority.accesskey;">
+   <menu label="&calendar.context.priority.label;"
+         accesskey="&calendar.context.priority.accesskey;">
       <menupopup>
-         <menuitem type="checkbox" id="priority-0-menuitem" label="&priority.level.none;"   oncommand="contextChangePriority( event, 0 );"/>
-         <menuitem type="checkbox" id="priority-9-menuitem" label="&priority.level.low;"    oncommand="contextChangePriority( event, 9 );"/>
-         <menuitem type="checkbox" id="priority-5-menuitem" label="&priority.level.medium;" oncommand="contextChangePriority( event, 5 );"/>
-         <menuitem type="checkbox" id="priority-1-menuitem" label="&priority.level.high;"   oncommand="contextChangePriority( event, 1 );"/>
+         <menuitem type="checkbox"
+                   id="priority-0-menuitem"
+                   label="&priority.level.none;"
+                   accesskey="&priority.level.none.accesskey;"
+                   oncommand="contextChangePriority( event, 0 );"/>
+         <menuitem type="checkbox"
+                   id="priority-9-menuitem"
+                   label="&priority.level.low;"
+                   accesskey="&priority.level.low.accesskey;"
+                   oncommand="contextChangePriority( event, 9 );"/>
+         <menuitem type="checkbox"
+                   id="priority-5-menuitem"
+                   label="&priority.level.medium;"
+                   accesskey="&priority.level.medium.accesskey;"
+                   oncommand="contextChangePriority( event, 5 );"/>
+         <menuitem type="checkbox"
+                   id="priority-1-menuitem"
+                   label="&priority.level.high;"
+                   accesskey="&priority.level.high.accesskey;"
+                   oncommand="contextChangePriority( event, 1 );"/>
       </menupopup>
    </menu>
 </popup>
 
 <!-- CALENDAR LIST CONTEXT MENU -->
 <popup id="calendarlist-context-menu">
-   <menuitem label="&calendar.context.newserver.label;"     observes="new_local_calendar_command"/>
-   <menuitem label="&calendar.context.editserver.label;"     observes="edit_local_calendar_command"/>
-   <menuitem label="&calendar.context.deleteserver.label;"     observes="delete_server_command"/>
-   <menuitem label="&calendar.context.refreshserver.label;" observes="refresh_remote_calendars"/>
-	<menuitem label="&calendar.context.publish.label;" observes="publish_calendar"/>
+   <menuitem label="&calendar.context.newserver.label;"
+             accesskey="&calendar.context.newserver.accesskey;"
+             observes="new_local_calendar_command"/>
+   <menuitem label="&calendar.context.editserver.label;"
+             accesskey="&calendar.context.editserver.accesskey;"
+             observes="edit_local_calendar_command"/>
+   <menuitem label="&calendar.context.deleteserver.label;"
+             accesskey="&calendar.context.deleteserver.accesskey;"
+             observes="delete_server_command"/>
+   <menuitem label="&calendar.context.refreshserver.label;"
+             accesskey="&calendar.context.refreshserver.accesskey;"
+             observes="refresh_remote_calendars"/>
+   <menuitem label="&calendar.context.publish.label;"
+             accesskey="&calendar.context.publish.accesskey;"
+             observes="publish_calendar"/>
 </popup>
 
 <popup id="oe-date-picker-popup"  position="after_start" value="">
@@ -295,20 +405,49 @@
 
    <toolbar class="toolbar-primary chromeclass-toolbar" id="calendar-bar" persist="collapsed" tbalign="stretch">
 		<!--<toolbarbutton class="toolbarbutton-1" id="calendar-new-task-button"   label="&calendar.newtask.button.label;"         tooltiptext="&calendar.newtask.button.tooltip;"      observes="new_todo_command"/>-->
-      <toolbarbutton class="toolbarbutton-1" id="calendar-new-event-button"      label="&calendar.newevent.button.label;"        tooltiptext="&calendar.newevent.button.tooltip;"     observes="new_command"/>
-      <toolbarbutton class="toolbarbutton-1" id="calendar-edit-event-button"     label="&calendar.edit.button.label;"            tooltiptext="&calendar.edit.button.tooltip;"         observes="modify_command"/>
-		<toolbarbutton class="toolbarbutton-1" id="calendar-delete-event-button"   label="&calendar.delete.button.label;"          tooltiptext="&calendar.delete.button.tooltip;"       observes="delete_command"/>
-		<toolbarseparator class="toolbarseparator-primary"/>
-		<toolbarbutton class="toolbarbutton-1" id="calendar-day-view-button"       label="&calendar.dayview.button.label;"         tooltiptext="&calendar.dayview.button.tooltip;"      observes="day_view_command"/>
-		<toolbarbutton class="toolbarbutton-1" id="calendar-week-view-button"      label="&calendar.weekview.button.label;"        tooltiptext="&calendar.weekview.button.tooltip;"     observes="week_view_command"/>
-		<toolbarbutton class="toolbarbutton-1" id="calendar-multiweek-view-button"     label="&calendar.multiweekview.button.label;"       tooltiptext="&calendar.multiweekview.button.tooltip;"    observes="multiweek_view_command"/>
-		<toolbarbutton class="toolbarbutton-1" id="calendar-month-view-button"     label="&calendar.monthview.button.label;"       tooltiptext="&calendar.monthview.button.tooltip;"    observes="month_view_command"/>
+      <toolbarbutton class="toolbarbutton-1"
+                     id="calendar-new-event-button"
+                     label="&calendar.newevent.button.label;"
+                     tooltiptext="&calendar.newevent.button.tooltip;"
+                     observes="new_command"/>
+      <toolbarbutton class="toolbarbutton-1"
+                     id="calendar-edit-event-button"
+                     label="&calendar.edit.button.label;"
+                     tooltiptext="&calendar.edit.button.tooltip;"
+                     observes="modify_command"/>
+      <toolbarbutton class="toolbarbutton-1"
+                     id="calendar-delete-event-button"
+                     label="&calendar.delete.button.label;"
+                     tooltiptext="&calendar.delete.button.tooltip;"
+                     observes="delete_command"/>
+      <toolbarseparator class="toolbarseparator-primary"/>
+      <toolbarbutton class="toolbarbutton-1"
+                     id="calendar-day-view-button"
+                     label="&calendar.dayview.button.label;"
+                     tooltiptext="&calendar.dayview.button.tooltip;"
+                     observes="day_view_command"/>
+      <toolbarbutton class="toolbarbutton-1"
+                     id="calendar-week-view-button"
+                     label="&calendar.weekview.button.label;"
+                     tooltiptext="&calendar.weekview.button.tooltip;"
+                     observes="week_view_command"/>
+      <toolbarbutton class="toolbarbutton-1"
+                     id="calendar-multiweek-view-button"
+                     label="&calendar.multiweekview.button.label;"
+                     tooltiptext="&calendar.multiweekview.button.tooltip;"
+                     observes="multiweek_view_command"/>
+      <toolbarbutton class="toolbarbutton-1"
+                     id="calendar-month-view-button"
+                     label="&calendar.monthview.button.label;"
+                     tooltiptext="&calendar.monthview.button.tooltip;"
+                     observes="month_view_command"/>
 
-		<spacer flex="1"/>
-		<hbox id="throbber-box" align="center">
-		 <button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')"
-			  tooltiptext="&throbber.tooltip;"/>
-		</hbox>
+      <spacer flex="1"/>
+      <hbox id="throbber-box" align="center">
+         <button id="navigator-throbber"
+                 oncommand="goClickThrobber('browser.throbber.url')"
+                 tooltiptext="&throbber.tooltip;"/>
+      </hbox>
    </toolbar>
 </toolbox>
 
@@ -390,7 +529,12 @@
                <label flex="1" crop="end" style="font-weight: bold" value="&calendar.unifinder.todoitems.label;"/>
             </box>
             <box align="center">
-               <checkbox id="only-completed-checkbox" label="&calendar.unifinder.hidecompletedtodos.label;" flex="1" crop="end" oncommand="toDoUnifinderRefresh( event )" persist="checked"/>
+               <checkbox id="only-completed-checkbox"
+                         label="&calendar.unifinder.hidecompletedtodos.label;"
+                         flex="1"
+                         crop="end"
+                         oncommand="toDoUnifinderRefresh( event )"
+                         persist="checked"/>
             </box>
             <tree id="unifinder-todo-tree" flex="1" enableColumnDrag="false" ondblclick="modifyToDoCommand( event )">
                <treecols id="unifinder-todo-tree-cols">
@@ -454,13 +598,27 @@
                   <box align="center">
                      <menulist id="event-filter-menulist" persist="value">
                          <menupopup id="event-filter-menupopup" oncommand="changeEventFilter( event );">
-                             <menuitem id="event-filter-all" label="&calendar.events.filter.all.label;" value="all"/>
-                             <menuitem id="event-filter-today" label="&calendar.events.filter.today.label;" value="today"/>
-                             <menuitem id="event-filter-week" label="&calendar.events.filter.week.label;" value="week"/>
-                             <menuitem id="event-filter-2weeks" label="&calendar.events.filter.2weeks.label;" value="2weeks"/>
-                             <menuitem id="event-filter-month" label="&calendar.events.filter.month.label;" value="month"/>
-                             <menuitem id="event-filter-future" label="&calendar.events.filter.future.label;" value="future"/>
-                             <menuitem id="event-filter-current" label="&calendar.events.filter.current.label;" value="current"/>
+                             <menuitem id="event-filter-all"
+                                       label="&calendar.events.filter.all.label;"
+                                       value="all"/>
+                             <menuitem id="event-filter-today"
+                                       label="&calendar.events.filter.today.label;"
+                                       value="today"/>
+                             <menuitem id="event-filter-week"
+                                       label="&calendar.events.filter.week.label;"
+                                       value="week"/>
+                             <menuitem id="event-filter-2weeks"
+                                       label="&calendar.events.filter.2weeks.label;"
+                                       value="2weeks"/>
+                             <menuitem id="event-filter-month"
+                                       label="&calendar.events.filter.month.label;"
+                                       value="month"/>
+                             <menuitem id="event-filter-future"
+                                       label="&calendar.events.filter.future.label;"
+                                       value="future"/>
+                             <menuitem id="event-filter-current"
+                                       label="&calendar.events.filter.current.label;"
+                                       value="current"/>
                          </menupopup>
                      </menulist>
                   </box>
diff --git a/calendar/resources/content/dayView.xul b/calendar/resources/content/dayView.xul
index fdda3e7bd9a9..676adefb8742 100644
--- a/calendar/resources/content/dayView.xul
+++ b/calendar/resources/content/dayView.xul
@@ -111,153 +111,420 @@
                
          <!-- This is an overlay being included from above -->
          <box id="day-view-content-box" flex="1">
-	       <stack id="day-view-content-board" flex="1">
-		      <vbox id="day-hour-content-holder" flex="1">    
-                <box top="0" left="31" class="day-view-hour-box-class" id="day-tree-item-0" hour="0" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+         <stack id="day-view-content-board" flex="1">
+            <vbox id="day-hour-content-holder" flex="1">    
+                <box top="0"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-0"
+                     hour="0"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-0" value="&time.midnight; " />
                    </box>
                 </box>
                 
-                <box top="50" left="31" class="day-view-hour-box-class" id="day-tree-item-1" hour="1" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="50"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-1"
+                     hour="1"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
+
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-1"/>
                    </box>
                 </box>
                 
-                <box top="100" left="31" class="day-view-hour-box-class" id="day-tree-item-2" hour="2" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="100"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-2"
+                     hour="2"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-2"/>
                    </box>
                 </box>
                 
-                <box top="150" left="31" class="day-view-hour-box-class" id="day-tree-item-3" hour="3" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="150"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-3"
+                     hour="3"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-3"/>
                    </box>
                 </box>
                 
-                <box top="200" left="31" class="day-view-hour-box-class" id="day-tree-item-4" hour="4" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="200"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-4"
+                     hour="4"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-4"/>
                    </box>
                 </box>
                 
-                <box top="250" left="31" class="day-view-hour-box-class" id="day-tree-item-5" hour="5" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="250"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-5"
+                     hour="5"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-5"/>
                    </box>
                 </box>
                 
-                <box top="300" left="31" class="day-view-hour-box-class" id="day-tree-item-6" hour="6" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="300"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-6"
+                     hour="6"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-6"/>
                    </box>
                 </box>
                 
-                <box top="350" left="31" class="day-view-hour-box-class" id="day-tree-item-7" hour="7" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="350"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-7"
+                     hour="7"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-7"/>
                    </box>
                 </box>
                 
-                <box top="400" left="31" class="day-view-hour-box-class" id="day-tree-item-8" hour="8" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="400"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-8"
+                     hour="8"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-8"/>
                    </box>
                 </box>
                 
-                <box top="450" left="31" class="day-view-hour-box-class" id="day-tree-item-9" hour="9" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="450"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-9"
+                     hour="9"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-9"/>
                    </box>
                 </box>
                 
-                <box top="500" left="31" class="day-view-hour-box-class" id="day-tree-item-10" hour="10" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="500"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-10"
+                     hour="10"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-10"/>
                    </box>
                 </box>
                 
-                <box top="550" left="31" class="day-view-hour-box-class" id="day-tree-item-11" hour="11" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="550"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-11"
+                     hour="11"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-11"/>
                    </box>
                 </box>
                 
-                <box top="600" left="31" class="day-view-hour-box-class" id="day-tree-item-12" hour="12" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="600"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-12"
+                     hour="12"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-12"/>
                    </box>
                 </box>
                 
-                <box top="650" left="31" class="day-view-hour-box-class" id="day-tree-item-13" hour="13" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="650"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-13"
+                     hour="13"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
+
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-13"/>
                    </box>
                 </box>
                 
-                <box top="700" left="31" class="day-view-hour-box-class" id="day-tree-item-14" hour="14" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="700"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-14"
+                     hour="14"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
+
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-14"/>
                    </box>
                 </box>
                 
-                <box top="750" left="31" class="day-view-hour-box-class" id="day-tree-item-15" hour="15" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="750"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-15"
+                     hour="15"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-15"/>
                    </box>
                 </box>
                 
-                <box top="800" left="31" class="day-view-hour-box-class" id="day-tree-item-16" hour="16" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="800"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-16"
+                     hour="16"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-16"/>
                    </box>
                 </box>
                 
-                <box top="850" left="31" class="day-view-hour-box-class" id="day-tree-item-17" hour="17" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="850"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-17"
+                     hour="17"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-17"/>
                    </box>
                 </box>
                 
-                <box top="900" left="31" class="day-view-hour-box-class" id="day-tree-item-18" hour="18" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="900"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-18"
+                     hour="18"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-18"/>
                    </box>
                 </box>
                 
-                <box top="950" left="31" class="day-view-hour-box-class" id="day-tree-item-19" hour="19" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="950"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-19"
+                     hour="19"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-19"/>
                    </box>
                 </box>
                 
-                <box top="1000" left="31" class="day-view-hour-box-class" id="day-tree-item-20" hour="20" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="1000"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-20"
+                     hour="20"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-20"/>
                    </box>
                 </box>
                 
-                <box top="1050" left="31" class="day-view-hour-box-class" id="day-tree-item-21" hour="21" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="1050"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-21"
+                     hour="21"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-21"/>
                    </box>
                 </box>
                 
-                <box top="1100" left="31" class="day-view-hour-box-class" id="day-tree-item-22" hour="22" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="1100"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-22"
+                     hour="22"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-22"/>
                    </box>
                 </box>
                 
-                <box top="1150" left="31" class="day-view-hour-box-class" id="day-tree-item-23" hour="23" onclick="dayViewHourClick( event )" ondblclick="dayViewHourDoubleClick( event )" flex="1" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="dayViewHourContextClick( event )">
+                <box top="1150"
+                     left="31"
+                     class="day-view-hour-box-class"
+                     id="day-tree-item-23"
+                     hour="23"
+                     onclick="dayViewHourClick( event )"
+                     ondblclick="dayViewHourDoubleClick( event )"
+                     flex="1"
+                     ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                     ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                     ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                     oncontextmenu="dayViewHourContextClick( event )">
                    <box class="day-time-class">
                       <label class="day-time-class-label" id="day-view-hour-23"/>
                    </box>
                 </box>
-	            </vbox>    
-	         </stack>
+            </vbox>    
+         </stack>
          </box>   <!-- End: day-tree-content-box -->
       </vbox>
    </vbox>  <!-- End: Calendar Day View -->
diff --git a/calendar/resources/content/eventDialog.xul b/calendar/resources/content/eventDialog.xul
index 5923c6d4353b..0228b50eaf90 100644
--- a/calendar/resources/content/eventDialog.xul
+++ b/calendar/resources/content/eventDialog.xul
@@ -159,8 +159,17 @@
                         </hbox>
                         <hbox  id="start-date-box" align="center">
                             <datepicker id="start-date-picker" value="" ondatepick="onDatePick( this );"/>
-                            <textbox id="start-time-text" readonly="true" value=""        onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
-                            <image id="start-time-button" class="event-time-button-class" onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
+                            <textbox id="start-time-text" 
+                                     readonly="true"
+                                     value=""
+                                     onmousedown="prepareTimePicker('start-time-text')"
+                                     popup="oe-time-picker-popup"
+                                     position="after_start"/>
+                            <image id="start-time-button"
+                                   class="event-time-button-class"
+                                   onmousedown="prepareTimePicker('start-time-text')"
+                                   popup="oe-time-picker-popup"
+                                   position="after_start"/>
                         </hbox>
                      </row>
                      
@@ -171,28 +180,46 @@
                         </hbox>
                         <hbox  id="end-date-box" align="center">
                             <datepicker id="end-date-picker" value="" ondatepick="onDatePick( this );"/>
-                            <textbox id="end-time-text" readonly="true" value=""      onmousedown="prepareTimePicker('end-time-text')" popup="oe-time-picker-popup" position="after_start"/>
-                            <image id="end-time-button" class="event-time-button-class" onmousedown="prepareTimePicker('end-time-text')" popup="oe-time-picker-popup" position="after_start"/>
+                            <textbox id="end-time-text"
+                                     readonly="true"
+                                     value=""
+                                     onmousedown="prepareTimePicker('end-time-text')"
+                                     popup="oe-time-picker-popup"
+                                     position="after_start"/>
+                            <image id="end-time-button"
+                                   class="event-time-button-class"
+                                   onmousedown="prepareTimePicker('end-time-text')"
+                                   popup="oe-time-picker-popup"
+                                   position="after_start"/>
                         </hbox>
                      </row>
               
                      <!-- End Time Warning -->    
                      <row align="center">
                         <spacer />
-                        <label id="end-time-warning" class="warning-text-class" value="&newevent.endtime.warning;" collapsed="true"/>
+                        <label id="end-time-warning"
+                               class="warning-text-class"
+                               value="&newevent.endtime.warning;"
+                               collapsed="true"/>
                      </row>
               
                      <!-- End Date Warning -->    
                      <row align="center">
                         <spacer />
-                        <label id="end-date-warning" class="warning-text-class" value="&newevent.enddate.warning;" collapsed="true"/>
+                        <label id="end-date-warning"
+                               class="warning-text-class"
+                               value="&newevent.enddate.warning;"
+                               collapsed="true"/>
                      </row>
               
               
                      <!-- All Day -->    
                      <row align="center">
                         <spacer />
-                        <checkbox id="all-day-event-checkbox" label="&newevent.alldayevent.label;" oncommand="commandAllDay()" persist="checked"/>
+                        <checkbox id="all-day-event-checkbox"
+                                  label="&newevent.alldayevent.label;"
+                                  oncommand="commandAllDay()"
+                                  persist="checked"/>
                      </row>
                      
                      
@@ -201,7 +228,10 @@
                         <hbox class="field-label-box-class" pack="end">
                             <label for="description-field" value="&newevent.description.label;"/>
                         </hbox>
-                        <textbox id="description-field" multiline="true" rows="3" cols="30" />
+                        <textbox id="description-field"
+                                 multiline="true"
+                                 rows="3"
+                                 cols="30" />
                      </row>
                      
                      
@@ -211,8 +241,12 @@
                             <label for="uri-field" value="&newevent.uri.label;"/>
                         </hbox>
                         <hbox>
-                          <textbox id="uri-field" type="autocomplete" searchSessions="history" flex="1"/>
-                          <button label="&newevent.uri.visit.label;" oncommand="launchBrowser()"/>
+                          <textbox id="uri-field"
+                                   type="autocomplete"
+                                   searchSessions="history"
+                                   flex="1"/>
+                          <button label="&newevent.uri.visit.label;"
+                                  oncommand="launchBrowser()"/>
                         </hbox>
                      </row>
               
@@ -220,7 +254,9 @@
                      <!-- Private -->    
                      <row align="center">
                         <spacer />
-                        <checkbox id="private-checkbox" checked="false" label="&newevent.private.label;"/>
+                        <checkbox id="private-checkbox"
+                                  checked="false"
+                                  label="&newevent.private.label;"/>
                      </row>
                      
                      
@@ -229,13 +265,26 @@
                         <spacer />
                         <vbox>
                            <hbox  id="alarm-box" align="center">
-                              <checkbox id="alarm-checkbox" class="proper-align" label="&newevent.alarm.label;" checked="false" oncommand="commandAlarm()"/>
+                              <checkbox id="alarm-checkbox"
+                                        class="proper-align"
+                                        label="&newevent.alarm.label;"
+                                        checked="false"
+                                        oncommand="commandAlarm()"/>
                               <textbox id="alarm-length-field"  oninput="alarmLengthKeyDown( this )"/>
                               <menulist id="alarm-length-units" crop="none" labelnumber="labelplural">
                                  <menupopup>
-                                    <menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;"   labelsingular="&alarm.units.minutes.singular;"  value="minutes"/>
-                                    <menuitem label="&alarm.units.hours;"   labelplural="&alarm.units.hours;"     labelsingular="&alarm.units.hours.singular;"    value="hours" />
-                                    <menuitem label="&alarm.units.days;"    labelplural="&alarm.units.days;"      labelsingular="&alarm.units.days.singular;"     value="days"/>
+                                    <menuitem label="&alarm.units.minutes;"
+                                              labelplural="&alarm.units.minutes;"
+                                              labelsingular="&alarm.units.minutes.singular;"
+                                              value="minutes"/>
+                                    <menuitem label="&alarm.units.hours;"
+                                              labelplural="&alarm.units.hours;"
+                                              labelsingular="&alarm.units.hours.singular;"
+                                              value="hours" />
+                                    <menuitem label="&alarm.units.days;"
+                                              labelplural="&alarm.units.days;"
+                                              labelsingular="&alarm.units.days.singular;"
+                                              value="days"/>
                                  </menupopup>
                               </menulist>
                               <menulist id="alarm-trigger-relation" crop="none">
@@ -248,8 +297,15 @@
                            
                            <hbox id="alarm-box-email" align="center">
                                <spacer width="15"/>
-                               <checkbox id="alarm-email-checkbox"  label="&newevent.email.label;" checked="false" oncommand="commandAlarmEmail()"/>
-                               <textbox type="autocomplete" searchSessions="addrbook" id="alarm-email-field" size="39" value="" />
+                               <checkbox id="alarm-email-checkbox"
+                                         label="&newevent.email.label;"
+                                         checked="false"
+                                         oncommand="commandAlarmEmail()"/>
+                               <textbox type="autocomplete"
+                                        searchSessions="addrbook"
+                                        id="alarm-email-field"
+                                        size="39"
+                                        value="" />
                            </hbox>       
                         </vbox>
                      </row>
@@ -261,9 +317,12 @@
                         </hbox>
                         <menulist id="status-field" label="&newevent.status.label;">
                             <menupopup id="status-menulist-menupopup">
-                                <menuitem label="&newevent.status.tentative.label;"  value="ICAL_STATUS_TENTATIVE"/>
-                                <menuitem label="&newevent.status.confirmed.label;"  value="ICAL_STATUS_CONFIRMED"/>
-                                <menuitem label="&newevent.status.cancelled.label;"  value="ICAL_STATUS_CANCELLED"/>
+                                <menuitem label="&newevent.status.tentative.label;"
+                                          value="ICAL_STATUS_TENTATIVE"/>
+                                <menuitem label="&newevent.status.confirmed.label;"
+                                          value="ICAL_STATUS_CONFIRMED"/>
+                                <menuitem label="&newevent.status.cancelled.label;"
+                                          value="ICAL_STATUS_CANCELLED"/>
                             </menupopup>
                         </menulist>
                      </row>
@@ -286,10 +345,14 @@
                             <label id="server-field-label" value="&newevent.server.label;"/>
                         </hbox>
                         <menulist id="server-field">
-                           <menupopup id="server-menulist-menupopup" datasources="rdf:null" ref="urn:calendarcontainer">
+                           <menupopup id="server-menulist-menupopup"
+                                      datasources="rdf:null"
+                                      ref="urn:calendarcontainer">
                               <template>
                                  <rule>   
-                                    <menuitem uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#path" label="rdf:http://home.netscape.com/NC-rdf#name"/>
+                                    <menuitem uri="rdf:*"
+                                              value="rdf:http://home.netscape.com/NC-rdf#path"
+                                              label="rdf:http://home.netscape.com/NC-rdf#name"/>
                                  </rule>
                               </template>
                             </menupopup>
@@ -303,35 +366,114 @@
             <!-- Repeat -->    
                <vbox>
                   <hbox id="repeat-box" align="center">
-                     <checkbox id="repeat-checkbox" class="proper-align" label="&newevent.repeat.label;"  checked="false" oncommand="commandRepeat();commandUntil()"/>
-                     <textbox id="repeat-length-field" class="cursor-pointer" disable-controller="repeat" value="1"  oninput="repeatLengthKeyDown( this )"/>
+                     <checkbox id="repeat-checkbox"
+                               class="proper-align"
+                               label="&newevent.repeat.label;"
+                               checked="false"
+                               oncommand="commandRepeat();commandUntil()"/>
+                     <textbox id="repeat-length-field"
+                              class="cursor-pointer"
+                              disable-controller="repeat"
+                              value="1"
+                              oninput="repeatLengthKeyDown( this )"/>
                               
-                     <menulist crop="none" oncommand="repeatUnitCommand( this )" labelnumber="labelplural"  id="repeat-length-units" disable-controller="repeat">
+                     <menulist crop="none"
+                               oncommand="repeatUnitCommand( this )"
+                               labelnumber="labelplural"
+                               id="repeat-length-units"
+                               disable-controller="repeat">
                         <menupopup>
-                           <menuitem label="&repeat.units.days;"   labelplural="&repeat.units.days;"   labelsingular="&repeat.units.days.singular;"   id="repeat-length-days"   value="days" />
-                           <menuitem label="&repeat.units.weeks;"  labelplural="&repeat.units.weeks;"  labelsingular="&repeat.units.weeks.singular;"  id="repeat-length-weeks"  value="weeks"/>
-                           <menuitem label="&repeat.units.months;" labelplural="&repeat.units.months;" labelsingular="&repeat.units.months.singular;" id="repeat-length-months" value="months"/>
-                           <menuitem label="&repeat.units.years;"  labelplural="&repeat.units.years;"  labelsingular="&repeat.units.years.singular;"  id="repeat-length-years"  value="years" />
+                           <menuitem label="&repeat.units.days;"
+                                     labelplural="&repeat.units.days;"
+                                     labelsingular="&repeat.units.days.singular;"
+                                     id="repeat-length-days"
+                                     value="days" />
+                           <menuitem label="&repeat.units.weeks;"
+                                     labelplural="&repeat.units.weeks;"
+                                     labelsingular="&repeat.units.weeks.singular;"
+                                     id="repeat-length-weeks"
+                                     value="weeks"/>
+                           <menuitem label="&repeat.units.months;"
+                                     labelplural="&repeat.units.months;"
+                                     labelsingular="&repeat.units.months.singular;"
+                                     id="repeat-length-months"
+                                     value="months"/>
+                           <menuitem label="&repeat.units.years;"
+                                     labelplural="&repeat.units.years;"
+                                     labelsingular="&repeat.units.years.singular;"
+                                     id="repeat-length-years"
+                                     value="years" />
                         </menupopup>
                      </menulist>
                   </hbox>
                     
-                  <hbox id="repeat-extenstions-week" disabled="true" disable-controller="repeat" collapsed="false" align="center">
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.1.Ddd;" id="advanced-repeat-week-0" value="0" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.2.Ddd;" id="advanced-repeat-week-1" value="1" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.3.Ddd;" id="advanced-repeat-week-2" value="2" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.4.Ddd;" id="advanced-repeat-week-3" value="3" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.5.Ddd;" id="advanced-repeat-week-4" value="4" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.6.Ddd;" id="advanced-repeat-week-5" value="5" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.7.Ddd;" id="advanced-repeat-week-6" value="6" checked="false" />
+                  <hbox id="repeat-extenstions-week"
+                        disabled="true"
+                        disable-controller="repeat"
+                        collapsed="false"
+                        align="center">
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.1.Ddd;"
+                               id="advanced-repeat-week-0"
+                               value="0"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.2.Ddd;"
+                               id="advanced-repeat-week-1"
+                               value="1"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.3.Ddd;"
+                               id="advanced-repeat-week-2"
+                               value="2"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.4.Ddd;"
+                               id="advanced-repeat-week-3"
+                               value="3"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.5.Ddd;"
+                               id="advanced-repeat-week-4"
+                               value="4"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.6.Ddd;"
+                               id="advanced-repeat-week-5"
+                               value="5"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.7.Ddd;"
+                               id="advanced-repeat-week-6"
+                               value="6"
+                               checked="false" />
                   </hbox>
                          
-                  <hbox id="repeat-extenstions-month" diabled="true" collapsed="true" align="center">
+                  <hbox id="repeat-extenstions-month"
+                        diabled="true"
+                        collapsed="true"
+                        align="center">
                      <vbox align="center">
-                        <radiogroup id="advanced-repeat-month" disable-controller="repeat">
-                           <radio disable-controller="repeat" id="advanced-repeat-dayofmonth"      label="&newevent.advanced.repeat.dayofmonth.label;" selected="true"/>
-                           <radio disable-controller="repeat" id="advanced-repeat-dayofweek"       label="&newevent.advanced.repeat.dayofweek.label;"/>
-                           <radio disable-controller="repeat" id="advanced-repeat-dayofweek-last"  label="&newevent.advanced.repeat.lastdayofweek.label;" disabled="true"/>
+		<radiogroup id="advanced-repeat-month"
+                            disable-controller="repeat">
+                           <radio disable-controller="repeat"
+                                  id="advanced-repeat-dayofmonth"
+                                  label="&newevent.advanced.repeat.dayofmonth.label;"
+                                  selected="true"/>
+                           <radio disable-controller="repeat"
+                                  id="advanced-repeat-dayofweek"
+                                  label="&newevent.advanced.repeat.dayofweek.label;"/>
+                           <radio disable-controller="repeat"
+                                  id="advanced-repeat-dayofweek-last"
+                                  label="&newevent.advanced.repeat.lastdayofweek.label;"
+                                  disabled="true"/>
                         </radiogroup>
                      </vbox>
                   </hbox>
@@ -340,21 +482,37 @@
                       
                   <hbox align="center">
                      <spacer class="repeat-left-spacer" />
-                     <radiogroup id="repeat-until-group" disable-controller="repeat">
-                        <radio id="repeat-forever-radio" disable-controller="repeat" label="&newevent.forever.label;" oncommand="commandUntil()"/>
+                     <radiogroup id="repeat-until-group"
+                                 disable-controller="repeat">
+                        <radio id="repeat-forever-radio"
+                               disable-controller="repeat"
+                               label="&newevent.forever.label;"
+                               oncommand="commandUntil()"/>
                         <vbox id="repeat-end-box" align="center">
-									<hbox>
-										<radio id="repeat-numberoftimes-radio" disable-controller="repeat" label="&newevent.numberoftimes.label;" oncommand=""/>
-										<textbox id="repeat-numberoftimes-textbox" disable-controller="repeat"/>
-									</hbox>
+                           <hbox>
+                              <radio id="repeat-numberoftimes-radio"
+                                     disable-controller="repeat"
+                                     label="&newevent.numberoftimes.label;"
+                                     oncommand=""/>
+                              <textbox id="repeat-numberoftimes-textbox"
+                                       disable-controller="repeat"/>
+                           </hbox>
                         </vbox>
-								<vbox id="repeat-end-box" align="center">
+                        <vbox id="repeat-end-box" align="center">
                               <hbox>
-                                 <radio id="repeat-until-radio" disable-controller="repeat" label="&newevent.until.label;" oncommand="commandUntil()"/>
+                                 <radio id="repeat-until-radio"
+                                        disable-controller="repeat"
+                                        label="&newevent.until.label;"
+                                        oncommand="commandUntil()"/>
                                  <spacer id="until-spacer"/>
-                                 <datepicker id="repeat-end-date-picker" value="" ondatepick="commandUntil()"/>
+                                 <datepicker id="repeat-end-date-picker"
+                                             value=""
+                                             ondatepick="commandUntil()"/>
                               </hbox>
-                              <label id="repeat-time-warning" class="warning-text-class" value="&newevent.recurend.warning;" collapsed="true"/>
+                              <label id="repeat-time-warning"
+                                     class="warning-text-class"
+                                     value="&newevent.recurend.warning;"
+                                     collapsed="true"/>
                         </vbox>
 							</radiogroup>
                   </hbox>
@@ -371,14 +529,23 @@
                            <rows>
                               <row>
                                  <hbox align="center">
-                                    <datepicker id="exceptions-date-picker" disable-controller="repeat" value=""/>
+                                    <datepicker id="exceptions-date-picker"
+                                                disable-controller="repeat"
+                                                value=""/>
                                  </hbox>   
-                                 <button id="exception-add-button" label="&newevent.addexceptions.label;" disable-controller="repeat" oncommand="addException()"/>
+                                 <button id="exception-add-button"
+                                         label="&newevent.addexceptions.label;"
+                                         disable-controller="repeat"
+                                         oncommand="addException()"/>
                               </row>
                               <row>
-                                 <listbox id="exception-dates-listbox" disable-controller="repeat" rows="4"/>
+                                 <listbox id="exception-dates-listbox"
+                                          disable-controller="repeat"
+                                          rows="4"/>
                                  <vbox>
-                                    <button label="&newevent.deleteexceptions.label;" disable-controller="repeat" oncommand="removeSelectedExceptionDate()"/>
+                                    <button label="&newevent.deleteexceptions.label;"
+                                            disable-controller="repeat"
+                                            oncommand="removeSelectedExceptionDate()"/>
                                  </vbox>
                               </row>
                            </rows>
@@ -394,8 +561,13 @@
                <!-- Invite -->    
                <vbox collapsed="true">
                   <hbox id="invite-box" align="center">
-                     <checkbox id="invite-checkbox"  label="&newevent.invite.label;" checked="false" oncommand="commandInvite()"/>
-                     <textbox id="invite-email-field" size="39" disabled="true"/>
+                     <checkbox id="invite-checkbox"
+                               label="&newevent.invite.label;"
+                               checked="false"
+                               oncommand="commandInvite()"/>
+                     <textbox id="invite-email-field"
+                              size="39"
+                              disabled="true"/>
                   </hbox>
                </vbox>
             
@@ -405,12 +577,14 @@
                   
                   <!-- Address book chooser -->                    
                   <menulist id="addressBookList" oncommand="onChooseAddressBookEventDialog( this );">
-                     <menupopup id="addressBookList-menupopup" ref="moz-abdirectory://" datasources="rdf:addressdirectory">
+                     <menupopup id="addressBookList-menupopup"
+                                ref="moz-abdirectory://"
+                                datasources="rdf:addressdirectory">
                         <template> 
                            <rule nc:IsMailList="false">
                               <menuitem uri="..."
-                                 label="rdf:http://home.netscape.com/NC-rdf#DirName"
-                                 value="rdf:http://home.netscape.com/NC-rdf#DirUri"/>
+                                        label="rdf:http://home.netscape.com/NC-rdf#DirName"
+                                        value="rdf:http://home.netscape.com/NC-rdf#DirUri"/>
                            </rule>
                         </template> 
                      </menupopup>
@@ -422,16 +596,32 @@
                   <!-- Existing addresses -->                
                   <vbox id="resultsBox" flex="4">
                      <label value=" " />
-                     <tree id="abResultsTree" flex="1" persist="height" hidecolumnpicker="true" onclick="this.contactsTree.onClick( event );" ondblclick="this.contactsTree.onDblClick( event );">
+                     <tree id="abResultsTree"
+                           flex="1"
+                           persist="height"
+                           hidecolumnpicker="true"
+                           onclick="this.contactsTree.onClick( event );"
+                           ondblclick="this.contactsTree.onDblClick( event );">
                       
                         <treecols id="recipientTreeCols">
-                           <treecol id="GeneratedName" sort-field="GeneratedName" class="sortDirectionIndicator"   list-view-sort-field="true" 
-                              persist="ordinal width" flex="1" label="&ab-selectAddressesDialogNameColumn.label;" primary="true"/>
+                           <treecol id="GeneratedName"
+                                    sort-field="GeneratedName"
+                                    class="sortDirectionIndicator"
+                                    list-view-sort-field="true" 
+                                    persist="ordinal width"
+                                    flex="1"
+                                    label="&ab-selectAddressesDialogNameColumn.label;"
+                                    primary="true"/>
                               
                            <splitter class="tree-splitter"/>
                               
-                           <treecol id="PrimaryEmail" sort-field="PrimaryEmail" class="sortDirectionIndicator" list-view-sort-field="true"  
-                              persist="ordinal width"  flex="1" label="&ab-selectAddressesDialogEmailColumn.label;"/>
+                           <treecol id="PrimaryEmail"
+                                    sort-field="PrimaryEmail"
+                                    class="sortDirectionIndicator"
+                                    list-view-sort-field="true"  
+                                    persist="ordinal width"
+                                    flex="1"
+                                    label="&ab-selectAddressesDialogEmailColumn.label;"/>
                         </treecols>
                           
                         <treechildren />
@@ -442,9 +632,14 @@
                   <!-- Add and remove buttons -->
                   <vbox id="addToBucketButtonBox">
                       <spacer flex="1" />
-                      <button id="toButton" label="&ab-selectAddressesDialogInvite.label;" command="addToInviteList" /> 
+                      <button id="toButton"
+                              label="&ab-selectAddressesDialogInvite.label;"
+                              command="addToInviteList" /> 
                       <spacer />
-                      <button id="remove" label="&ab-selectAddressesDialogUninvite.label;" class="dialog" command="removeFromInviteList" /> 
+                      <button id="remove"
+                              label="&ab-selectAddressesDialogUninvite.label;"
+                              class="dialog"
+                              command="removeFromInviteList" /> 
                       <spacer flex="1" />
                   </vbox>
                   
@@ -452,9 +647,14 @@
                   <vbox id="bucketBox" flex="1">
                       <label value="&ab-selectAddressesDialogInviteList.label;"/>
                       
-                      <tree id="addressBucket" flex="1" hidecolumnpicker="true" onclick="selectEventRecipient( this );">
+                      <tree id="addressBucket"
+                                     flex="1"
+                                     hidecolumnpicker="true"
+                                     onclick="selectEventRecipient( this );">
                           <treecols>
-                              <treecol id="addressCol" flex="1" hideheader="true"/>
+                              <treecol id="addressCol"
+                                       flex="1"
+                                       hideheader="true"/>
                           </treecols>
                           
                           <treechildren id="bucketBody" flex="1"/>
@@ -473,8 +673,10 @@
                 ondragdrop="nsDragAndDrop.drop(event, attachmentBucketObserver);"
                 ondragexit="nsDragAndDrop.dragExit(event, attachmentBucketObserver);"/>
             <vbox>
-               <button onclick="AttachFile()" label="&newevent.choosefile.label;"/>
-               <button onclick="removeSelectedAttachment()" label="&newevent.removeselectedfile.label;"/>
+               <button onclick="AttachFile()"
+                       label="&newevent.choosefile.label;"/>
+               <button onclick="removeSelectedAttachment()"
+                       label="&newevent.removeselectedfile.label;"/>
                <spacer flex="1"/>
             </vbox>
          </tabpanel>
diff --git a/calendar/resources/content/importDuplicatesDialog.xul b/calendar/resources/content/importDuplicatesDialog.xul
index 05503def936b..1c9fa4e96229 100644
--- a/calendar/resources/content/importDuplicatesDialog.xul
+++ b/calendar/resources/content/importDuplicatesDialog.xul
@@ -28,16 +28,24 @@
       <box align="center">
 
          <radiogroup id="dup-group" >
-             <radio id="auto-discard" selected="true" label="&calendar.importdupes.autodiscard.label;" oncommand="togglePrompting(false); setDiscardDuplicates(true);"/>
-             <radio id="add-duplicates" label="&calendar.importdupes.adddupes.label;" oncommand="togglePrompting(true); setDiscardDuplicates(false);"/>
+             <radio id="auto-discard"
+                    selected="true"
+                    label="&calendar.importdupes.autodiscard.label;"
+                    oncommand="togglePrompting(false); setDiscardDuplicates(true);"/>
+             <radio id="add-duplicates"
+                    label="&calendar.importdupes.adddupes.label;"
+                    oncommand="togglePrompting(true); setDiscardDuplicates(false);"/>
          </radiogroup>
 
       </box>
 
       <hbox style="margin-left: .25in">
 
-         <checkbox id="prompt-on-add" disabled="true" selected="true" label="&calendar.importdupes.prompt.label;"
-                  oncommand="this.checked = !this.checked; setPromptOnAdd(this.checked);"/>
+         <checkbox id="prompt-on-add"
+                   disabled="true"
+                   selected="true"
+                   label="&calendar.importdupes.prompt.label;"
+                   oncommand="this.checked = !this.checked; setPromptOnAdd(this.checked);"/>
 
       </hbox>
 
diff --git a/calendar/resources/content/localCalDialog.xul b/calendar/resources/content/localCalDialog.xul
index b18899324ca5..fc457bef3a98 100644
--- a/calendar/resources/content/localCalDialog.xul
+++ b/calendar/resources/content/localCalDialog.xul
@@ -139,7 +139,8 @@
                         </hbox>
                         <hbox>
                            <textbox id="server-path-textbox" flex="1" /> 
-                           <button oncommand="launchFilePicker()" label="&calendar.server.dialog.browse.label;"/>
+                           <button oncommand="launchFilePicker()"
+                                   label="&calendar.server.dialog.browse.label;"/>
                         </hbox>
                     </row>
                     
diff --git a/calendar/resources/content/menuOverlay.xul b/calendar/resources/content/menuOverlay.xul
index 4c36ceeb41b4..35b3920bd5c6 100644
--- a/calendar/resources/content/menuOverlay.xul
+++ b/calendar/resources/content/menuOverlay.xul
@@ -88,8 +88,14 @@
     <key id="key_selectAll"/>
   
     <!-- Search Menu -->  
-    <key id="key_find"              key="&findOnCmd.commandkey;" command="Browser:Find" modifiers="accel"/>
-    <key id="key_findAgain"         key="&findAgainCmd.commandkey;" command="Browser:FindAgain" modifiers="accel"/>
+    <key id="key_find"
+         key="&findOnCmd.commandkey;"
+         command="Browser:Find"
+         modifiers="accel"/>
+    <key id="key_findAgain"
+         key="&findAgainCmd.commandkey;"
+         command="Browser:FindAgain"
+         modifiers="accel"/>
   </keyset>
   <keyset id="tasksKeys">
       <key id="key_quit"/>
@@ -100,81 +106,216 @@
   <menubar id="main-menubar" class="chromeclass-menubar">
    <menu id="menu_File">
       <menupopup id="menu_FilePopup">
-         <menuitem id="calendar-new-event-menu"    key="new_event_key"    label="&event.new.event;"                  observes="new_command"/>
-         <menuitem id="calendar-new-todo-menu"     key="new_todo_key"     label="&event.new.todo;"                   observes="new_todo_command"/>
-         <menuitem id="calendar-new-calendar-menu" key="new_calendar_key" label="&calendar.context.newserver.label;" observes="new_local_calendar_command"/>
-         <menuitem id="unifinder-modify-menu"      key="modify_event_key" label="&event.edit.event;"                 observes="modify_command"/>
-         <menuitem id="calendar-close" observes="close_calendar_command" label="&calendar.menu.options.close;"/>
+         <menuitem id="calendar-new-event-menu"
+                   key="new_event_key"
+                   label="&event.new.event;"
+                   accesskey="&event.new.event.accesskey;"
+                   observes="new_command"/>
+         <menuitem id="calendar-new-todo-menu"
+                   key="new_todo_key"
+                   label="&event.new.todo;"
+                   accesskey="&event.new.todo.accesskey;"
+                   observes="new_todo_command"/>
+         <menuitem id="calendar-new-calendar-menu"
+                   key="new_calendar_key"
+                   label="&calendar.new.server.label;"
+                   accesskey="&calendar.new.server.accesskey;"
+                   observes="new_local_calendar_command"/>
+         <menuitem id="unifinder-modify-menu"
+                   key="modify_event_key"
+                   label="&event.edit.event;"
+                   accesskey="&event.edit.event.accesskey;"
+                   observes="modify_command"/>
+         <menuitem id="calendar-close"
+                   label="&calendar.menu.options.close;"
+                   accesskey="&calendar.menu.options.close.accesskey;"
+                   observes="close_calendar_command"/>
          <menuseparator/>
-         <menuitem id="calendar-mail-event" observes="send_event_command" key="send_event_key" label="&event.mail.event;"/>
+         <menuitem id="calendar-mail-event"
+                   key="send_event_key"
+                   label="&event.mail.event;"
+                   accesskey="&event.mail.event.accesskey;"
+                   observes="send_event_command"/>
          <menuseparator/>
-         <menuitem id="calendar-print-menu" observes="print_command" label="&calendar.print.label;"/>
+         <menuitem id="calendar-print-menu"
+                   label="&calendar.print.label;"
+                   accesskey="&calendar.print.accesskey;"
+                   observes="print_command"/>
       </menupopup>
    </menu>
 
    <menu id="menu_Edit">
       <menupopup id="mppEdit">
-         <menuitem id="calendar-cut-menu"     key="key_cut"    label="&calendar.cut.label;"   accesskey="&calendar.cut.accesskey;"   observes="cut_command" />
-         <menuitem id="calendar-copy-menu"    key="key_copy"   label="&calendar.copy.label;"  accesskey="&calendar.copy.accesskey;"  observes="copy_command" />
-         <menuitem id="calendar-paste-menu"   key="key_paste"  label="&calendar.paste.label;" accesskey="&calendar.paste.accesskey;" observes="paste_command"/>
-         <menuitem id="unifinder-remove-menu" key="delete_key" label="&event.delete.event;"                                          observes="delete_command" />
-			<menuitem id="unifinder-remove-menu"                  label="&event.delete.tasks;"                                          observes="delete_todo_command" />
+         <menuitem id="calendar-cut-menu"
+                   key="key_cut"
+                   label="&calendar.cut.label;"
+                   accesskey="&calendar.cut.accesskey;"
+                   observes="cut_command" />
+         <menuitem id="calendar-copy-menu"
+                   key="key_copy"
+                   label="&calendar.copy.label;"
+                   accesskey="&calendar.copy.accesskey;"
+                   observes="copy_command" />
+         <menuitem id="calendar-paste-menu"
+                   key="key_paste"
+                   label="&calendar.paste.label;"
+                   accesskey="&calendar.paste.accesskey;"
+                   observes="paste_command"/>
+         <menuitem id="unifinder-remove-menu"
+                   key="delete_key"
+                   label="&event.delete.event;"
+                   accesskey="&event.delete.event.accesskey;"
+                   observes="delete_command" />
+         <menuitem id="unifinder-remove-menu"
+                   label="&event.delete.tasks;"
+                   accesskey="&event.delete.tasks.accesskey;"
+                   observes="delete_todo_command" />
          <menuseparator/>
-         <menuitem id="calendar-selectall-menu" key="key_selectAll" label="&calendar.selectall.label;" accesskey="&calendar.selectall.accesskey;" observes="select_all_command"/>
+         <menuitem id="calendar-selectall-menu"
+                   key="key_selectAll"
+                   label="&calendar.selectall.label;"
+                   accesskey="&calendar.selectall.accesskey;"
+                   observes="select_all_command"/>
          <menuseparator/>
-         <menuitem id="calendar-edit-preferences" label="&calendar.preferences.label;" accesskey="&calendar.preferences.accesskey;" oncommand="launchPreferences()"/>
+         <menuitem id="calendar-edit-preferences"
+                   label="&calendar.preferences.label;"
+                   accesskey="&calendar.preferences.accesskey;"
+                   oncommand="launchPreferences()"/>
       </menupopup>
    </menu>
    
    <menu id="menu_View">
       <menupopup id="mppView">
-         <menuitem id="calendar-view-menu-day"   key="view_day_key" label="&calendar.flat.topbar.dayview;"   accesskey="&calendar.dayview.accesskey;" observes="day_view_command"/>
-         <menuitem id="calendar-view-menu-week"  key="view_week_key" label="&calendar.flat.topbar.weekview;"  accesskey="&calendar.weekview.accesskey;" observes="week_view_command"/>
-         <menuitem id="calendar-view-menu-multiweek" key="view_multiweek_key" label="&calendar.flat.topbar.multiweekview;" accesskey="&calendar.multiweekview.accesskey;" observes="multiweek_view_command"/>
-         <menuitem id="calendar-view-menu-month" key="view_month_key" label="&calendar.flat.topbar.monthview;" accesskey="&calendar.monthview.accesskey;" observes="month_view_command"/>
+         <menuitem id="calendar-view-menu-day"
+                   key="view_day_key"
+                   label="&calendar.flat.topbar.dayview;"
+                   accesskey="&calendar.dayview.accesskey;"
+                   observes="day_view_command"/>
+         <menuitem id="calendar-view-menu-week"
+                   key="view_week_key"
+                   label="&calendar.flat.topbar.weekview;"
+                   accesskey="&calendar.weekview.accesskey;"
+                   observes="week_view_command"/>
+         <menuitem id="calendar-view-menu-multiweek"
+                   key="view_multiweek_key"
+                   label="&calendar.flat.topbar.multiweekview;"
+                   accesskey="&calendar.multiweekview.accesskey;"
+                   observes="multiweek_view_command"/>
+         <menuitem id="calendar-view-menu-month"
+                   key="view_month_key"
+                   label="&calendar.flat.topbar.monthview;"
+                   accesskey="&calendar.monthview.accesskey;"
+                   observes="month_view_command"/>
          <menuseparator/>
-	 <menuitem id="only-workday-checkbox-1" type="checkbox" label="&calendar.onlyworkday.checkbox.label;" oncommand="changeOnlyWorkdayCheckbox(1);" persist="checked" disabled="true"/>
-	 <menuitem id="display-todo-inview-checkbox-1" type="checkbox" label="&calendar.displaytodos.checkbox.label;" oncommand="changeDisplayToDoInViewCheckbox(1);" persist="checked" disabled="true"/>
+	 <menuitem id="only-workday-checkbox-1"
+                   type="checkbox"
+                   label="&calendar.onlyworkday.checkbox.label;"
+                   accesskey="&calendar.onlyworkday.checkbox.accesskey;"
+                   oncommand="changeOnlyWorkdayCheckbox(1);"
+                   persist="checked"
+                   disabled="true"/>
+	 <menuitem id="display-todo-inview-checkbox-1"
+                   type="checkbox"
+                   label="&calendar.displaytodos.checkbox.label;"
+                   accesskey="&calendar.displaytodos.checkbox.accesskey;"
+                   oncommand="changeDisplayToDoInViewCheckbox(1);"
+                   persist="checked"
+                   disabled="true"/>
 <!--    <menuitem label="test" observes="change_display_todo_in_view"  checked="true"/> -->
-         <menu label="&calendar.menu.numberofweeks.label;" oncommand="gCalendarWindow.currentView.changeNumberOfWeeks(event.target)" id="menu-numberofweeks-inview" disabled="true">
+         <menu label="&calendar.menu.numberofweeks.label;"
+               oncommand="gCalendarWindow.currentView.changeNumberOfWeeks(event.target)"
+               id="menu-numberofweeks-inview"
+               disabled="true">
 	 <menupopup>
-	    <menuitem type="radio" value="1" name="menunbofweeks" label="&calendar.menu.numberofweeks.1;"/>
-	    <menuitem type="radio" value="2" name="menunbofweeks" label="&calendar.menu.numberofweeks.2;"/>
-	    <menuitem type="radio" value="3" name="menunbofweeks" label="&calendar.menu.numberofweeks.3;"/>
-	    <menuitem type="radio" value="4" name="menunbofweeks" label="&calendar.menu.numberofweeks.4;"/>
-	    <menuitem type="radio" value="5" name="menunbofweeks" label="&calendar.menu.numberofweeks.5;"/>
-	    <menuitem type="radio" value="6" name="menunbofweeks" label="&calendar.menu.numberofweeks.6;"/>
+	    <menuitem type="radio"
+                      value="1"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.1;"/>
+	    <menuitem type="radio"
+                      value="2"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.2;"/>
+	    <menuitem type="radio"
+                      value="3"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.3;"/>
+	    <menuitem type="radio"
+                      value="4"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.4;"/>
+	    <menuitem type="radio"
+                      value="5"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.5;"/>
+	    <menuitem type="radio"
+                      value="6"
+                      name="menunbofweeks"
+                      label="&calendar.menu.numberofweeks.6;"/>
 	 </menupopup>
 	 </menu>	 
       </menupopup>
    </menu>
    
-   <menu id="menu_Go" label="&goMenu.label;" accesskey="&goMenu.accesskey;">
+   <menu id="menu_Go"
+         label="&goMenu.label;"
+         accesskey="&goMenu.accesskey;">
       <menupopup id="mppView">
-         <menuitem id="calendar-view-menu-today"    key="go_to_today_key" label="&goTodayCmd.label;"   accesskey="&goTodayCmd.accesskey;" observes="go_today_command"/>
-         <menuitem id="calendar-view-menu-previous" key="go_forward_key" label="&goPreviousCmd.label;" accesskey="&goPreviousCmd.accesskey;"/>
-         <menuitem id="calendar-view-menu-next"     key="go_backward_key" label="&goNextCmd.label;"     accesskey="&goNextCmd.accesskey;"/>
+         <menuitem id="calendar-view-menu-today"
+                   key="go_to_today_key"
+                   label="&goTodayCmd.label;"
+                   accesskey="&goTodayCmd.accesskey;"
+                   observes="go_today_command"/>
+         <menuitem id="calendar-view-menu-previous"
+                   key="go_forward_key"
+                   label="&goPreviousCmd.label;"
+                   accesskey="&goPreviousCmd.accesskey;"/>
+         <menuitem id="calendar-view-menu-next"
+                   key="go_backward_key"
+                   label="&goNextCmd.label;"
+                   accesskey="&goNextCmd.accesskey;"/>
       </menupopup>
    </menu>
    
    <menu id="tasksMenu">
       <menupopup id="taskPopup">
-         <menuitem id="calendar-wizard-menu" key="wizard_key" label="&calendar.wizard.label;" accesskey="&calendar.wizard.accesskey;" observes="wizard_command"/>
-         <menuitem id="calendar-import-menu" key="import_key" label="&calendar.import.label;" accesskey="&calendar.import.accesskey;" observes="import_command"/>
-         <menuitem id="calendar-export-menu" key="export_key" label="&calendar.export.label;" accesskey="&calendar.export.accesskey;" observes="export_command"/>
-         <menuitem id="calendar-addserver-menu" label="&calendar.subscribe.label;"    observes="new_server_command"/>
-         <menuitem id="calendar-publish-menu" label="&calendar.publish.label;"    observes="publish_events_command"/>
+         <menuitem id="calendar-wizard-menu"
+                   key="wizard_key"
+                   label="&calendar.wizard.label;"
+                   accesskey="&calendar.wizard.accesskey;"
+                   observes="wizard_command"/>
+         <menuitem id="calendar-import-menu"
+                   key="import_key"
+                   label="&calendar.import.label;"
+                   accesskey="&calendar.import.accesskey;"
+                   observes="import_command"/>
+         <menuitem id="calendar-export-menu"
+                   key="export_key"
+                   label="&calendar.export.label;"
+                   accesskey="&calendar.export.accesskey;"
+                   observes="export_command"/>
+         <menuitem id="calendar-addserver-menu"
+                   label="&calendar.subscribe.label;"
+                   accesskey="&calendar.subscribe.accesskey;"
+                   observes="new_server_command"/>
+         <menuitem id="calendar-publish-menu"
+                   label="&calendar.publish.label;"
+                   accesskey="&calendar.publish.accesskey;"
+                   observes="publish_events_command"/>
          <menuseparator/>
       </menupopup>
    </menu>
    
    <menu id="windowMenu"/>
   
-   <menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help">
+   <menu accesskey="&helpMenuCmd.accesskey;"
+         id="menu_Help">
       <menupopup id="helpPopup">
          <menuitem id="releaseUrl"/>
          <menuseparator id="menu_HelpAboutSeparator"/>
-         <menuitem id="calendar-about-menu-item" label="&calendar.about.label;" accesskey="&calendar.about.accesskey;" oncommand="displayCalendarVersion()"/>
+         <menuitem id="calendar-about-menu-item"
+                   label="&calendar.about.label;"
+                   accesskey="&calendar.about.accesskey;"
+                   oncommand="displayCalendarVersion()"/>
       </menupopup>
    </menu>      
 </menubar>
diff --git a/calendar/resources/content/printDialog.xul b/calendar/resources/content/printDialog.xul
index c51dc6a7e23c..302ed86acb61 100644
--- a/calendar/resources/content/printDialog.xul
+++ b/calendar/resources/content/printDialog.xul
@@ -148,11 +148,17 @@ var descriptionTag="&newevent.description.label;"
                         <spacer />
                         <radiogroup id="view-field" >
                            <caption label="&calendar.print.selectviews.label;" />
-                           <radio label="&calendar.monthview.button.label;"  value="month" selected="true" />
-                           <radio label="&calendar.weekview.button.label;"  value="week"/>
-                           <radio label="&calendar.multiweekview.button.label;"  value="multiweek"/>
-                           <radio label="&calendar.dayview.button.label;"  value="day"/>
-                           <radio label="&calendar.print.listselected.label;"  value="list"/>
+                           <radio label="&calendar.monthview.button.label;"
+                                  value="month"
+                                  selected="true" />
+                           <radio label="&calendar.weekview.button.label;"
+                                  value="week"/>
+                           <radio label="&calendar.multiweekview.button.label;"
+                                  value="multiweek"/>
+                           <radio label="&calendar.dayview.button.label;"
+                                  value="day"/>
+                           <radio label="&calendar.print.listselected.label;"
+                                  value="list"/>
                         </radiogroup>
                      </row>
 
@@ -163,29 +169,47 @@ var descriptionTag="&newevent.description.label;"
                         </hbox>
                         <hbox  id="start-date-box" align="center">
                             <datepicker id="start-date-picker" value="" ondatepick="onDatePick( this );"/>
-                            <textbox id="start-time-text" readonly="true" value=""        onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start" collapsed="true"/>
-                            <image id="start-time-button" class="event-time-button-class" onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start" collapsed="true"/>
+                            <textbox id="start-time-text"
+                                     readonly="true"
+                                     value=""
+                                     onmousedown="prepareTimePicker('start-time-text')"
+                                     popup="oe-time-picker-popup"
+                                     position="after_start"
+                                     collapsed="true"/>
+                            <image id="start-time-button"
+                                   class="event-time-button-class"
+                                   onmousedown="prepareTimePicker('start-time-text')"
+                                   popup="oe-time-picker-popup"
+                                   position="after_start"
+                                   collapsed="true"/>
                         </hbox>
                      </row>
                      
                      <!-- Private -->
                      <row align="center">
                         <spacer />
-                        <checkbox id="private-checkbox" checked="true" label="&newevent.private.label;"/>
+                        <checkbox id="private-checkbox"
+                                  checked="true"
+                                  label="&newevent.private.label;"/>
                      </row>
 
                      <!-- Calendar Status -->
                      <row align="center" collapsed="true">
                       <spacer />
-                        <checkbox id="status-checkbox" checked="false" label="&calendar.print.onlyitemsstatus.label;"/>
+                        <checkbox id="status-checkbox"
+                                  checked="false"
+                                  label="&calendar.print.onlyitemsstatus.label;"/>
                      </row>
                      <row align="center" collapsed="true">
                         <spacer />
                         <menulist id="status-field" label="&newevent.status.label;">
                             <menupopup id="status-menulist-menupopup">
-                                <menuitem label="&newevent.status.tentative.label;"  value="ICAL_STATUS_TENTATIVE"/>
-                                <menuitem label="&newevent.status.confirmed.label;"  value="ICAL_STATUS_CONFIRMED"/>
-                                <menuitem label="&newevent.status.cancelled.label;"  value="ICAL_STATUS_CANCELLED"/>
+                                <menuitem label="&newevent.status.tentative.label;"
+                                          value="ICAL_STATUS_TENTATIVE"/>
+                                <menuitem label="&newevent.status.confirmed.label;"
+                                          value="ICAL_STATUS_CONFIRMED"/>
+                                <menuitem label="&newevent.status.cancelled.label;"
+                                          value="ICAL_STATUS_CANCELLED"/>
                             </menupopup>
                         </menulist>
                      </row>
@@ -194,14 +218,18 @@ var descriptionTag="&newevent.description.label;"
                      <!-- Categories -->
                      <row align="center" collapsed="true">
                       <spacer />
-                        <checkbox id="category-checkbox" checked="false" label="&calendar.print.onlyitemscategory.label;"/>
+                        <checkbox id="category-checkbox"
+                                  checked="false"
+                                  label="&calendar.print.onlyitemscategory.label;"/>
                      </row>
 
                      <row align="center" collapsed="true">
                         <spacer />
-                        <menulist id="categories-field" label="&newevent.category.label;">
+                        <menulist id="categories-field"
+                                  label="&newevent.category.label;">
                             <menupopup id="categories-menulist-menupopup">
-                                <menuitem label="&priority.level.none;" value="0"/>
+                                <menuitem label="&priority.level.none;"
+                                          value="0"/>
                             </menupopup>
                         </menulist>
                      </row>
diff --git a/calendar/resources/content/repeatOverlay.xul b/calendar/resources/content/repeatOverlay.xul
index 6d6f571656e7..823d19b2ebf2 100644
--- a/calendar/resources/content/repeatOverlay.xul
+++ b/calendar/resources/content/repeatOverlay.xul
@@ -68,37 +68,116 @@
    <!-- Repeat -->    
       <vbox id="repeat-outer-box">
         <hbox id="repeat-box" align="center">
-          <checkbox id="repeat-checkbox" class="proper-align" label="&newevent.repeat.label;"  checked="false" oncommand="commandRepeat()"/>
-          <textbox id="repeat-length-field" class="cursor-pointer" disable-controller="repeat" value="1"  oninput="repeatLengthKeyDown( this )"/>
+          <checkbox id="repeat-checkbox"
+                    class="proper-align"
+                    label="&newevent.repeat.label;"
+                    checked="false"
+                    oncommand="commandRepeat()"/>
+          <textbox id="repeat-length-field"
+                   class="cursor-pointer"
+                   disable-controller="repeat"
+                   value="1"
+                   oninput="repeatLengthKeyDown( this )"/>
                   
-          <menulist crop="none" oncommand="repeatUnitCommand( this )" labelnumber="labelplural"  id="repeat-length-units" disable-controller="repeat">
+          <menulist crop="none"
+                    oncommand="repeatUnitCommand( this )"
+                    labelnumber="labelplural"
+                    id="repeat-length-units"
+                    disable-controller="repeat">
               <menupopup>
-                  <menuitem label="&repeat.units.days;"   labelplural="&repeat.units.days;"   labelsingular="&repeat.units.days.singular;"   id="repeat-length-days"   value="days" />
-                  <menuitem label="&repeat.units.weeks;"  labelplural="&repeat.units.weeks;"  labelsingular="&repeat.units.weeks.singular;"  id="repeat-length-weeks"  value="weeks"/>
-                  <menuitem label="&repeat.units.months;" labelplural="&repeat.units.months;" labelsingular="&repeat.units.months.singular;" id="repeat-length-months" value="months"/>
-                  <menuitem label="&repeat.units.years;"  labelplural="&repeat.units.years;"  labelsingular="&repeat.units.years.singular;"  id="repeat-length-years"  value="years" />
+                  <menuitem label="&repeat.units.days;"
+                            labelplural="&repeat.units.days;"
+                            labelsingular="&repeat.units.days.singular;"
+                            id="repeat-length-days"
+                            value="days" />
+                  <menuitem label="&repeat.units.weeks;"
+                            labelplural="&repeat.units.weeks;"
+                            labelsingular="&repeat.units.weeks.singular;"
+                            id="repeat-length-weeks"
+                            value="weeks"/>
+                  <menuitem label="&repeat.units.months;"
+                            labelplural="&repeat.units.months;"
+                            labelsingular="&repeat.units.months.singular;"
+                            id="repeat-length-months"
+                            value="months"/>
+                  <menuitem label="&repeat.units.years;"
+                            labelplural="&repeat.units.years;"
+                            labelsingular="&repeat.units.years.singular;"
+                            id="repeat-length-years"
+                            value="years" />
               </menupopup>
           </menulist>
         </hbox>
              
         
-        <hbox id="repeat-extenstions-week" disabled="true" disable-controller="repeat" collapsed="false" align="center">
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.1.Ddd;" id="advanced-repeat-week-0" value="0" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.2.Ddd;" id="advanced-repeat-week-1" value="1" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.3.Ddd;" id="advanced-repeat-week-2" value="2" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.4.Ddd;" id="advanced-repeat-week-3" value="3" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.5.Ddd;" id="advanced-repeat-week-4" value="4" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.6.Ddd;" id="advanced-repeat-week-5" value="5" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.7.Ddd;" id="advanced-repeat-week-6" value="6" checked="false" />
+        <hbox id="repeat-extenstions-week"
+              disabled="true"
+              disable-controller="repeat"
+              collapsed="false"
+              align="center">
+          <checkbox disable-controller="repeat"
+                    class="repeat-day-class"
+                    label="&day.1.Ddd;"
+                    id="advanced-repeat-week-0"
+                    value="0"
+                    checked="false" />
+          <checkbox disable-controller="repeat"
+                    class="repeat-day-class"
+                    label="&day.2.Ddd;"
+                    id="advanced-repeat-week-1"
+                    value="1"
+                    checked="false" />
+          <checkbox disable-controller="repeat"
+                    class="repeat-day-class"
+                    label="&day.3.Ddd;"
+                    id="advanced-repeat-week-2"
+                    value="2"
+                    checked="false" />
+          <checkbox disable-controller="repeat"
+                    class="repeat-day-class"
+                    label="&day.4.Ddd;"
+                    id="advanced-repeat-week-3"
+                    value="3"
+                    checked="false" />
+          <checkbox disable-controller="repeat"
+                    class="repeat-day-class"
+                    label="&day.5.Ddd;"
+                    id="advanced-repeat-week-4"
+                    value="4"
+                    checked="false" />
+
+          <checkbox disable-controller="repeat"
+                    class="repeat-day-class"
+                    label="&day.6.Ddd;"
+                    id="advanced-repeat-week-5"
+                    value="5"
+                    checked="false" />
+          <checkbox disable-controller="repeat"
+                    class="repeat-day-class"
+                    label="&day.7.Ddd;"
+                    id="advanced-repeat-week-6"
+                    value="6"
+                    checked="false" />
         </hbox>
              
         
-        <hbox id="repeat-extenstions-month" diabled="true" collapsed="true" align="center">
+        <hbox id="repeat-extenstions-month"
+              diabled="true"
+              collapsed="true"
+              align="center">
             <vbox align="center">
                <radiogroup id="advanced-repeat-month" disable-controller="repeat">
-                  <radio disable-controller="repeat" id="advanced-repeat-dayofmonth"      label="On the xth day of the month" selected="true"/>
-                  <radio disable-controller="repeat" id="advanced-repeat-dayofweek"       label="4th Tuesday of the month"/>
-                  <radio disable-controller="repeat" id="advanced-repeat-dayofweek-last"  label="Last Tuesday of the month" disabled="true"/>
+                  <radio disable-controller="repeat"
+                         id="advanced-repeat-dayofmonth"
+                         label="On the xth day of the month"
+                         selected="true"/>
+                  <radio disable-controller="repeat"
+                         id="advanced-repeat-dayofweek"
+                         label="4th Tuesday of the month"/>
+                  <radio disable-controller="repeat"
+                         id="advanced-repeat-dayofweek-last"
+                         label="Last Tuesday of the month"
+                         disabled="true"/>
                </radiogroup>
             </vbox>
         </hbox>
@@ -108,16 +187,34 @@
         <hbox align="center">
           <spacer class="repeat-left-spacer" />
           <radiogroup id="repeat-until-group" disable-controller="repeat">
-            <radio id="repeat-forever-radio" disable-controller="repeat" label="&newevent.forever.label;" oncommand="commandUntil()"/>
+            <radio id="repeat-forever-radio"
+                   disable-controller="repeat"
+                   label="&newevent.forever.label;"
+                   oncommand="commandUntil()"/>
             <hbox id="repeat-end-box" align="center">
                 <vbox>
                    <hbox>
-                      <radio id="repeat-until-radio" disable-controller="repeat" label="&newevent.until.label;" oncommand="commandUntil()"/>
+                      <radio id="repeat-until-radio"
+                             disable-controller="repeat"
+                             label="&newevent.until.label;"
+                             oncommand="commandUntil()"/>
                       <spacer id="until-spacer"/>
-                      <textbox id="repeat-end-date-text" readonly="true" value="" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
-                      <image class="event-date-button-class" id="repeat-end-date-button" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
+                      <textbox id="repeat-end-date-text"
+                               readonly="true"
+                               value=""
+                               onmousedown="prepareDatePicker('repeat-end-date-text')"
+                               popup="oe-date-picker-popup"
+                               position="before_start"/>
+                      <image class="event-date-button-class"
+                             id="repeat-end-date-button"
+                             onmousedown="prepareDatePicker('repeat-end-date-text')"
+                             popup="oe-date-picker-popup"
+                             position="before_start"/>
                    </hbox>
-                   <label id="repeat-time-warning" class="warning-text-class" value="&newevent.recurend.warning;" collapsed="true"/>
+                   <label id="repeat-time-warning"
+                          class="warning-text-class"
+                          value="&newevent.recurend.warning;"
+                          collapsed="true"/>
                 </vbox>
             </hbox>
           </radiogroup>
@@ -135,15 +232,33 @@
                <rows>
                   <row>
                      <hbox align="center">
-                        <textbox id="exception-dates-text" disable-controller="repeat" readonly="true" value="" onmousedown="prepareDatePicker('exception-dates-text')" popup="oe-date-picker-popup"  position="before_start"/>
-                        <image class="event-date-button-class" disable-controller="repeat" id="exception-dates-button" onmousedown="prepareDatePicker('exception-dates-text')" popup="oe-date-picker-popup"  position="before_start"/>
+                        <textbox id="exception-dates-text"
+                                 disable-controller="repeat"
+                                 readonly="true"
+                                 value=""
+                                 onmousedown="prepareDatePicker('exception-dates-text')"
+                                 popup="oe-date-picker-popup"
+                                 position="before_start"/>
+                        <image class="event-date-button-class"
+                               disable-controller="repeat"
+                               id="exception-dates-button"
+                               onmousedown="prepareDatePicker('exception-dates-text')"
+                               popup="oe-date-picker-popup"
+                               position="before_start"/>
                      </hbox>   
-                     <button id="exception-add-button" label="&newevent.addexceptions.label;" disable-controller="repeat" oncommand="addException()"/>
+                     <button id="exception-add-button"
+                             label="&newevent.addexceptions.label;"
+                             disable-controller="repeat"
+                             oncommand="addException()"/>
                   </row>
                   <row>
-                     <listbox id="exception-dates-listbox" disable-controller="repeat" rows="4"/>
+                     <listbox id="exception-dates-listbox"
+                              disable-controller="repeat"
+                              rows="4"/>
                      <vbox>
-                        <button label="&newevent.deleteexceptions.label;" disable-controller="repeat" oncommand="removeSelectedExceptionDate()"/>
+                        <button label="&newevent.deleteexceptions.label;"
+                                disable-controller="repeat"
+                                oncommand="removeSelectedExceptionDate()"/>
                      </vbox>
                   </row>
                </rows>
diff --git a/calendar/resources/content/serverDialog.xul b/calendar/resources/content/serverDialog.xul
index 4951c8a33d47..38bb518161dc 100644
--- a/calendar/resources/content/serverDialog.xul
+++ b/calendar/resources/content/serverDialog.xul
@@ -135,7 +135,9 @@
                             <description>&calendar.server.dialog.local.location.label;</description>
                         </hbox>
                         <hbox>
-                           <textbox readonly="true" id="server-local-path-textbox" flex="1" /> 
+                           <textbox readonly="true"
+                                    id="server-local-path-textbox"
+                                    flex="1" /> 
                         </hbox>
                     </row>
                     
diff --git a/calendar/resources/content/toDoDialog.xul b/calendar/resources/content/toDoDialog.xul
index 021dfc789df0..054ab242aa5c 100644
--- a/calendar/resources/content/toDoDialog.xul
+++ b/calendar/resources/content/toDoDialog.xul
@@ -145,7 +145,7 @@
                      <!-- Location -->    
                      <row align="center">
                         <hbox class="field-label-box-class" pack="end">
-                            <label for="location-field" value="&newevent.location.label;"/>
+                           <label for="location-field" value="&newevent.location.label;"/>
                         </hbox>
                         <textbox id="location-field"/>
                      </row>
@@ -153,37 +153,61 @@
                      <!-- Start Date -->    
                      <row align="center">
                         <hbox class="field-label-box-class" pack="end">
-                            <label value="&newevent.startdate.label;"/>
+                           <label value="&newevent.startdate.label;"/>
                         </hbox>
                         <hbox  id="start-date-box" align="center">
-                            <datepicker id="start-date-picker" value="" ondatepick="onDatePick( this );"/>
-                            <textbox id="start-time-text" readonly="true" value=""        onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
-                            <image id="start-time-button" class="event-time-button-class" onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
+                           <datepicker id="start-date-picker" value="" ondatepick="onDatePick( this );"/>
+                           <textbox id="start-time-text"
+                                    readonly="true"
+                                    value=""
+                                    onmousedown="prepareTimePicker('start-time-text')"
+                                    popup="oe-time-picker-popup"
+                                    position="after_start"/>
+                           <image id="start-time-button"
+                                  class="event-time-button-class"
+                                  onmousedown="prepareTimePicker('start-time-text')"
+                                  popup="oe-time-picker-popup"
+                                  position="after_start"/>
                         </hbox>
                      </row>
                      
-                    <!--  Due Date -->    
+                     <!--  Due Date -->    
                      <row align="center">
                         <hbox class="field-label-box-class" pack="end">
-                            <label value="&newtodo.duedate.label;"/>
+                           <label value="&newtodo.duedate.label;"/>
                         </hbox>
                         <hbox  id="due-date-box" align="center">
-                            <datepicker id="due-date-picker" value="" ondatepick="onDatePick( this );"/>
-                            <textbox id="due-time-text" readonly="true" value=""      onmousedown="prepareTimePicker('due-time-text')" popup="oe-time-picker-popup" position="after_start"/>
-                            <image id="end-time-button" class="event-time-button-class" onmousedown="prepareTimePicker('due-time-text')" popup="oe-time-picker-popup" position="after_start"/>
+                           <datepicker id="due-date-picker" value="" ondatepick="onDatePick( this );"/>
+                           <textbox id="due-time-text"
+                                    readonly="true"
+                                    value=""
+                                    onmousedown="prepareTimePicker('due-time-text')"
+                                    popup="oe-time-picker-popup"
+                                    position="after_start"/>
+                           <image id="end-time-button"
+                                  class="event-time-button-class"
+                                  onmousedown="prepareTimePicker('due-time-text')"
+                                  popup="oe-time-picker-popup"
+                                  position="after_start"/>
                         </hbox>
                      </row>
               
                      <!-- End Time Warning -->    
                      <row align="center">
                         <spacer />
-                        <label id="due-time-warning" class="warning-text-class" value="&newtodo.duetime.warning;" collapsed="true"/>
+                        <label id="due-time-warning"
+                               class="warning-text-class"
+                               value="&newtodo.duetime.warning;"
+                               collapsed="true"/>
                      </row>
               
                      <!-- End Date Warning -->    
                      <row align="center">
                         <spacer />
-                        <label id="due-date-warning" class="warning-text-class" value="&newtodo.duedate.warning;" collapsed="true"/>
+                        <label id="due-date-warning"
+                               class="warning-text-class"
+                               value="&newtodo.duedate.warning;"
+                               collapsed="true"/>
                      </row>
                      
                      
@@ -192,18 +216,25 @@
                         <hbox class="field-label-box-class" pack="end">
                             <label for="description-field" value="&newevent.description.label;"/>
                         </hbox>
-                        <textbox id="description-field" multiline="true" rows="3" cols="30" />
+                        <textbox id="description-field"
+                                 multiline="true"
+                                 rows="3"
+                                 cols="30" />
                      </row>
                      
                      
                      <!-- URI/URL -->    
                      <row align="center">
                         <hbox class="field-label-box-class" pack="end">
-                            <label for="uri-field" value="&newevent.uri.label;"/>
+                           <label for="uri-field" value="&newevent.uri.label;"/>
                         </hbox>
                         <hbox>
-                          <textbox id="uri-field" type="autocomplete" searchSessions="history" flex="1"/>
-                          <button label="&newevent.uri.visit.label;" oncommand="launchBrowser()"/>
+                           <textbox id="uri-field"
+                                    type="autocomplete"
+                                    searchSessions="history"
+                                    flex="1"/>
+                           <button label="&newevent.uri.visit.label;"
+                                   oncommand="launchBrowser()"/>
                         </hbox>
                      </row>
               
@@ -211,120 +242,163 @@
                      <!-- Private -->    
                      <row align="center">
                         <spacer />
-                        <checkbox id="private-checkbox" checked="false" label="&newevent.private.label;"/>
+                        <checkbox id="private-checkbox"
+                                  checked="false"
+                                  label="&newevent.private.label;"/>
                      </row>
                      
                      
             
                     <!-- Priority -->    
                     <row align="center">
-                        <hbox class="field-label-box-class" pack="end">
-                            <label value="&newtodo.priority.label;"/>
-                        </hbox>
-                        <hbox>
-                            <menulist id="priority-levels">
-                          <menupopup>
-                                    <menuitem label="&priority.level.none;" value="0"/>
-                                    <menuitem label="&priority.level.low;" value="9"/>
-                                    <menuitem label="&priority.level.medium;" value="5"/>
-                                    <menuitem label="&priority.level.high;" value="1"/>
-                          </menupopup>
-                        </menulist>
-                        </hbox>
+                       <hbox class="field-label-box-class" pack="end">
+                          <label value="&newtodo.priority.label;"/>
+                       </hbox>
+                       <hbox>
+                          <menulist id="priority-levels">
+                             <menupopup>
+                                <menuitem label="&priority.level.none;"
+                                          value="0"/>
+                                <menuitem label="&priority.level.low;"
+                                          value="9"/>
+                                <menuitem label="&priority.level.medium;"
+                                          value="5"/>
+                                <menuitem label="&priority.level.high;"
+                                          value="1"/>
+                             </menupopup>
+                          </menulist>
+                       </hbox>
                     </row>
             
-                     <!-- Alarm -->    
-                     <row align="center">
-                        <spacer />
-                        <vbox>
-                           <hbox  id="alarm-box" align="center">
-                              <checkbox id="alarm-checkbox" class="proper-align" label="&newevent.alarm.label;" checked="false" oncommand="commandAlarm()"/>
-                              <textbox id="alarm-length-field"  oninput="alarmLengthKeyDown( this )"/>
-                              <menulist id="alarm-length-units" crop="none" labelnumber="labelplural">
-                                 <menupopup>
-                                    <menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;"   labelsingular="&alarm.units.minutes.singular;"  value="minutes"/>
-                                    <menuitem label="&alarm.units.hours;"   labelplural="&alarm.units.hours;"     labelsingular="&alarm.units.hours.singular;"    value="hours" />
-                                    <menuitem label="&alarm.units.days;"    labelplural="&alarm.units.days;"      labelsingular="&alarm.units.days.singular;"     value="days"/>
-                                 </menupopup>
-                              </menulist>
-                              <menulist id="alarm-trigger-relation" crop="none">
-                                 <menupopup>
-                                    <menuitem label="&newtodo.beforealarm.label;" value="ICAL_RELATED_START"/>
-                                    <menuitem label="&newtodo.beforealarmends.label;" value="ICAL_RELATED_END"/>
-                                 </menupopup>
-                              </menulist>
-                           </hbox>
-                           
-                           <hbox id="alarm-box-email" align="center">
-                               <spacer width="15"/>
-                               <checkbox id="alarm-email-checkbox"  label="&newevent.email.label;" checked="false" oncommand="commandAlarmEmail()"/>
-                               <textbox type="autocomplete" searchSessions="addrbook" id="alarm-email-field" size="39" value="" />
-                           </hbox>       
-                        </vbox>
-                     </row>
-   
-                     <!-- Status -->
+                    <!-- Alarm -->    
                     <row align="center">
-                        <hbox class="field-label-box-class" pack="end">
-                            <label value="&newtodo.status.label;"/>
-                        </hbox>
-                        <checkbox id="cancelled-checkbox"  label="&newtodo.cancelled.label;" checked="false"/>
+                       <spacer />
+                       <vbox>
+                          <hbox  id="alarm-box" align="center">
+                             <checkbox id="alarm-checkbox"
+                                       class="proper-align"
+                                       label="&newevent.alarm.label;"
+                                       checked="false"
+                                       oncommand="commandAlarm()"/>
+                             <textbox id="alarm-length-field"  oninput="alarmLengthKeyDown( this )"/>
+                             <menulist id="alarm-length-units" crop="none" labelnumber="labelplural">
+                                <menupopup>
+                                   <menuitem label="&alarm.units.minutes;"
+                                             labelplural="&alarm.units.minutes;"
+                                             labelsingular="&alarm.units.minutes.singular;"
+                                             value="minutes"/>
+                                   <menuitem label="&alarm.units.hours;"
+                                             labelplural="&alarm.units.hours;"
+                                             labelsingular="&alarm.units.hours.singular;"
+                                             value="hours" />
+                                   <menuitem label="&alarm.units.days;"
+                                             labelplural="&alarm.units.days;"
+                                             labelsingular="&alarm.units.days.singular;"
+                                             value="days"/>
+                                </menupopup>
+                             </menulist>
+                             <menulist id="alarm-trigger-relation" crop="none">
+                                <menupopup>
+                                   <menuitem label="&newtodo.beforealarm.label;"
+                                             value="ICAL_RELATED_START"/>
+                                   <menuitem label="&newtodo.beforealarmends.label;"
+                                             value="ICAL_RELATED_END"/>
+                                </menupopup>
+                             </menulist>
+                          </hbox>
+                           
+                          <hbox id="alarm-box-email" align="center">
+                             <spacer width="15"/>
+                             <checkbox id="alarm-email-checkbox"
+                                       label="&newevent.email.label;"
+                                       checked="false"
+                                       oncommand="commandAlarmEmail()"/>
+                             <textbox type="autocomplete"
+                                      searchSessions="addrbook"
+                                      id="alarm-email-field"
+                                      size="39"
+                                      value="" />
+                          </hbox>       
+                       </vbox>
+                    </row>
+   
+                    <!-- Status -->
+                    <row align="center">
+                       <hbox class="field-label-box-class" pack="end">
+                          <label value="&newtodo.status.label;"/>
+                       </hbox>
+                       <checkbox id="cancelled-checkbox"
+                                 label="&newtodo.cancelled.label;"
+                                 checked="false"/>
                     </row>
 
                     <!-- Completed -->    
                     <row align="center">
-                        <hbox class="field-label-box-class" pack="end">
-                           <label value="&newtodo.completed.label;" pack="end"/>
-                        </hbox>
-                        <hbox>
-                           <checkbox id="completed-checkbox" oncommand="updateCompletedItemEnabled()"/>
-                           <datepicker id="completed-date-picker" disabled="true" value=""/>
-                           <spacer/>  
-                           <menulist  id="percent-complete-menulist" editable="true" oncommand="percentCompleteCommand()">
-                              <menupopup>
-                                 <menuitem label="0" value="0"/>
-                                 <menuitem label="10" value="10"/>
-                                 <menuitem label="20" value="20"/>
-                                 <menuitem label="30" value="30"/>
-                                 <menuitem label="40" value="40"/>
-                                 <menuitem label="50" value="50"/>
-                                 <menuitem label="60" value="60"/>
-                                 <menuitem label="70" value="70"/>
-                                 <menuitem label="80" value="80"/>
-                                 <menuitem label="90" value="90"/>
-                                 <menuitem label="100" value="100"/>
-                              </menupopup>
-                           </menulist>
-                           <label id="percent-complete-text" value="&newtodo.percentcomplete.label;"/>
-                        </hbox>
+                       <hbox class="field-label-box-class" pack="end">
+                          <label value="&newtodo.completed.label;" pack="end"/>
+                       </hbox>
+                       <hbox>
+                          <checkbox id="completed-checkbox" oncommand="updateCompletedItemEnabled()"/>
+                          <datepicker id="completed-date-picker" disabled="true" value=""/>
+                          <spacer/>  
+                          <menulist  id="percent-complete-menulist" editable="true" oncommand="percentCompleteCommand()">
+                             <menupopup>
+                                <menuitem label="0"
+                                          value="0"/>
+                                <menuitem label="10"
+                                          value="10"/>
+                                <menuitem label="20"
+                                          value="20"/>
+                                <menuitem label="30"
+                                          value="30"/>
+                                <menuitem label="40"
+                                          value="40"/>
+                                <menuitem label="50"
+                                          value="50"/>
+                                <menuitem label="60"
+                                          value="60"/>
+                                <menuitem label="70"
+                                          value="70"/>
+                                <menuitem label="80"
+                                          value="80"/>
+                                <menuitem label="90"
+                                          value="90"/>
+                                <menuitem label="100"
+                                          value="100"/>
+                             </menupopup>
+                          </menulist>
+                          <label id="percent-complete-text" value="&newtodo.percentcomplete.label;"/>
+                       </hbox>
                     </row>
 
-                     <!-- Categories -->
-                     <row align="center">
-                        <hbox class="field-label-box-class" pack="end">
-                            <label value="&newtodo.categories.label;"/>
-                        </hbox>
-                        <menulist id="categories-field" label="&newevent.category.label;">
-                            <menupopup id="categories-menulist-menupopup">
-                                <menuitem label="&priority.level.none;" value="0"/>
-                            </menupopup>
-                        </menulist>
-                     </row>
+                    <!-- Categories -->
+                    <row align="center">
+                       <hbox class="field-label-box-class" pack="end">
+                          <label value="&newtodo.categories.label;"/>
+                       </hbox>
+                       <menulist id="categories-field" label="&newevent.category.label;">
+                          <menupopup id="categories-menulist-menupopup">
+                             <menuitem label="&priority.level.none;" value="0"/>
+                          </menupopup>
+                       </menulist>
+                    </row>
             
-                     <!-- Calendar Server -->
-                     <row align="center">
-                        <hbox class="field-label-box-class" pack="end">
-                            <label id="server-field-label" value="&newevent.server.label;"/>
-                        </hbox>
-                        <menulist id="server-field">
-                           <menupopup id="server-menulist-menupopup" datasources="rdf:null" ref="urn:calendarcontainer">
-                              <template>
-                                 <rule>   
-                                    <menuitem uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#path" label="rdf:http://home.netscape.com/NC-rdf#name"/>
-                                 </rule>
-                              </template>
-                            </menupopup>
-                        </menulist>
+                    <!-- Calendar Server -->
+                    <row align="center">
+                       <hbox class="field-label-box-class" pack="end">
+                          <label id="server-field-label" value="&newevent.server.label;"/>
+                       </hbox>
+                       <menulist id="server-field">
+                          <menupopup id="server-menulist-menupopup" datasources="rdf:null" ref="urn:calendarcontainer">
+                             <template>
+                                <rule>   
+                                   <menuitem uri="rdf:*"
+                                             value="rdf:http://home.netscape.com/NC-rdf#path"
+                                             label="rdf:http://home.netscape.com/NC-rdf#name"/>
+                                </rule>
+                             </template>
+                          </menupopup>
+                       </menulist>
                      </row>
                   </rows>
                </grid>
@@ -334,35 +408,114 @@
             <!-- Repeat -->    
                <vbox>
                   <hbox id="repeat-box" align="center">
-                     <checkbox id="repeat-checkbox" class="proper-align" label="&newevent.repeat.label;"  checked="false" oncommand="commandRepeat();commandUntil()"/>
-                     <textbox id="repeat-length-field" class="cursor-pointer" disable-controller="repeat" value="1"  oninput="repeatLengthKeyDown( this )"/>
+                     <checkbox id="repeat-checkbox"
+                               class="proper-align"
+                               label="&newevent.repeat.label;"
+                               checked="false"
+                               oncommand="commandRepeat();commandUntil()"/>
+                     <textbox id="repeat-length-field"
+                              class="cursor-pointer"
+                              disable-controller="repeat"
+                              value="1"
+                              oninput="repeatLengthKeyDown( this )"/>
                               
-                     <menulist crop="none" oncommand="repeatUnitCommand( this )" labelnumber="labelplural"  id="repeat-length-units" disable-controller="repeat">
+                     <menulist crop="none"
+                               oncommand="repeatUnitCommand( this )"
+                               labelnumber="labelplural"
+                               id="repeat-length-units"
+                               disable-controller="repeat">
                         <menupopup>
-                           <menuitem label="&repeat.units.days;"   labelplural="&repeat.units.days;"   labelsingular="&repeat.units.days.singular;"   id="repeat-length-days"   value="days" />
-                           <menuitem label="&repeat.units.weeks;"  labelplural="&repeat.units.weeks;"  labelsingular="&repeat.units.weeks.singular;"  id="repeat-length-weeks"  value="weeks"/>
-                           <menuitem label="&repeat.units.months;" labelplural="&repeat.units.months;" labelsingular="&repeat.units.months.singular;" id="repeat-length-months" value="months"/>
-                           <menuitem label="&repeat.units.years;"  labelplural="&repeat.units.years;"  labelsingular="&repeat.units.years.singular;"  id="repeat-length-years"  value="years" />
+                           <menuitem label="&repeat.units.days;"
+                                     labelplural="&repeat.units.days;"
+                                     labelsingular="&repeat.units.days.singular;"
+                                     id="repeat-length-days"
+                                     value="days" />
+                           <menuitem label="&repeat.units.weeks;"
+                                     labelplural="&repeat.units.weeks;"
+                                     labelsingular="&repeat.units.weeks.singular;"
+                                     id="repeat-length-weeks"
+                                     value="weeks"/>
+                           <menuitem label="&repeat.units.months;"
+                                     labelplural="&repeat.units.months;"
+                                     labelsingular="&repeat.units.months.singular;"
+                                     id="repeat-length-months"
+                                     value="months"/>
+                           <menuitem label="&repeat.units.years;"
+                                     labelplural="&repeat.units.years;"
+                                     labelsingular="&repeat.units.years.singular;"
+                                     id="repeat-length-years"
+                                     value="years" />
                         </menupopup>
                      </menulist>
                   </hbox>
                     
-                  <hbox id="repeat-extenstions-week" disabled="true" disable-controller="repeat" collapsed="false" align="center">
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.1.Ddd;" id="advanced-repeat-week-0" value="0" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.2.Ddd;" id="advanced-repeat-week-1" value="1" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.3.Ddd;" id="advanced-repeat-week-2" value="2" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.4.Ddd;" id="advanced-repeat-week-3" value="3" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.5.Ddd;" id="advanced-repeat-week-4" value="4" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.6.Ddd;" id="advanced-repeat-week-5" value="5" checked="false" />
-                     <checkbox disable-controller="repeat" class="repeat-day-class" label="&day.7.Ddd;" id="advanced-repeat-week-6" value="6" checked="false" />
+                  <hbox id="repeat-extenstions-week"
+                        disabled="true"
+                        disable-controller="repeat"
+                        collapsed="false"
+                        align="center">
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.1.Ddd;"
+                               id="advanced-repeat-week-0"
+                               value="0"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.2.Ddd;"
+                               id="advanced-repeat-week-1"
+                               value="1"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.3.Ddd;"
+                               id="advanced-repeat-week-2"
+                               value="2"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.4.Ddd;"
+                               id="advanced-repeat-week-3"
+                               value="3"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.5.Ddd;"
+                               id="advanced-repeat-week-4"
+                               value="4"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.6.Ddd;"
+                               id="advanced-repeat-week-5"
+                               value="5"
+                               checked="false" />
+                     <checkbox disable-controller="repeat"
+                               class="repeat-day-class"
+                               label="&day.7.Ddd;"
+                               id="advanced-repeat-week-6"
+                               value="6"
+                               checked="false" />
                   </hbox>
                          
-                  <hbox id="repeat-extenstions-month" diabled="true" collapsed="true" align="center">
+                  <hbox id="repeat-extenstions-month"
+                        diabled="true"
+                        collapsed="true"
+                        align="center">
                      <vbox align="center">
-                        <radiogroup id="advanced-repeat-month" disable-controller="repeat">
-                           <radio disable-controller="repeat" id="advanced-repeat-dayofmonth"      label="&newevent.advanced.repeat.dayofmonth.label;" selected="true"/>
-                           <radio disable-controller="repeat" id="advanced-repeat-dayofweek"       label="&newevent.advanced.repeat.dayofweek.label;"/>
-                           <radio disable-controller="repeat" id="advanced-repeat-dayofweek-last"  label="&newevent.advanced.repeat.lastdayofweek.label;" disabled="true"/>
+                        <radiogroup id="advanced-repeat-month"
+                                    disable-controller="repeat">
+                           <radio disable-controller="repeat"
+                                  id="advanced-repeat-dayofmonth"
+                                  label="&newevent.advanced.repeat.dayofmonth.label;"
+                                  selected="true"/>
+                           <radio disable-controller="repeat"
+                                  id="advanced-repeat-dayofweek"
+                                  label="&newevent.advanced.repeat.dayofweek.label;"/>
+                           <radio disable-controller="repeat"
+                                  id="advanced-repeat-dayofweek-last"
+                                  label="&newevent.advanced.repeat.lastdayofweek.label;"
+                                  disabled="true"/>
                         </radiogroup>
                      </vbox>
                   </hbox>
@@ -372,22 +525,34 @@
                   <hbox align="center">
                      <spacer class="repeat-left-spacer" />
                      <radiogroup id="repeat-until-group" disable-controller="repeat">
-                        <radio id="repeat-forever-radio" disable-controller="repeat" label="&newevent.forever.label;" oncommand="commandUntil()"/>
+                        <radio id="repeat-forever-radio"
+                               disable-controller="repeat"
+                               label="&newevent.forever.label;"
+                               oncommand="commandUntil()"/>
                         <vbox id="repeat-end-box" align="center">
-									<hbox>
-										<radio id="repeat-numberoftimes-radio" disable-controller="repeat" label="&newevent.numberoftimes.label;" oncommand=""/>
-										<textbox id="repeat-numberoftimes-textbox" disable-controller="repeat"/>
-									</hbox>
+                           <hbox>
+                              <radio id="repeat-numberoftimes-radio"
+                                     disable-controller="repeat"
+                                     label="&newevent.numberoftimes.label;"
+                                     oncommand=""/>
+                              <textbox id="repeat-numberoftimes-textbox" disable-controller="repeat"/>
+                           </hbox>
                         </vbox>
-								<vbox id="repeat-end-box" align="center">
-                              <hbox>
-                                 <radio id="repeat-until-radio" disable-controller="repeat" label="&newevent.until.label;" oncommand="commandUntil()"/>
+                        <vbox id="repeat-end-box" align="center">
+                           <hbox>
+                              <radio id="repeat-until-radio"
+                                     disable-controller="repeat"
+                                     label="&newevent.until.label;"
+                                     oncommand="commandUntil()"/>
                                  <spacer id="until-spacer"/>
                                  <datepicker id="repeat-end-date-picker" value="" ondatepick="commandUntil()"/>
                               </hbox>
-                              <label id="repeat-time-warning" class="warning-text-class" value="&newevent.recurend.warning;" collapsed="true"/>
+                              <label id="repeat-time-warning"
+                                     class="warning-text-class"
+                                     value="&newevent.recurend.warning;"
+                                     collapsed="true"/>
                         </vbox>
-							</radiogroup>
+                     </radiogroup>
                   </hbox>
                     
                   <hbox align="center">
@@ -403,13 +568,18 @@
                               <row>
                                  <hbox align="center">
                                     <datepicker id="exceptions-date-picker" disable-controller="repeat" value=""/>
-                                 </hbox>   
-                                 <button id="exception-add-button" label="&newevent.addexceptions.label;" disable-controller="repeat" oncommand="addException()"/>
+                                 </hbox> 
+                                 <button id="exception-add-button"
+                                         label="&newevent.addexceptions.label;"
+                                         disable-controller="repeat"
+                                         oncommand="addException()"/>
                               </row>
                               <row>
                                  <listbox id="exception-dates-listbox" disable-controller="repeat" rows="4"/>
                                  <vbox>
-                                    <button label="&newevent.deleteexceptions.label;" disable-controller="repeat" oncommand="removeSelectedExceptionDate()"/>
+                                    <button label="&newevent.deleteexceptions.label;"
+                                            disable-controller="repeat"
+                                            oncommand="removeSelectedExceptionDate()"/>
                                  </vbox>
                               </row>
                            </rows>
@@ -425,7 +595,10 @@
                <!-- Invite -->    
                <vbox collapsed="true">
                   <hbox id="invite-box" align="center">
-                     <checkbox id="invite-checkbox"  label="&newevent.invite.label;" checked="false" oncommand="commandInvite()"/>
+                     <checkbox id="invite-checkbox"
+                               label="&newevent.invite.label;"
+                               checked="false"
+                               oncommand="commandInvite()"/>
                      <textbox id="invite-email-field" size="39" disabled="true"/>
                   </hbox>
                </vbox>
@@ -453,16 +626,32 @@
                   <!-- Existing addresses -->                
                   <vbox id="resultsBox" flex="4">
                      <label value=" " />
-                     <tree id="abResultsTree" flex="1" persist="height" hidecolumnpicker="true" onclick="this.contactsTree.onClick( event );" ondblclick="this.contactsTree.onDblClick( event );">
+                     <tree id="abResultsTree"
+                           flex="1"
+                           persist="height"
+                           hidecolumnpicker="true"
+                           onclick="this.contactsTree.onClick( event );"
+                           ondblclick="this.contactsTree.onDblClick( event );">
                       
                         <treecols id="recipientTreeCols">
-                           <treecol id="GeneratedName" sort-field="GeneratedName" class="sortDirectionIndicator"   list-view-sort-field="true" 
-                              persist="ordinal width" flex="1" label="&ab-selectAddressesDialogNameColumn.label;" primary="true"/>
+                           <treecol id="GeneratedName"
+                                    sort-field="GeneratedName"
+                                    class="sortDirectionIndicator"
+                                    list-view-sort-field="true" 
+                                    persist="ordinal width"
+                                    flex="1"
+                                    label="&ab-selectAddressesDialogNameColumn.label;"
+                                    primary="true"/>
                               
                            <splitter class="tree-splitter"/>
                               
-                           <treecol id="PrimaryEmail" sort-field="PrimaryEmail" class="sortDirectionIndicator" list-view-sort-field="true"  
-                              persist="ordinal width"  flex="1" label="&ab-selectAddressesDialogEmailColumn.label;"/>
+                           <treecol id="PrimaryEmail"
+                                    sort-field="PrimaryEmail"
+                                    class="sortDirectionIndicator"
+                                    list-view-sort-field="true"  
+                                    persist="ordinal width"
+                                    flex="1"
+                                    label="&ab-selectAddressesDialogEmailColumn.label;"/>
                         </treecols>
                           
                         <treechildren />
@@ -473,9 +662,14 @@
                   <!-- Add and remove buttons -->
                   <vbox id="addToBucketButtonBox">
                       <spacer flex="1" />
-                      <button id="toButton" label="&ab-selectAddressesDialogInvite.label;" command="addToInviteList" /> 
+                      <button id="toButton"
+                              label="&ab-selectAddressesDialogInvite.label;"
+                              command="addToInviteList" /> 
                       <spacer />
-                      <button id="remove" label="&ab-selectAddressesDialogUninvite.label;" class="dialog" command="removeFromInviteList" /> 
+                      <button id="remove"
+                              label="&ab-selectAddressesDialogUninvite.label;"
+                              class="dialog"
+                              command="removeFromInviteList" /> 
                       <spacer flex="1" />
                   </vbox>
                   
@@ -483,12 +677,15 @@
                   <vbox id="bucketBox" flex="1">
                       <label value="&ab-selectAddressesDialogInviteList.label;"/>
                       
-                      <tree id="addressBucket" flex="1" hidecolumnpicker="true" onclick="selectEventRecipient( this );">
-                          <treecols>
-                              <treecol id="addressCol" flex="1" hideheader="true"/>
-                          </treecols>
+                      <tree id="addressBucket"
+                            flex="1"
+                            hidecolumnpicker="true"
+                            onclick="selectEventRecipient( this );">
+                         <treecols>
+                            <treecol id="addressCol" flex="1" hideheader="true"/>
+                         </treecols>
                           
-                          <treechildren id="bucketBody" flex="1"/>
+                         <treechildren id="bucketBody" flex="1"/>
                       </tree>
                   </vbox>
                   
diff --git a/calendar/resources/content/weekView.xul b/calendar/resources/content/weekView.xul
index dfd1e0d218eb..e8deaccaf79d 100644
--- a/calendar/resources/content/weekView.xul
+++ b/calendar/resources/content/weekView.xul
@@ -71,15 +71,19 @@
       ArrayOfDayNames[5] = "&day.6.DDD;";
       ArrayOfDayNames[6] = "&day.7.DDD;";
       
-    </script>
+   </script>
 
-    <vbox id="week-view-box" flex="1">
+   <vbox id="week-view-box" flex="1">
   
       <!-- Week View: Controls-->
           
       <hbox id="week-controls-box"> <!-- DO NOT SET FLEX, breaks resizing -->
          <box class="week-previous-button-box">
-            <image id="week-previous-button" class="prevnextbuttons" onclick="gCalendarWindow.goToPrevious()" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"/>
+            <image id="week-previous-button"
+                   class="prevnextbuttons"
+                   onclick="gCalendarWindow.goToPrevious()"
+                   ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                   ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"/>
          </box>
          
          <hbox id="week-title-container" flex="1">
@@ -90,417 +94,1935 @@
          
          
          <box id="week-next-button-box">
-            <image id="week-next-button" class="prevnextbuttons" onclick="gCalendarWindow.goToNext()" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"/>
+            <image id="week-next-button"
+                   class="prevnextbuttons"
+                   onclick="gCalendarWindow.goToNext()"
+                   ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                   ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"/>
          </box>
       
       </hbox>
    
    
 
-     <!-- Week View: All Day Boxes -->
+    <!-- Week View: All Day Boxes -->
            
     <vbox id="week-view-content-box" flex="1">    
        <stack id="week-view-content-board" flex="1">    
 
        <grid id="week-view-content-holder" flex="1">
           <rows>
-	      <row id="week-view-header-row" class="week-row-header-class"/>
-	      <row id="week-view-allday-row" class="week-row-allday-class"/>
-	      <row id="week-view-row-0" class="week-row-class" flex="1"/>
-	      <row id="week-view-row-1" class="week-row-class" flex="1"/>
-              <row id="week-view-row-2" class="week-row-class" flex="1"/>
-              <row id="week-view-row-3" class="week-row-class" flex="1"/>
-              <row id="week-view-row-4" class="week-row-class" flex="1"/>
-              <row id="week-view-row-5" class="week-row-class" flex="1"/>
-              <row id="week-view-row-6" class="week-row-class" flex="1"/>
-              <row id="week-view-row-7" class="week-row-class" flex="1"/>
-              <row id="week-view-row-8" class="week-row-class" flex="1"/>
-              <row id="week-view-row-9" class="week-row-class" flex="1"/>
-              <row id="week-view-row-10" class="week-row-class" flex="1"/>
-              <row id="week-view-row-11" class="week-row-class" flex="1"/>
-              <row id="week-view-row-12" class="week-row-class" flex="1"/>
-              <row id="week-view-row-13" class="week-row-class" flex="1"/>
-              <row id="week-view-row-14" class="week-row-class" flex="1"/>
-              <row id="week-view-row-15" class="week-row-class" flex="1"/>
-              <row id="week-view-row-16" class="week-row-class" flex="1"/>
-              <row id="week-view-row-17" class="week-row-class" flex="1"/>
-              <row id="week-view-row-18" class="week-row-class" flex="1"/>
-              <row id="week-view-row-19" class="week-row-class" flex="1"/>
-              <row id="week-view-row-20" class="week-row-class" flex="1"/>
-              <row id="week-view-row-21" class="week-row-class" flex="1"/>
-              <row id="week-view-row-22" class="week-row-class" flex="1"/>
-              <row id="week-view-row-23" class="week-row-class" flex="1"/>
+             <row id="week-view-header-row" class="week-row-header-class"/>
+             <row id="week-view-allday-row" class="week-row-allday-class"/>
+             <row id="week-view-row-0" class="week-row-class" flex="1"/>
+             <row id="week-view-row-1" class="week-row-class" flex="1"/>
+             <row id="week-view-row-2" class="week-row-class" flex="1"/>
+             <row id="week-view-row-3" class="week-row-class" flex="1"/>
+             <row id="week-view-row-4" class="week-row-class" flex="1"/>
+             <row id="week-view-row-5" class="week-row-class" flex="1"/>
+             <row id="week-view-row-6" class="week-row-class" flex="1"/>
+             <row id="week-view-row-7" class="week-row-class" flex="1"/>
+             <row id="week-view-row-8" class="week-row-class" flex="1"/>
+             <row id="week-view-row-9" class="week-row-class" flex="1"/>
+             <row id="week-view-row-10" class="week-row-class" flex="1"/>
+             <row id="week-view-row-11" class="week-row-class" flex="1"/>
+             <row id="week-view-row-12" class="week-row-class" flex="1"/>
+             <row id="week-view-row-13" class="week-row-class" flex="1"/>
+             <row id="week-view-row-14" class="week-row-class" flex="1"/>
+             <row id="week-view-row-15" class="week-row-class" flex="1"/>
+             <row id="week-view-row-16" class="week-row-class" flex="1"/>
+             <row id="week-view-row-17" class="week-row-class" flex="1"/>
+             <row id="week-view-row-18" class="week-row-class" flex="1"/>
+             <row id="week-view-row-19" class="week-row-class" flex="1"/>
+             <row id="week-view-row-20" class="week-row-class" flex="1"/>
+             <row id="week-view-row-21" class="week-row-class" flex="1"/>
+             <row id="week-view-row-22" class="week-row-class" flex="1"/>
+             <row id="week-view-row-23" class="week-row-class" flex="1"/>
            </rows>
 
-	   <columns equalsize="always">
-	      <column id="week-view-top-left-box">
-                   <!-- HOURS -->
-		   <box id="weekview-daynumber-spacer">
-		     <box id="weekview-header-spacer-left" flex="1" />
-		     <box id="weekview-daynumber-spacer-mid" />
-		   </box>
+           <columns equalsize="always">
+              <column id="week-view-top-left-box">
+                 <!-- HOURS -->
+                 <box id="weekview-daynumber-spacer">
+                    <box id="weekview-header-spacer-left" flex="1" />
+                    <box id="weekview-daynumber-spacer-mid" />
+                 </box>
 
-		   <vbox id="weekview-daynumber-spacer-left">
-		     <label class="all-day-content-box-text-title" value="&allDayEvents.label;"/>
-		   </vbox>
+                 <vbox id="weekview-daynumber-spacer-left">
+                    <label class="all-day-content-box-text-title" value="&allDayEvents.label;"/>
+                 </vbox>
 
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-0">
-		     <label class="week-time-class-text" id="week-view-hour-0" value="&time.midnight;"/>
-                   </box>
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-0">
+                    <label class="week-time-class-text" id="week-view-hour-0" value="&time.midnight;"/>
+                 </box>
                    
-		   <box class="week-view-hours-only-box-class" id="week-tree-hour-1">
-		     <label class="week-time-class-text" id="week-view-hour-1"/>
-                   </box>
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-1">
+                    <label class="week-time-class-text" id="week-view-hour-1"/>
+                 </box>
                    
-		   <box class="week-view-hours-only-box-class" id="week-tree-hour-2">
-		     <label class="week-time-class-text" id="week-view-hour-2"/>
-                   </box>
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-2">
+                    <label class="week-time-class-text" id="week-view-hour-2"/>
+                 </box>
                    
-		   <box class="week-view-hours-only-box-class" id="week-tree-hour-3">
-		     <label class="week-time-class-text" id="week-view-hour-3"/>
-                   </box>
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-3">
+                    <label class="week-time-class-text" id="week-view-hour-3"/>
+                 </box>
                    
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-4">
-				            <label class="week-time-class-text" id="week-view-hour-4"/>
-                   </box>
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-4">
+                    <label class="week-time-class-text" id="week-view-hour-4"/>
+                 </box>
                    
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-5">
-				            <label class="week-time-class-text" id="week-view-hour-5"/>
-                   </box>
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-6">
-				            <label class="week-time-class-text" id="week-view-hour-6"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-7">
-				            <label class="week-time-class-text" id="week-view-hour-7"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-8">
-				            <label class="week-time-class-text" id="week-view-hour-8"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-9">
-				            <label class="week-time-class-text" id="week-view-hour-9"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-10">
-				            <label class="week-time-class-text" id="week-view-hour-10"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-11">
-				            <label class="week-time-class-text" id="week-view-hour-11"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-12">
-				            <label class="week-time-class-text" id="week-view-hour-12"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-13">
-				            <label class="week-time-class-text" id="week-view-hour-13"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-14">
-				            <label class="week-time-class-text" id="week-view-hour-14"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-15">
-				            <label class="week-time-class-text" id="week-view-hour-15"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-16">
-				            <label class="week-time-class-text" id="week-view-hour-16"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-17">
-				            <label class="week-time-class-text" id="week-view-hour-17"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-18">
-				            <label class="week-time-class-text" id="week-view-hour-18"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-19">
-				            <label class="week-time-class-text" id="week-view-hour-19"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-20">
-				            <label class="week-time-class-text" id="week-view-hour-20"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-21">
-				            <label class="week-time-class-text" id="week-view-hour-21"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-22">
-				            <label class="week-time-class-text" id="week-view-hour-22"/>
-                   </box>
-                   
-                   <box class="week-view-hours-only-box-class" id="week-tree-hour-23">
-				            <label class="week-time-class-text" id="week-view-hour-23"/>
-                   </box>
-                   <!-- / HOURS -->
-		</column>
-                   
-                <!-- DAY 0 -->
-	  <column class="week-view-day-container-box" id="weekview-column-day-1" flex="1">
-	       <hbox flex="1" id="week-header-box-1" class="weekview-daynumber-class">
-		  <label id="week-header-date-1" class="week-header-date" value=""/>
-		  <label id="week-header-date-text-1" class="week-header-date-text" value="&day.1.DDD;" />
-	       </hbox>
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-5">
+                    <label class="week-time-class-text" id="week-view-hour-5"/>
+                 </box>
 
-	       <hbox class="all-day-content-box-week" id="all-day-content-box-week-1" flex="1"/>
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-6">
+                    <label class="week-time-class-text" id="week-view-hour-6"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-7">
+                    <label class="week-time-class-text" id="week-view-hour-7"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-8">
+                    <label class="week-time-class-text" id="week-view-hour-8"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-9">
+                    <label class="week-time-class-text" id="week-view-hour-9"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-10">
+                    <label class="week-time-class-text" id="week-view-hour-10"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-11">
+                    <label class="week-time-class-text" id="week-view-hour-11"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-12">
+                    <label class="week-time-class-text" id="week-view-hour-12"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-13">
+                    <label class="week-time-class-text" id="week-view-hour-13"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-14">
+                    <label class="week-time-class-text" id="week-view-hour-14"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-15">
+                    <label class="week-time-class-text" id="week-view-hour-15"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-16">
+                    <label class="week-time-class-text" id="week-view-hour-16"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-17">
+                    <label class="week-time-class-text" id="week-view-hour-17"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-18">
+                    <label class="week-time-class-text" id="week-view-hour-18"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-19">
+                    <label class="week-time-class-text" id="week-view-hour-19"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-20">
+                    <label class="week-time-class-text" id="week-view-hour-20"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-21">
+                    <label class="week-time-class-text" id="week-view-hour-21"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-22">
+                    <label class="week-time-class-text" id="week-view-hour-22"/>
+                 </box>
+                   
+                 <box class="week-view-hours-only-box-class" id="week-tree-hour-23">
+                    <label class="week-time-class-text" id="week-view-hour-23"/>
+                 </box>
+                 <!-- / HOURS -->
+              </column>
+                   
+              <!-- DAY 0 -->
+              <column class="week-view-day-container-box" id="weekview-column-day-1" flex="1">
+	         <hbox flex="1" id="week-header-box-1" class="weekview-daynumber-class">
+                    <label id="week-header-date-1" class="week-header-date" value=""/>
+                    <label id="week-header-date-text-1" class="week-header-date-text" value="&day.1.DDD;" />
+                 </hbox>
 
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-0" day="1" hour="0" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-1" day="1" hour="1" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-2" day="1" hour="2" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-3" day="1" hour="3" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-4" day="1" hour="4" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-5" day="1" hour="5" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-6" day="1" hour="6" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-7" day="1" hour="7" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-8" day="1" hour="8" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-9" day="1" hour="9" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-10" day="1" hour="10" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-11" day="1" hour="11" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-12" day="1" hour="12" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-13" day="1" hour="13" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-14" day="1" hour="14" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-15" day="1" hour="15" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-16" day="1" hour="16" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-17" day="1" hour="17" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-18" day="1" hour="18" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-19" day="1" hour="19" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-20" day="1" hour="20" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-21" day="1" hour="21" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-22" day="1" hour="22" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-0-item-23" day="1" hour="23" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-			</column>
-               <!-- / DAY 0 -->
+                 <hbox class="all-day-content-box-week" id="all-day-content-box-week-1" flex="1"/>
+
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-0"
+                      day="1"
+                      hour="0"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-1"
+                      day="1"
+                      hour="1"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-2"
+                      day="1"
+                      hour="2"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-3"
+                      day="1"
+                      hour="3"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-4"
+                      day="1"
+                      hour="4"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-5"
+                      day="1"
+                      hour="5"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-6"
+                      day="1"
+                      hour="6"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-7"
+                      day="1"
+                      hour="7"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-8"
+                      day="1"
+                      hour="8"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-9"
+                      day="1"
+                      hour="9"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-10"
+                      day="1"
+                      hour="10"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-11"
+                      day="1"
+                      hour="11"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-12"
+                      day="1"
+                      hour="12"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-13"
+                      day="1"
+                      hour="13"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-14"
+                      day="1"
+                      hour="14"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-15"
+                      day="1"
+                      hour="15"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-16"
+                      day="1"
+                      hour="16"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-17"
+                      day="1"
+                      hour="17"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-18"
+                      day="1"
+                      hour="18"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-19"
+                      day="1"
+                      hour="19" 
+                      onclick="weekViewHourClick( event )" 
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-20"
+                      day="1"
+                      hour="20"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-21"
+                      day="1"
+                      hour="21"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" 
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-22"
+                      day="1"
+                      hour="22"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-0-item-23"
+                      day="1"
+                      hour="23"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+              </column>
+              <!-- / DAY 0 -->
                 
-               <!-- DAY 1 -->
-			<column id="weekview-column-day-2" class="week-view-day-container-box" flex="1">
-	       <hbox flex="1" id="week-header-box-2" class="weekview-daynumber-class">
-		  <label id="week-header-date-2" class="week-header-date" value="" />
-		  <label id="week-header-date-text-2" class="week-header-date-text" value="&day.2.DDD;" />
-	       </hbox>
+              <!-- DAY 1 -->
+              <column id="weekview-column-day-2" class="week-view-day-container-box" flex="1">
+                 <hbox flex="1" id="week-header-box-2" class="weekview-daynumber-class">
+                    <label id="week-header-date-2" class="week-header-date" value="" />
+                    <label id="week-header-date-text-2" class="week-header-date-text" value="&day.2.DDD;" />
+                 </hbox>
 
-         <hbox class="all-day-content-box-week" id="all-day-content-box-week-2" flex="1"/>
+                 <hbox class="all-day-content-box-week" id="all-day-content-box-week-2" flex="1"/>
             
-                  <box class="week-view-hour-box-class" id="week-tree-day-1-item-0" day="2" hour="0" onclick="weekViewHourClick( event  )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-1" day="2" hour="1" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-2" day="2" hour="2" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-3" day="2" hour="3" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-4" day="2" hour="4" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-5" day="2" hour="5" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-6" day="2" hour="6" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-7" day="2" hour="7" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-8" day="2" hour="8" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-9" day="2" hour="9" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-10" day="2" hour="10" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-11" day="2" hour="11" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-12" day="2" hour="12" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-13" day="2" hour="13" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-14" day="2" hour="14" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-15" day="2" hour="15" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-16" day="2" hour="16" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-17" day="2" hour="17" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-18" day="2" hour="18" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-19" day="2" hour="19" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-20" day="2" hour="20" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-21" day="2" hour="21" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-22" day="2" hour="22" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-1-item-23" day="2" hour="23" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-			</column>
-                <!-- / DAY 1 -->
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-0"
+                      day="2"
+                      hour="0"
+                      onclick="weekViewHourClick( event  )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" 
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-1"
+                      day="2"
+                      hour="1"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-2"
+                      day="2"
+                      hour="2"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-3"
+                      day="2" 
+                      hour="3"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-4"
+                      day="2"
+                      hour="4"
+                      onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-5"
+                      day="2"
+                      hour="5"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-6"
+                      day="2"
+                      hour="6"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-7"
+                      day="2"
+                      hour="7"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-8"
+                      day="2"
+                      hour="8"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-9"
+                      day="2"
+                      hour="9"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-10"
+                      day="2"
+                      hour="10"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-11"
+                      day="2"
+                      hour="11"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-12" 
+                      day="2"
+                      hour="12"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-13"
+                      day="2"
+                      hour="13"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-14"
+                      day="2"
+                      hour="14"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-15"
+                      day="2"
+                      hour="15"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-16"
+                      day="2"
+                      hour="16"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-17"
+                      day="2"
+                      hour="17"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-18"
+                      day="2"
+                      hour="18"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-19"
+                      day="2"
+                      hour="19"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-20"
+                      day="2"
+                      hour="20"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-21"
+                      day="2"
+                      hour="21"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-22"
+                      day="2"
+                      hour="22"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-1-item-23"
+                      day="2"
+                      hour="23"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+              </column>
+              <!-- / DAY 1 -->
                 
    
-                <!-- DAY 2 -->
-			<column id="weekview-column-day-3" class="week-view-day-container-box" flex="1">
-	       <hbox flex="1" id="week-header-box-3" class="weekview-daynumber-class">
-		  <label id="week-header-date-3" class="week-header-date" value="" />
-		  <label id="week-header-date-text-3" class="week-header-date-text" value="&day.3.DDD;" />
-	       </hbox>
+              <!-- DAY 2 -->
+              <column id="weekview-column-day-3"
+                      class="week-view-day-container-box" flex="1">
+                 <hbox flex="1" id="week-header-box-3" class="weekview-daynumber-class">
+                    <label id="week-header-date-3" class="week-header-date" value="" />
+                    <label id="week-header-date-text-3" class="week-header-date-text" value="&day.3.DDD;" />
+                 </hbox>
 
-         <hbox class="all-day-content-box-week" id="all-day-content-box-week-3" flex="1"/>
+                 <hbox class="all-day-content-box-week" id="all-day-content-box-week-3" flex="1"/>
 
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-0" day="3" hour="0" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-1" day="3" hour="1" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-2" day="3" hour="2" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-3" day="3" hour="3" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-4" day="3" hour="4" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-5" day="3" hour="5" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-6" day="3" hour="6" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-7" day="3" hour="7" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-8" day="3" hour="8" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-9" day="3" hour="9" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-10" day="3" hour="10" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-11" day="3" hour="11" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-12" day="3" hour="12" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-13" day="3" hour="13" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-14" day="3" hour="14" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-15" day="3" hour="15" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-16" day="3" hour="16" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-17" day="3" hour="17" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-18" day="3" hour="18" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-19" day="3" hour="19" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-20" day="3" hour="20" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-21" day="3" hour="21" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-22" day="3" hour="22" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-2-item-23" day="3" hour="23" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-			</column>
-                <!-- / DAY 2 -->
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-0"
+                      day="3"
+                      hour="0"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-1"
+                      day="3"
+                      hour="1"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-2"
+                      day="3"
+                      hour="2"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-3"
+                      day="3"
+                      hour="3"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-4"
+                      day="3"
+                      hour="4"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-5"
+                      day="3"
+                      hour="5"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-6"
+                      day="3"
+                      hour="6"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-7"
+                      day="3"
+                      hour="7"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-8"
+                      day="3"
+                      hour="8"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-9"
+                      day="3"
+                      hour="9"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-10"
+                      day="3"
+                      hour="10"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-11"
+                      day="3"
+                      hour="11"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-12"
+                      day="3"
+                      hour="12"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-13"
+                      day="3"
+                      hour="13"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-14"
+                      day="3"
+                      hour="14"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-15"
+                      day="3"
+                      hour="15"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-16"
+                      day="3"
+                      hour="16"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-17"
+                      day="3"
+                      hour="17"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-18"
+                      day="3"
+                      hour="18"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-19"
+                      day="3"
+                      hour="19"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-20"
+                      day="3"
+                      hour="20"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-21"
+                      day="3"
+                      hour="21"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-22"
+                      day="3"
+                      hour="22"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-2-item-23"
+                      day="3"
+                      hour="23"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+              </column>
+              <!-- / DAY 2 -->
                 
    
-                <!-- DAY 3 -->
-			<column id="weekview-column-day-4" class="week-view-day-container-box" flex="1">
-	       <hbox flex="1" id="week-header-box-4" class="weekview-daynumber-class">
-		  <label id="week-header-date-4" class="week-header-date" value="" />
-		  <label id="week-header-date-text-4" class="week-header-date-text" value="&day.4.DDD;" />
-	       </hbox>
+              <!-- DAY 3 -->
+              <column id="weekview-column-day-4" class="week-view-day-container-box" flex="1">
+                 <hbox flex="1" id="week-header-box-4" class="weekview-daynumber-class">
+                    <label id="week-header-date-4" class="week-header-date" value="" />
+                    <label id="week-header-date-text-4" class="week-header-date-text" value="&day.4.DDD;" />
+                 </hbox>
 
-         <hbox class="all-day-content-box-week" id="all-day-content-box-week-4" flex="1"/>
+                 <hbox class="all-day-content-box-week" id="all-day-content-box-week-4" flex="1"/>
                  
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-0" day="4" hour="0" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-1" day="4" hour="1" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-2" day="4" hour="2" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-3" day="4" hour="3" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-4" day="4" hour="4" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-5" day="4" hour="5" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-6" day="4" hour="6" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-7" day="4" hour="7" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-8" day="4" hour="8" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-9" day="4" hour="9" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-10" day="4" hour="10" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-11" day="4" hour="11" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-12" day="4" hour="12" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-13" day="4" hour="13" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-14" day="4" hour="14" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-15" day="4" hour="15" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-16" day="4" hour="16" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-17" day="4" hour="17" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-18" day="4" hour="18" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-19" day="4" hour="19" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-20" day="4" hour="20" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-21" day="4" hour="21" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-22" day="4" hour="22" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-3-item-23" day="4" hour="23" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-			</column>
-                <!-- / DAY 3 -->
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-0"
+                      day="4"
+                      hour="0"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-1"
+                      day="4"
+                      hour="1"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-2"
+                      day="4"
+                      hour="2"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-3"
+                      day="4"
+                      hour="3"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-4"
+                      day="4"
+                      hour="4"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-5"
+                      day="4"
+                      hour="5"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-6"
+                      day="4"
+                      hour="6"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-7"
+                      day="4"
+                      hour="7"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-8"
+                      day="4"
+                      hour="8"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-9"
+                      day="4"
+                      hour="9"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-10"
+                      day="4"
+                      hour="10"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-11"
+                      day="4"
+                      hour="11"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-12"
+                      day="4"
+                      hour="12"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-13"
+                      day="4"
+                      hour="13"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-14"
+                      day="4"
+                      hour="14"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-15"
+                      day="4"
+                      hour="15"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-16"
+                      day="4"
+                      hour="16"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-17"
+                      day="4"
+                      hour="17"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-18"
+                      day="4"
+                      hour="18"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-19"
+                      day="4"
+                      hour="19"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-20"
+                      day="4"
+                      hour="20"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-21"
+                      day="4"
+                      hour="21"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-22"
+                      day="4"
+                      hour="22"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-3-item-23"
+                      day="4"
+                      hour="23"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+              </column>
+              <!-- / DAY 3 -->
                 
    
-                <!-- DAY 4 -->
-			<column id="weekview-column-day-5" class="week-view-day-container-box" flex="1">
-	       <hbox flex="1" id="week-header-box-5" class="weekview-daynumber-class">
-		  <label id="week-header-date-5" class="week-header-date" value="" />
-		  <label id="week-header-date-text-5" class="week-header-date-text" value="&day.5.DDD;" />
-	       </hbox>
+              <!-- DAY 4 -->
+              <column id="weekview-column-day-5" class="week-view-day-container-box" flex="1">
+                 <hbox flex="1" id="week-header-box-5" class="weekview-daynumber-class">
+                    <label id="week-header-date-5" class="week-header-date" value="" />
+                    <label id="week-header-date-text-5" class="week-header-date-text" value="&day.5.DDD;" />
+                 </hbox>
 
-         <hbox class="all-day-content-box-week" id="all-day-content-box-week-5" flex="1"/>
+                 <hbox class="all-day-content-box-week" id="all-day-content-box-week-5" flex="1"/>
 
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-0" day="5" hour="0" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-1" day="5" hour="1" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-2" day="5" hour="2" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-3" day="5" hour="3" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-4" day="5" hour="4" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-5" day="5" hour="5" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-6" day="5" hour="6" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-7" day="5" hour="7" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-8" day="5" hour="8" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-9" day="5" hour="9" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-10" day="5" hour="10" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-11" day="5" hour="11" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-12" day="5" hour="12" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-13" day="5" hour="13" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-14" day="5" hour="14" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-15" day="5" hour="15" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-16" day="5" hour="16" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-17" day="5" hour="17" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-18" day="5" hour="18" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-19" day="5" hour="19" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-20" day="5" hour="20" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-21" day="5" hour="21" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-22" day="5" hour="22" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-4-item-23" day="5" hour="23" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-			</column>
-                <!-- / DAY 4 -->
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-0"
+                      day="5"
+                      hour="0"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-1"
+                      day="5"
+                      hour="1"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-2"
+                      day="5"
+                      hour="2"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-3"
+                      day="5"
+                      hour="3"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-4"
+                      day="5"
+                      hour="4"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-5"
+                      day="5"
+                      hour="5"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-6"
+                      day="5"
+                      hour="6"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-7"
+                      day="5"
+                      hour="7"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-8"
+                      day="5"
+                      hour="8"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-9"
+                      day="5"
+                      hour="9"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-10"
+                      day="5"
+                      hour="10"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-11"
+                      day="5"
+                      hour="11"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-12"
+                      day="5"
+                      hour="12"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-13"
+                      day="5"
+                      hour="13"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-14"
+                      day="5"
+                      hour="14"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-15"
+                      day="5"
+                      hour="15"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-16"
+                      day="5"
+                      hour="16"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-17"
+                      day="5"
+                      hour="17"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-18"
+                      day="5"
+                      hour="18"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-19"
+                      day="5"
+                      hour="19"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-20"
+                      day="5"
+                      hour="20"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-21"
+                      day="5"
+                      hour="21"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-22"
+                      day="5"
+                      hour="22"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-4-item-23"
+                      day="5"
+                      hour="23"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+              </column>
+              <!-- / DAY 4 -->
                 
    
-                <!-- DAY 5 -->
-			<column id="weekview-column-day-6" class="week-view-day-container-box" flex="1">
-	       <hbox flex="1" id="week-header-box-6" class="weekview-daynumber-class">
-		  <label id="week-header-date-6" class="week-header-date" value="" />
-		  <label id="week-header-date-text-6" class="week-header-date-text" value="&day.6.DDD;" />
-	       </hbox>
+              <!-- DAY 5 -->
+              <column id="weekview-column-day-6"
+                      class="week-view-day-container-box" flex="1">
+                 <hbox flex="1" id="week-header-box-6" class="weekview-daynumber-class">
+                    <label id="week-header-date-6" class="week-header-date" value="" />
+                    <label id="week-header-date-text-6" class="week-header-date-text" value="&day.6.DDD;" />
+                 </hbox>
             
-         <hbox class="all-day-content-box-week" id="all-day-content-box-week-6" flex="1"/>
+                 <hbox class="all-day-content-box-week" id="all-day-content-box-week-6" flex="1"/>
 
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-0" day="6" hour="0" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-1" day="6" hour="1" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-2" day="6" hour="2" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-3" day="6" hour="3" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-4" day="6" hour="4" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-5" day="6" hour="5" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-6" day="6" hour="6" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-7" day="6" hour="7" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-8" day="6" hour="8" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-9" day="6" hour="9" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-10" day="6" hour="10" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-11" day="6" hour="11" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-12" day="6" hour="12" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-13" day="6" hour="13" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-14" day="6" hour="14" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-15" day="6" hour="15" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-16" day="6" hour="16" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-17" day="6" hour="17" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-18" day="6" hour="18" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-19" day="6" hour="19" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-20" day="6" hour="20" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-21" day="6" hour="21" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-22" day="6" hour="22" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class" id="week-tree-day-5-item-23" day="6" hour="23" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-			</column>
-                <!-- / DAY 5 -->
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-0"
+                      day="6"
+                      hour="0"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-1"
+                      day="6"
+                      hour="1"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-2"
+                      day="6"
+                      hour="2"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-3"
+                      day="6"
+                      hour="3"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-4"
+                      day="6"
+                      hour="4"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-5"
+                      day="6"
+                      hour="5"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-6"
+                      day="6"
+                      hour="6"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-7"
+                      day="6"
+                      hour="7"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-8"
+                      day="6"
+                      hour="8"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-9"
+                      day="6"
+                      hour="9"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-10"
+                      day="6"
+                      hour="10"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-11"
+                      day="6"
+                      hour="11"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-12"
+                      day="6"
+                      hour="12"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-13"
+                      day="6"
+                      hour="13"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-14"
+                      day="6"
+                      hour="14"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-15"
+                      day="6"
+                      hour="15"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-16"
+                      day="6"
+                      hour="16"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-17"
+                      day="6"
+                      hour="17"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-18"
+                      day="6"
+                      hour="18"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-19"
+                      day="6"
+                      hour="19"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-20"
+                      day="6"
+                      hour="20"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-21"
+                      day="6"
+                      hour="21"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-22"
+                      day="6"
+                      hour="22"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class"
+                      id="week-tree-day-5-item-23"
+                      day="6"
+                      hour="23"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+              </column>
+              <!-- / DAY 5 -->
                 
    
-                <!-- DAY 6 -->
-			<column id="weekview-column-day-7" class="week-view-day-container-box" flex="1">
-	       <hbox flex="1" id="week-header-box-7" class="weekview-daynumber-class">
-		  <label id="week-header-date-7" class="week-header-date" value="" />
-		  <label id="week-header-date-text-7" class="week-header-date-text" value="&day.7.DDD;" />
-	       </hbox>
+              <!-- DAY 6 -->
+              <column id="weekview-column-day-7" class="week-view-day-container-box" flex="1">
+                 <hbox flex="1" id="week-header-box-7" class="weekview-daynumber-class">
+                    <label id="week-header-date-7" class="week-header-date" value="" />
+                    <label id="week-header-date-text-7" class="week-header-date-text" value="&day.7.DDD;" />
+                 </hbox>
 
-         <hbox class="all-day-content-box-week" id="all-day-content-box-week-7" flex="1"/>
+                 <hbox class="all-day-content-box-week" id="all-day-content-box-week-7" flex="1"/>
 
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-0" day="7" hour="0" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-1" day="7" hour="1" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-2" day="7" hour="2" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-3" day="7" hour="3" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-4" day="7" hour="4" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-5" day="7" hour="5" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-6" day="7" hour="6" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-7" day="7" hour="7" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-8" day="7" hour="8" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-9" day="7" hour="9" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-10" day="7" hour="10" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-11" day="7" hour="11" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-12" day="7" hour="12" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-13" day="7" hour="13" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-14" day="7" hour="14" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-15" day="7" hour="15" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-16" day="7" hour="16" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-17" day="7" hour="17" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-18" day="7" hour="18" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-19" day="7" hour="19" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-20" day="7" hour="20" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-21" day="7" hour="21" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-22" day="7" hour="22" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-                   <box class="week-view-hour-box-class week-view-hour-box-class-last-day" id="week-tree-day-6-item-23" day="7" hour="23" onclick="weekViewHourClick( event )" ondblclick="weekViewHourDoubleClick( event )" ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)" oncontextmenu="weekViewContextClick( event )"/>
-			</column>
-                <!-- / DAY 6 -->
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-0"
+                      day="7"
+                      hour="0"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-1"
+                      day="7"
+                      hour="1"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-2"
+                      day="7"
+                      hour="2"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-3"
+                      day="7"
+                      hour="3"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-4"
+                      day="7"
+                      hour="4"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-5"
+                      day="7"
+                      hour="5"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-6"
+                      day="7"
+                      hour="6"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-7"
+                      day="7"
+                      hour="7"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-8"
+                      day="7"
+                      hour="8"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-9"
+                      day="7"
+                      hour="9"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-10"
+                      day="7"
+                      hour="10"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-11"
+                      day="7"
+                      hour="11"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-12"
+                      day="7"
+                      hour="12"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-13"
+                      day="7"
+                      hour="13"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-14"
+                      day="7"
+                      hour="14"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-15"
+                      day="7"
+                      hour="15"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-16"
+                      day="7"
+                      hour="16"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-17"
+                      day="7"
+                      hour="17"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-18"
+                      day="7"
+                      hour="18"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-19"
+                      day="7"
+                      hour="19"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-20"
+                      day="7"
+                      hour="20"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-21"
+                      day="7"
+                      hour="21"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-22"
+                      day="7"
+                      hour="22"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+                 <box class="week-view-hour-box-class week-view-hour-box-class-last-day"
+                      id="week-tree-day-6-item-23"
+                      day="7"
+                      hour="23"
+                      onclick="weekViewHourClick( event )"
+                      ondblclick="weekViewHourDoubleClick( event )"
+                      ondraggesture="nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"
+                      ondragover="nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"
+                      ondragdrop="nsDragAndDrop.drop(event,calendarViewDNDObserver)"
+                      oncontextmenu="weekViewContextClick( event )"/>
+              </column>
+              <!-- / DAY 6 -->
                 
-		     </columns>
-		  </grid>
-            </stack>       
+              </columns>
+           </grid>
+        </stack>       
    </vbox>
    
  </vbox>
diff --git a/calendar/resources/content/wizard.xul b/calendar/resources/content/wizard.xul
index 8dfcdae81ea6..e03177e0c81c 100644
--- a/calendar/resources/content/wizard.xul
+++ b/calendar/resources/content/wizard.xul
@@ -70,16 +70,27 @@
 
    <wizardpage pageid="initialPage" description="Choose An Action" onpagehide="checkInitialPage()" next="import">
       <radiogroup id="initial-radiogroup">
-         <radio value="import"    label="&calendar.wizard.import.label;" selected="true"/>
-         <radio value="export"    label="&calendar.wizard.export.label;"/>
-         <radio value="subscribe" label="&calendar.wizard.subscribe.label;"/>
-         <radio value="publish"   label="&calendar.wizard.publish.label;"/>
+         <radio value="import"
+                label="&calendar.wizard.import.label;"
+                selected="true"/>
+         <radio value="export"
+                label="&calendar.wizard.export.label;"/>
+         <radio value="subscribe"
+                label="&calendar.wizard.subscribe.label;"/>
+         <radio value="publish"
+                label="&calendar.wizard.publish.label;"/>
       </radiogroup>
    </wizardpage>
    
-   <wizardpage pageid="import" label="Import Events" description="Choose the events you want to import." onpagehide="" onpageshow="onPageShow( 'import' );" next="import-2">
+   <wizardpage pageid="import"
+               label="Import Events"
+               description="Choose the events you want to import."
+               onpagehide=""
+               onpageshow="onPageShow( 'import' );"
+               next="import-2">
       <textbox id="import-path-textbox"/> 
-      <button oncommand="launchFilePicker( 'open', 'import-path-textbox' )" label="Find a File"/>
+      <button oncommand="launchFilePicker( 'open', 'import-path-textbox' )"
+              label="Find a File"/>
       <description>
          To import events, find the file you are looking to import, then click next.
          The calendar currently only imports .ics files, which are standard calendar data files.
@@ -87,68 +98,114 @@
          
    </wizardpage>
    
-   <wizardpage pageid="import-2" label="Select Calendar" description="Choose the file to import into." onpagehide="" onpageshow="onPageShow( 'import-2' );" next="import-3">
-      <radiogroup id="import-calendar-radiogroup" datasources="rdf:null" ref="urn:calendarcontainer">
+   <wizardpage pageid="import-2"
+               label="Select Calendar"
+               description="Choose the file to import into."
+               onpagehide=""
+               onpageshow="onPageShow( 'import-2' );"
+               next="import-3">
+      <radiogroup id="import-calendar-radiogroup"
+                  datasources="rdf:null"
+                  ref="urn:calendarcontainer">
          <template>
             <rule>
-               <radio oncommand="document.getElementById( 'calendar-wizard' ).canAdvance = true;" uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#name" value="rdf:http://home.netscape.com/NC-rdf#path"/>
+               <radio oncommand="document.getElementById( 'calendar-wizard' ).canAdvance = true;"
+                      uri="rdf:*"
+                      label="rdf:http://home.netscape.com/NC-rdf#name"
+                      value="rdf:http://home.netscape.com/NC-rdf#path"/>
             </rule>
          </template>
       </radiogroup>
    </wizardpage>
    
-   <wizardpage pageid="import-3" onpagehide="" onpageshow="" next="import-4">
+   <wizardpage pageid="import-3"
+               onpagehide=""
+               onpageshow=""
+               next="import-4">
       <description>Should I open each event before importing it?</description>
       <radiogroup id="import-2-radiogroup">
-         <radio id="import-2-no"  value="silent"  label="No, just import the events." selected="true"/>
-         <radio id="import-2-yes" value="promtp"  label="Yes, open each event."/>
+         <radio id="import-2-no"
+                value="silent"
+                label="No, just import the events."
+                selected="true"/>
+         <radio id="import-2-yes"
+                value="promtp"
+                label="Yes, open each event."/>
       </radiogroup>   
    </wizardpage>
    
-   <wizardpage pageid="import-4" onpagehide="" onpageshow="setTimeout( 'doWizardImport()', 1000 );">
+   <wizardpage pageid="import-4"
+               onpagehide=""
+               onpageshow="setTimeout( 'doWizardImport()', 1000 );">
       <box id="importing-box">
          <description>Importing...</description>
-         <progressmeter id="import-progress-meter" mode="determined" flex="1"/>
+         <progressmeter id="import-progress-meter"
+                        mode="determined"
+                        flex="1"/>
       </box>
-      <box id="done-importing-box" collapsed="true">
+      <box id="done-importing-box"
+           collapsed="true">
          <description>All your events have been imported. Click finish to close the wizard.</description>
       </box>
    </wizardpage>
    
-   <wizardpage pageid="export" label="Export Events" onpagehide="" onpageshow="buildCalendarsListbox( 'export-calendars-listbox' )" next="export-2">
-      <radiogroup id="export-calendar-radiogroup" datasources="rdf:null" ref="urn:calendarcontainer">
+   <wizardpage pageid="export"
+               label="Export Events"
+               onpagehide=""
+               onpageshow="buildCalendarsListbox( 'export-calendars-listbox' )"
+               next="export-2">
+      <radiogroup id="export-calendar-radiogroup"
+                  datasources="rdf:null"
+                  ref="urn:calendarcontainer">
          <template>
             <rule>
-               <radio oncommand="document.getElementById( 'calendar-wizard' ).canAdvance = true;" uri="rdf:*" label="rdf:http://home.netscape.com/NC-rdf#name" value="rdf:http://home.netscape.com/NC-rdf#path"/>
+               <radio oncommand="document.getElementById( 'calendar-wizard' ).canAdvance = true;"
+                      uri="rdf:*"
+                      label="rdf:http://home.netscape.com/NC-rdf#name"
+                      value="rdf:http://home.netscape.com/NC-rdf#path"/>
             </rule>
          </template>
       </radiogroup>
    </wizardpage>
    
-   <wizardpage pageid="export-2" onpagehide="" onpageshow="">
+   <wizardpage pageid="export-2"
+               onpagehide=""
+               onpageshow="">
       <description>Choose the file location to save the events to.</description>
       <textbox id="export-path-textbox"/> 
-      <button oncommand="launchFilePicker( 'save', 'export-path-textbox' )" label="Find a File"/>
+      <button oncommand="launchFilePicker( 'save', 'export-path-textbox' )"
+              label="Find a File"/>
    </wizardpage>
    
-   <wizardpage pageid="subscribe" onpagehide="" onpageshow="">
-         <!-- Name -->    
-            <description>&calendar.server.dialog.name.label;</description>
-            <textbox id="server-name-textbox"/>
+   <wizardpage pageid="subscribe"
+               onpagehide=""
+               onpageshow="">
+      <!-- Name -->    
+      <description>&calendar.server.dialog.name.label;</description>
+      <textbox id="server-name-textbox"/>
             
-            <description>&calendar.server.dialog.location.label;</description>
-            <textbox id="server-path-textbox"/> 
+      <description>&calendar.server.dialog.location.label;</description>
+      <textbox id="server-path-textbox"/> 
       <description>
          You can subscribe to remote calendars by entering in their URL here.
       </description>
    </wizardpage>
    
-   <wizardpage pageid="publish" next="publish-2" onpagehide="" onpageshow="buildCalendarsListbox( 'publish-calendars-listbox' )">
+   <wizardpage pageid="publish"
+               next="publish-2"
+               onpagehide=""
+               onpageshow="buildCalendarsListbox( 'publish-calendars-listbox' )">
       <radiogroup>
-         <radio id="publish-calendars"   label="Publish Entire Calendar" selected="true"/>
+         <radio id="publish-calendars"
+                label="Publish Entire Calendar"
+                selected="true"/>
          <!-- show a list of calendars here -->
-         <listbox id="publish-calendars-listbox" class="unifinder-tree-class" flex="1" 
-            contextmenu="calendarlist-context-menu" datasources="rdf:null" ref="urn:calendarcontainer">
+         <listbox id="publish-calendars-listbox"
+                  class="unifinder-tree-class"
+                  flex="1"
+                  contextmenu="calendarlist-context-menu"
+                  datasources="rdf:null"
+                  ref="urn:calendarcontainer">
             <listhead>
                <listheader flex="1" crop="end" label="&calendar.calendarlistbox.label;"/>
                <listheader/>
@@ -162,28 +219,32 @@
                   <listitem uri="rdf:*" 
                      calendarPath="rdf:http://home.netscape.com/NC-rdf#path">
                      <listcell id="calendar-list-item-^rdf://http://home.netscape.com/NC-rdf#serverNumber"
-                        class="calendar-list-item-class"
-                        label="rdf:http://home.netscape.com/NC-rdf#name"
-                        flex="1"
-                        type="checkbox"
-                        checked="rdf:http://home.netscape.com/NC-rdf#active"
+                               class="calendar-list-item-class"
+                               label="rdf:http://home.netscape.com/NC-rdf#name"
+                               flex="1"
+                               type="checkbox"
+                               checked="rdf:http://home.netscape.com/NC-rdf#active"
                         />
                      <listcell>
                         <image id="calendar-list-image-^rdf://http://home.netscape.com/NC-rdf#serverNumber"
-                           class="calendar-list-item-class"/>
+                               class="calendar-list-item-class"/>
                      </listcell>
                   </listitem>
                </rule>
             </template>
          </listbox>
          
-         <radio id="publish-events"      label="Publish Selected Events" disabled="true"/>
+         <radio id="publish-events"
+                label="Publish Selected Events"
+                disabled="true"/>
          <!-- TODO: show a list of events here -->
          
       </radiogroup>
    </wizardpage>
    
-   <wizardpage pageid="publish-2" onpagehide="" onpageshow="">
+   <wizardpage pageid="publish-2"
+               onpagehide=""
+               onpageshow="">
       <grid>
          <columns>
            <column />
diff --git a/calendar/resources/locale/en-US/calendar.dtd b/calendar/resources/locale/en-US/calendar.dtd
index 505a9626e271..aa56dbf60e30 100644
--- a/calendar/resources/locale/en-US/calendar.dtd
+++ b/calendar/resources/locale/en-US/calendar.dtd
@@ -61,10 +61,14 @@
 <!ENTITY repeat.units.months.singular   "Month" >
 <!ENTITY repeat.units.years.singular    "Year" >
 
-<!ENTITY priority.level.none     "None" >
-<!ENTITY priority.level.low      "Low" >
-<!ENTITY priority.level.medium   "Medium" >
-<!ENTITY priority.level.high     "High" >
+<!ENTITY priority.level.none              "none">
+<!ENTITY priority.level.none.accesskey    "n">
+<!ENTITY priority.level.low              "low">
+<!ENTITY priority.level.low.accesskey     "l">
+<!ENTITY priority.level.medium            "medium">
+<!ENTITY priority.level.medium.accesskey  "m">
+<!ENTITY priority.level.high              "high">
+<!ENTITY priority.level.high.accesskey    "h">
 
 <!ENTITY newevent.title.label        "Title" >
 <!ENTITY newevent.location.label     "Location" >
@@ -82,7 +86,7 @@
 <!ENTITY newevent.alarm.label        "Alarm" >
 <!ENTITY newevent.server.label       "Calendar File" >
 <!ENTITY newevent.invite.label       "Invite" >
-<!ENTITY newevent.email.label        "Email Alarm To" >
+<!ENTITY newevent.email.label        "Email Alarm To..." >
 <!ENTITY newevent.beforealarm.label  "before the event starts" >
 <!ENTITY newevent.beforealarmends.label  "before the event ends" >
 <!ENTITY newevent.repeat.label       "Repeat every" >
@@ -173,14 +177,14 @@
 
 
 <!ENTITY calendar.flat.topbar.new              "New Event" >
-<!ENTITY calendar.flat.topbar.gototoday        "Go To Today" >
-<!ENTITY calendar.flat.topbar.choosedate       "Go To Date" >
+<!ENTITY calendar.flat.topbar.gototoday        "Go to Today" >
+<!ENTITY calendar.flat.topbar.choosedate       "Go to Date" >
 <!ENTITY calendar.flat.topbar.dayview          "Day View" >
-<!ENTITY calendar.dayview.accesskey            "d" >
+<!ENTITY calendar.dayview.accesskey            "D" >
 <!ENTITY calendar.flat.topbar.weekview         "Week View" >
-<!ENTITY calendar.weekview.accesskey           "w" >
+<!ENTITY calendar.weekview.accesskey           "W" >
 <!ENTITY calendar.flat.topbar.monthview        "Month View" >
-<!ENTITY calendar.monthview.accesskey          "m" >
+<!ENTITY calendar.monthview.accesskey          "M" >
 <!ENTITY calendar.flat.topbar.multiweekview   "Multiweek" >
 <!ENTITY calendar.multiweekview.accesskey     "u" >
 
@@ -199,7 +203,7 @@
 
 <!ENTITY calendar.calendartab.label "Calendar">
 <!ENTITY calendar.listofcalendarstab.label "Calendars">
-<!ENTITY calendar.gototoday.button.label        "Go To Today" >
+<!ENTITY calendar.gototoday.button.label        "Go to Today" >
 
 <!ENTITY calendar.calendarlistbox.label "Calendars">
 
@@ -252,11 +256,14 @@
 <!ENTITY calendar.monthview.button.label        "Month View" >
 <!ENTITY calendar.multiweekview.button.label        "Multiweek" >
 <!ENTITY calendar.onlyworkday.checkbox.label    "Monday-Friday Only" >
+<!ENTITY calendar.onlyworkday.checkbox.accesskey  "F" >
 <!ENTITY calendar.displaytodos.checkbox.label   "Tasks in View" >
+<!ENTITY calendar.displaytodos.checkbox.accesskey "V" >
 
-<!ENTITY calendar.menu.options.modify       "Edit" >
-<!ENTITY calendar.menu.options.remove       "Delete" >
-<!ENTITY calendar.menu.options.close        "Close Window" >
+<!ENTITY calendar.menu.options.modify           "Edit" >
+<!ENTITY calendar.menu.options.remove           "Delete" >
+<!ENTITY calendar.menu.options.close            "Close Window" >
+<!ENTITY calendar.menu.options.close.accesskey  "C" >
 
 <!ENTITY calendar.main.tab.label        "Events" >
 <!ENTITY calendar.search.tab.label			        "Search">
@@ -289,13 +296,13 @@
 
 <!-- Context Menu -->
 <!ENTITY calendar.context.newevent.label              "New Event">
-<!ENTITY calendar.context.newevent.accesskey          "n">
+<!ENTITY calendar.context.newevent.accesskey          "N">
 <!ENTITY calendar.context.newtodo.label               "New Task">
 <!ENTITY calendar.context.newtodo.accesskey           "k">
 <!ENTITY calendar.context.modifyevent.label           "Edit Selected Event">
-<!ENTITY calendar.context.modifyevent.accesskey       "e">
+<!ENTITY calendar.context.modifyevent.accesskey       "E">
 <!ENTITY calendar.context.modifytask.label            "Edit Task">
-<!ENTITY calendar.context.modifytask.accesskey        "e">
+<!ENTITY calendar.context.modifytask.accesskey        "E">
 <!ENTITY calendar.context.deleteevent.label           "Delete Selected Event">
 <!ENTITY calendar.context.deletetask.accesskey        "l">
 <!ENTITY calendar.context.deletetask.label            "Delete Task">
@@ -303,23 +310,23 @@
 <!ENTITY calendar.context.cutevent.label              "Cut">
 <!ENTITY calendar.context.cutevent.accesskey          "t">
 <!ENTITY calendar.context.copyevent.label             "Copy">
-<!ENTITY calendar.context.copyevent.accesskey         "c">
+<!ENTITY calendar.context.copyevent.accesskey         "C">
 <!ENTITY calendar.context.pasteevent.label            "Paste">
-<!ENTITY calendar.context.pasteevent.accesskey        "p">
+<!ENTITY calendar.context.pasteevent.accesskey        "P">
 <!ENTITY calendar.context.selectall.label             "Select All">
-<!ENTITY calendar.context.selectall.accesskey         "a">
-<!ENTITY calendar.context.gototoday.label             "Go To Today">
-<!ENTITY calendar.context.gototoday.accesskey         "g">
-<!ENTITY calendar.context.dayview.label               "Switch To Day View">
-<!ENTITY calendar.context.dayview.accesskey           "d">
-<!ENTITY calendar.context.weekview.label              "Switch To Week View">
-<!ENTITY calendar.context.weekview.accesskey          "w">
-<!ENTITY calendar.context.monthview.label             "Switch To Month View">
-<!ENTITY calendar.context.monthview.accesskey         "m">
-<!ENTITY calendar.context.multiweekview.label        "Switch To Multiweek View">
+<!ENTITY calendar.context.selectall.accesskey         "A">
+<!ENTITY calendar.context.gototoday.label             "Go to Today">
+<!ENTITY calendar.context.gototoday.accesskey         "T">
+<!ENTITY calendar.context.dayview.label               "Switch to Day View">
+<!ENTITY calendar.context.dayview.accesskey           "D">
+<!ENTITY calendar.context.weekview.label              "Switch to Week View">
+<!ENTITY calendar.context.weekview.accesskey          "W">
+<!ENTITY calendar.context.monthview.label             "Switch to Month View">
+<!ENTITY calendar.context.monthview.accesskey         "M">
+<!ENTITY calendar.context.multiweekview.label        "Switch to Multiweek View">
 <!ENTITY calendar.context.multiweekview.accesskey    "u">
 <!ENTITY calendar.context.reload.label                "Reload">
-<!ENTITY calendar.context.reload.accesskey            "r">
+<!ENTITY calendar.context.reload.accesskey            "R">
 <!ENTITY calendar.context.emailevent.label            "Email Selected Event(s)">
 <!ENTITY calendar.context.emailevent.accesskey        "i">
 <!ENTITY calendar.context.emailtask.label             "Email Task">
@@ -327,17 +334,34 @@
 
 <!-- Task Context Menu -->
 <!ENTITY calendar.context.progress.label              "Progress">
-<!ENTITY calendar.context.progress.accesskey          "p">
+<!ENTITY calendar.context.progress.accesskey          "P">
 <!ENTITY calendar.context.priority.label              "Priority">
 <!ENTITY calendar.context.priority.accesskey          "r">
 
+<!ENTITY percnt "&#38;#37;" ><!--=percent sign-->
+
+<!ENTITY progress.level.0             "0&percnt;">
+<!ENTITY progress.level.0.accesskey   "0">
+<!ENTITY progress.level.25            "25&percnt;">
+<!ENTITY progress.level.25.accesskey  "2">
+<!ENTITY progress.level.50            "50&percnt;">
+<!ENTITY progress.level.50.accesskey  "5">
+<!ENTITY progress.level.75            "75&percnt;">
+<!ENTITY progress.level.75.accesskey  "7">
+<!ENTITY progress.level.100            "100&percnt;">
+<!ENTITY progress.level.100.accesskey  "1">
                                                                  
 <!-- Server Context Menu -->
 <!ENTITY calendar.context.newserver.label              "New Calendar">
+<!ENTITY calendar.context.newserver.accesskey          "N">
 <!ENTITY calendar.context.editserver.label             "Edit Calendar">
+<!ENTITY calendar.context.editserver.accesskey         "E">
 <!ENTITY calendar.context.deleteserver.label           "Delete Calendar">
+<!ENTITY calendar.context.deleteserver.accesskey       "D">
 <!ENTITY calendar.context.refreshserver.label          "Refresh Remote Calendars">
+<!ENTITY calendar.context.refreshserver.accesskey      "R">
 <!ENTITY calendar.context.publish.label                "Publish Entire Calendar">
+<!ENTITY calendar.context.publish.accesskey            "P">
 
 <!-- About Dialog -->
 <!ENTITY calendar.about.title "About Mozilla Calendar">
diff --git a/calendar/resources/locale/en-US/menuOverlay.dtd b/calendar/resources/locale/en-US/menuOverlay.dtd
index 2dad42ce6ed9..d6b973145cb5 100644
--- a/calendar/resources/locale/en-US/menuOverlay.dtd
+++ b/calendar/resources/locale/en-US/menuOverlay.dtd
@@ -41,25 +41,28 @@
 <!ENTITY eventMenuCmd.accesskey     "v">
 
 <!ENTITY event.new.event		"New Event">
-<!ENTITY event.new.event.accesskey "n">
+<!ENTITY event.new.event.accesskey "N">
 
 <!ENTITY event.new.todo		"New Task">
-<!ENTITY event.new.todo.accesskey "t">
+<!ENTITY event.new.todo.accesskey "T">
+
+<!ENTITY calendar.new.server.label "New Calendar">
+<!ENTITY calendar.new.server.accesskey "l">
 
 <!ENTITY event.edit.event	"Edit">
-<!ENTITY event.edit.event.accesskey	"e">
+<!ENTITY event.edit.event.accesskey	"E">
 
 <!ENTITY event.delete.event	"Delete Selected Event(s)">
-<!ENTITY event.delete.event.accesskey	"d">
+<!ENTITY event.delete.event.accesskey	"D">
 
 <!ENTITY event.delete.tasks	"Delete Selected Task(s)">
-<!ENTITY event.delete.tasks.accesskey	"t">
+<!ENTITY event.delete.tasks.accesskey	"T">
 
 <!ENTITY event.mail.event	"Mail Selected Event(s)">
-<!ENTITY event.mail.event.accesskey	"m">
+<!ENTITY event.mail.event.accesskey	"M">
 
 <!ENTITY calendar.print.label	"Print Active Calendars...">
-<!ENTITY calendar.print.accesskey	"r">
+<!ENTITY calendar.print.accesskey	"P">
 
 <!ENTITY calendar.printpreview.label	"Print Preview">
 <!ENTITY calendar.printpreview.accesskey	"v">
@@ -68,46 +71,46 @@
 <!ENTITY calendar.pagesetup.accesskey	"u">
 
 <!ENTITY calendar.import.label	"Import From File...">
-<!ENTITY calendar.import.accesskey	"i">
+<!ENTITY calendar.import.accesskey	"I">
 
 <!ENTITY calendar.wizard.label	"Launch Wizard">
-<!ENTITY calendar.wizard.accesskey	"w">
+<!ENTITY calendar.wizard.accesskey	"W">
 
 <!ENTITY calendar.export.label	"Export Selected Events...">
-<!ENTITY calendar.export.accesskey	"e">
+<!ENTITY calendar.export.accesskey	"E">
 
-<!ENTITY calendar.subscribe.label "Subscribe To Remote Calendar...">
-<!ENTITY calendar.subscribe.accesskey "s">
+<!ENTITY calendar.subscribe.label "Subscribe to Remote Calendar...">
+<!ENTITY calendar.subscribe.accesskey "R">
 
 <!ENTITY calendar.publish.label "Publish Selected Events...">
-<!ENTITY calendar.publish.accesskey "p">
+<!ENTITY calendar.publish.accesskey "S">
 
 <!ENTITY calendar.about.label	"About Calendar">
-<!ENTITY calendar.about.accesskey	"a">
+<!ENTITY calendar.about.accesskey	"C">
 
 <!ENTITY calendar.cut.label	"Cut">
 <!ENTITY calendar.cut.accesskey	"t">
 
 <!ENTITY calendar.copy.label	"Copy">
-<!ENTITY calendar.copy.accesskey	"c">
+<!ENTITY calendar.copy.accesskey	"C">
 
 <!ENTITY calendar.paste.label	"Paste">
-<!ENTITY calendar.paste.accesskey	"p">
+<!ENTITY calendar.paste.accesskey	"P">
 
 <!ENTITY calendar.selectall.label	"Select All">
-<!ENTITY calendar.selectall.accesskey	"a">
+<!ENTITY calendar.selectall.accesskey	"A">
 
 <!ENTITY calendar.preferences.label	"Preferences...">
-<!ENTITY calendar.preferences.accesskey	"p">
+<!ENTITY calendar.preferences.accesskey	"e">
 
 <!ENTITY goMenu.label                   "Go">
-<!ENTITY goMenu.accesskey               "g">
+<!ENTITY goMenu.accesskey               "G">
 
-<!ENTITY goTodayCmd.label               "Go To Today">
-<!ENTITY goTodayCmd.accesskey           "t">
+<!ENTITY goTodayCmd.label               "Go to Today">
+<!ENTITY goTodayCmd.accesskey           "T">
 
 <!ENTITY goPreviousCmd.label            "Previous">
-<!ENTITY goPreviousCmd.accesskey        "p">
+<!ENTITY goPreviousCmd.accesskey        "P">
 
 <!ENTITY goNextCmd.label                "Next">
-<!ENTITY goNextCmd.accesskey            "n">
+<!ENTITY goNextCmd.accesskey            "N">
diff --git a/calendar/resources/locale/en-US/prefs.dtd b/calendar/resources/locale/en-US/prefs.dtd
index d0d5708b0316..dfd0e557e419 100644
--- a/calendar/resources/locale/en-US/prefs.dtd
+++ b/calendar/resources/locale/en-US/prefs.dtd
@@ -38,7 +38,7 @@
 
 <!ENTITY calendar.label             "Calendar" >
 <!ENTITY calendarPanel.label        "Calendar" >
-<!ENTITY calendar.accesskey         "c" >
+<!ENTITY calendar.accesskey         "C" >
 <!ENTITY calendar.publish.label     "Publishing">
 <!ENTITY calendar.alarms.label      "Alarms">
 <!ENTITY calendar.views.label       "Views">