No bug - Fix some dodgy white-space in calendar XUL files; rs=white-space-only
authorGeoff Lankow <geoff@darktrojan.net>
Sat, 08 Dec 2018 14:40:59 +1300
changeset 33862 39222abf711e71a31052733e66bedc3a96ffbb8f
parent 33861 e993eb9d7c1b74cf3506fe74be8b44fa5dfac86e
child 33863 e0c27feaf097359da1f9e8796800c2ca7da2d637
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewerswhite-space-only
No bug - Fix some dodgy white-space in calendar XUL files; rs=white-space-only
calendar/base/content/calendar-views.xul
calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
calendar/base/content/dialogs/calendar-summary-dialog.xul
calendar/base/content/today-pane.xul
calendar/lightning/content/lightning-item-iframe.xul
calendar/lightning/content/messenger-overlay-sidebar.xul
calendar/providers/gdata/content/gdata-calendar-creation.xul
calendar/timezones/install.rdf
--- a/calendar/base/content/calendar-views.xul
+++ b/calendar/base/content/calendar-views.xul
@@ -3,115 +3,112 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar-common/skin/calendar-alarms.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar-common/skin/widgets/minimonth.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
 
-<!DOCTYPE overlay
-[
-    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
-    <!ENTITY % dtd2 SYSTEM "chrome://global/locale/global.dtd" > %dtd2;
+<!DOCTYPE overlay [
+  <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
+  <!ENTITY % dtd2 SYSTEM "chrome://global/locale/global.dtd" > %dtd2;
 ]>
 
-
 <overlay id="calendar-views-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-    <vbox id="calendar-view-box" context="calendar-view-context-menu">
-        <hbox id="calendar-nav-control">
-            <vbox flex="1">
-               <hbox flex="1" class="navigation-inner-box" align="center">
-                  <!-- If you are extending a view, add attributes to these
-                       nodes for your view. i.e if your view has the id
-                       "foobar-view", then you need to add the attribute
-                       tooltiptext-foobar="..." -->
-                  <hbox pack="center">
-                     <toolbarbutton id="previous-view-button"
-                                    class="view-navigation-button"
-                                    type="prev"
-                                    tooltiptext-day="&calendar.navigation.prevday.tooltip;"
-                                    tooltiptext-week="&calendar.navigation.prevweek.tooltip;"
-                                    tooltiptext-multiweek="&calendar.navigation.prevweek.tooltip;"
-                                    tooltiptext-month="&calendar.navigation.prevmonth.tooltip;"
-                                    command="calendar_view_prev_command"/>
-                     <toolbarbutton id="today-view-button"
-                                    class="today-navigation-button"
-                                    label="&calendar.today.button.label;"
-                                    tooltiptext-all="&calendar.today.button.tooltip;"
-                                    command="calendar_view_today_command"/>
-                     <toolbarbutton id="next-view-button"
-                                    class="view-navigation-button"
-                                    type="next"
-                                    tooltiptext-day="&calendar.navigation.nextday.tooltip;"
-                                    tooltiptext-week="&calendar.navigation.nextweek.tooltip;"
-                                    tooltiptext-multiweek="&calendar.navigation.nextweek.tooltip;"
-                                    tooltiptext-month="&calendar.navigation.nextmonth.tooltip;"
-                                    command="calendar_view_next_command"/>
-                  </hbox>
-                  <label id="intervalDescription"
-                                 class="view-header"
-                                 crop="end"
-                                 flex="1"
-                                 pack="start"/>
-                  <spacer flex="1"/>
-                  <label id="calendarWeek"
-                         class="view-header"
-                         type="end"
-                         crop="start"/>
-               </hbox>
-            <hbox flex="1" class="navigation-bottombox"/>
-         </vbox>
-         <vbox id="view-tabbox" pack="end">
-            <radiogroup id="view-tabs"
-                        class="calview-tabs"
-                        orient="horizontal">
-               <radio id="calendar-day-view-button"
-                      label="&calendar.day.button.label;"
-                      tooltiptext="&calendar.day.button.tooltip;"
-                      calview="day"
-                      observes="calendar_day-view_command"/>
-               <radio id="calendar-week-view-button"
-                      label="&calendar.week.button.label;"
-                      tooltiptext="&calendar.week.button.tooltip;"
-                      calview="week"
-                      observes="calendar_week-view_command"/>
-               <radio id="calendar-multiweek-view-button"
-                      label="&calendar.multiweek.button.label;"
-                      tooltiptext="&calendar.multiweek.button.tooltip;"
-                      calview="multiweek"
-                      observes="calendar_multiweek-view_command"/>
-               <radio id="calendar-month-view-button"
-                      label="&calendar.month.button.label;"
-                      tooltiptext="&calendar.month.button.tooltip;"
-                      calview="month"
-                      observes="calendar_month-view_command"/>
-            </radiogroup>
-            <box class="navigation-bottombox"/>
-         </vbox>
-         <vbox>
-           <vbox flex="1" class="navigation-spacer-box"/>
-           <hbox class="navigation-bottombox"/>
-         </vbox>
-       </hbox>
-       <deck flex="1"
-            id="view-deck"
-            persist="selectedIndex">
-        <!-- Note: the "id" attributes of the calendar panes **must** follow the
-             notation 'type + "-" + "view"', where "type" should refer to the
-             displayed time period as described in base/public/calICalendarView.idl -->
-        <calendar-day-view id="day-view" flex="1"
+  <vbox id="calendar-view-box" context="calendar-view-context-menu">
+    <hbox id="calendar-nav-control">
+      <vbox flex="1">
+        <hbox flex="1" class="navigation-inner-box" align="center">
+          <!-- If you are extending a view, add attributes to these
+               nodes for your view. i.e if your view has the id
+               "foobar-view", then you need to add the attribute
+               tooltiptext-foobar="..." -->
+          <hbox pack="center">
+            <toolbarbutton id="previous-view-button"
+                           class="view-navigation-button"
+                           type="prev"
+                           tooltiptext-day="&calendar.navigation.prevday.tooltip;"
+                           tooltiptext-week="&calendar.navigation.prevweek.tooltip;"
+                           tooltiptext-multiweek="&calendar.navigation.prevweek.tooltip;"
+                           tooltiptext-month="&calendar.navigation.prevmonth.tooltip;"
+                           command="calendar_view_prev_command"/>
+            <toolbarbutton id="today-view-button"
+                           class="today-navigation-button"
+                           label="&calendar.today.button.label;"
+                           tooltiptext-all="&calendar.today.button.tooltip;"
+                           command="calendar_view_today_command"/>
+            <toolbarbutton id="next-view-button"
+                           class="view-navigation-button"
+                           type="next"
+                           tooltiptext-day="&calendar.navigation.nextday.tooltip;"
+                           tooltiptext-week="&calendar.navigation.nextweek.tooltip;"
+                           tooltiptext-multiweek="&calendar.navigation.nextweek.tooltip;"
+                           tooltiptext-month="&calendar.navigation.nextmonth.tooltip;"
+                           command="calendar_view_next_command"/>
+          </hbox>
+          <label id="intervalDescription"
+                 class="view-header"
+                 crop="end"
+                 flex="1"
+                 pack="start"/>
+          <spacer flex="1"/>
+          <label id="calendarWeek"
+                 class="view-header"
+                 type="end"
+                 crop="start"/>
+        </hbox>
+        <hbox flex="1" class="navigation-bottombox"/>
+      </vbox>
+      <vbox id="view-tabbox" pack="end">
+        <radiogroup id="view-tabs"
+                    class="calview-tabs"
+                    orient="horizontal">
+          <radio id="calendar-day-view-button"
+                 label="&calendar.day.button.label;"
+                 tooltiptext="&calendar.day.button.tooltip;"
+                 calview="day"
+                 observes="calendar_day-view_command"/>
+          <radio id="calendar-week-view-button"
+                 label="&calendar.week.button.label;"
+                 tooltiptext="&calendar.week.button.tooltip;"
+                 calview="week"
+                 observes="calendar_week-view_command"/>
+          <radio id="calendar-multiweek-view-button"
+                 label="&calendar.multiweek.button.label;"
+                 tooltiptext="&calendar.multiweek.button.tooltip;"
+                 calview="multiweek"
+                 observes="calendar_multiweek-view_command"/>
+          <radio id="calendar-month-view-button"
+                 label="&calendar.month.button.label;"
+                 tooltiptext="&calendar.month.button.tooltip;"
+                 calview="month"
+                 observes="calendar_month-view_command"/>
+        </radiogroup>
+        <box class="navigation-bottombox"/>
+      </vbox>
+      <vbox>
+        <vbox flex="1" class="navigation-spacer-box"/>
+        <hbox class="navigation-bottombox"/>
+      </vbox>
+    </hbox>
+    <deck flex="1"
+          id="view-deck"
+          persist="selectedIndex">
+      <!-- Note: the "id" attributes of the calendar panes **must** follow the
+           notation 'type + "-" + "view"', where "type" should refer to the
+           displayed time period as described in base/public/calICalendarView.idl -->
+      <calendar-day-view id="day-view" flex="1"
+                         context="calendar-view-context-menu"
+                         item-context="calendar-item-context-menu"/>
+      <calendar-week-view id="week-view" flex="1"
+                          context="calendar-view-context-menu"
+                          item-context="calendar-item-context-menu"/>
+      <calendar-multiweek-view id="multiweek-view" flex="1"
                                context="calendar-view-context-menu"
                                item-context="calendar-item-context-menu"/>
-        <calendar-week-view id="week-view" flex="1"
-                                context="calendar-view-context-menu"
-                                item-context="calendar-item-context-menu"/>
-        <calendar-multiweek-view id="multiweek-view" flex="1"
-                                 context="calendar-view-context-menu"
-                                 item-context="calendar-item-context-menu"/>
-        <calendar-month-view id="month-view" flex="1"
-                             context="calendar-view-context-menu"
-                             item-context="calendar-item-context-menu"/>
-      </deck>
-    </vbox>
+      <calendar-month-view id="month-view" flex="1"
+                           context="calendar-view-context-menu"
+                           item-context="calendar-item-context-menu"/>
+    </deck>
+  </vbox>
 </overlay>
--- a/calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
@@ -34,12 +34,12 @@
     <datetimepicker id="timezone-time" disabled="true"/>
   </hbox>
 
   <menulist id="timezone-menulist" oncommand="updateTimezone()">
     <menupopup id="timezone-menupopup" style="height: 460px;"/>
   </menulist>
 
   <stack id="timezone-stack">
-     <image src="chrome://calendar-common/skin/timezone_map.png"/>
-     <image class="timezone-highlight" tzid="+0000" id="highlighter"/>
+    <image src="chrome://calendar-common/skin/timezone_map.png"/>
+    <image class="timezone-highlight" tzid="+0000" id="highlighter"/>
   </stack>
 </dialog>
--- a/calendar/base/content/dialogs/calendar-summary-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-summary-dialog.xul
@@ -194,117 +194,117 @@
             <label value="&newevent.todoStatus.cancelled.label;" hidden="true" status="CANCELLED"/>
             <label value="&newevent.status.needsaction.label;" hidden="true" status="NEEDS-ACTION"/>
             <label value="&newevent.status.inprogress.label;" hidden="true" status="IN-PROCESS"/>
             <label value="&newevent.status.completed.label;" hidden="true" status="COMPLETED"/>
           </row>
           <separator id="item-main-separator" flex="1" class="groove" hidden="true"/>
           <row id="reminder-row" hidden="true" align="center">
             <label value="&read.only.reminder.label;" control="item-alarm"/>
-              <hbox id="event-grid-alarm-picker-box"
-                    align="center">
-                <menulist id="item-alarm"
-                          disable-on-readonly="true"
-                          oncommand="updateReminder()">
-                  <menupopup id="item-alarm-menupopup">
-                    <menuitem id="reminder-none-menuitem"
-                              label="&event.reminder.none.label;"
-                              selected="true"
-                              value="none"/>
-                    <menuseparator id="reminder-none-separator"/>
-                    <menuitem id="reminder-0minutes-menuitem"
-                              label="&event.reminder.0minutes.before.label;"
-                              length="0"
-                              origin="before"
-                              relation="START"
-                              unit="minutes"/>
-                    <menuitem id="reminder-5minutes-menuitem"
-                              label="&event.reminder.5minutes.before.label;"
-                              length="5"
-                              origin="before"
-                              relation="START"
-                              unit="minutes"/>
-                    <menuitem id="reminder-15minutes-menuitem"
-                              label="&event.reminder.15minutes.before.label;"
-                              length="15"
-                              origin="before"
-                              relation="START"
-                              unit="minutes"/>
-                    <menuitem id="reminder-30minutes-menuitem"
-                              label="&event.reminder.30minutes.before.label;"
-                              length="30"
-                              origin="before"
-                              relation="START"
-                              unit="minutes"/>
-                    <menuseparator id="reminder-minutes-separator"/>
-                    <menuitem id="reminder-1hour-menuitem"
-                              label="&event.reminder.1hour.before.label;"
-                              length="1"
-                              origin="before"
-                              relation="START"
-                              unit="hours"/>
-                    <menuitem id="reminder-2hours-menuitem"
-                              label="&event.reminder.2hours.before.label;"
-                              length="2"
-                              origin="before"
-                              relation="START"
-                              unit="hours"/>
-                    <menuitem id="reminder-12hours-menuitem"
-                              label="&event.reminder.12hours.before.label;"
-                              length="12"
-                              origin="before"
-                              relation="START"
-                              unit="hours"/>
-                    <menuseparator id="reminder-hours-separator"/>
-                    <menuitem id="reminder-1day-menuitem"
-                              label="&event.reminder.1day.before.label;"
-                              length="1"
-                              origin="before"
-                              relation="START"
-                              unit="days"/>
-                    <menuitem id="reminder-2days-menuitem"
-                              label="&event.reminder.2days.before.label;"
-                              length="2"
-                              origin="before"
-                              relation="START"
-                              unit="days"/>
-                    <menuitem id="reminder-1week-menuitem"
-                              label="&event.reminder.1week.before.label;"
-                              length="7"
-                              origin="before"
-                              relation="START"
-                              unit="days"/>
-                    <menuseparator id="reminder-custom-separator"/>
-                    <menuitem id="reminder-custom-menuitem"
-                              label="&event.reminder.custom.label;"
-                              value="custom"/>
-                  </menupopup>
-                </menulist>
-                <hbox id="reminder-details">
-                  <hbox id="reminder-icon-box"
-                        class="alarm-icons-box"
-                        align="center"/>
-                  <!-- TODO oncommand? onkeypress? -->
-                  <label id="reminder-multiple-alarms-label"
-                         hidden="true"
-                         value="&event.reminder.multiple.label;"
-                         class="text-link"
-                         disable-on-readonly="true"
-                         flex="1"
-                         hyperlink="true"
-                         onclick="updateReminder()"/>
-                  <label id="reminder-single-alarms-label"
-                         hidden="true"
-                         class="text-link"
-                         disable-on-readonly="true"
-                         flex="1"
-                         hyperlink="true"
-                         onclick="updateReminder()"/>
-                </hbox>
-             </hbox>
+            <hbox id="event-grid-alarm-picker-box"
+                  align="center">
+              <menulist id="item-alarm"
+                        disable-on-readonly="true"
+                        oncommand="updateReminder()">
+                <menupopup id="item-alarm-menupopup">
+                  <menuitem id="reminder-none-menuitem"
+                            label="&event.reminder.none.label;"
+                            selected="true"
+                            value="none"/>
+                  <menuseparator id="reminder-none-separator"/>
+                  <menuitem id="reminder-0minutes-menuitem"
+                            label="&event.reminder.0minutes.before.label;"
+                            length="0"
+                            origin="before"
+                            relation="START"
+                            unit="minutes"/>
+                  <menuitem id="reminder-5minutes-menuitem"
+                            label="&event.reminder.5minutes.before.label;"
+                            length="5"
+                            origin="before"
+                            relation="START"
+                            unit="minutes"/>
+                  <menuitem id="reminder-15minutes-menuitem"
+                            label="&event.reminder.15minutes.before.label;"
+                            length="15"
+                            origin="before"
+                            relation="START"
+                            unit="minutes"/>
+                  <menuitem id="reminder-30minutes-menuitem"
+                            label="&event.reminder.30minutes.before.label;"
+                            length="30"
+                            origin="before"
+                            relation="START"
+                            unit="minutes"/>
+                  <menuseparator id="reminder-minutes-separator"/>
+                  <menuitem id="reminder-1hour-menuitem"
+                            label="&event.reminder.1hour.before.label;"
+                            length="1"
+                            origin="before"
+                            relation="START"
+                            unit="hours"/>
+                  <menuitem id="reminder-2hours-menuitem"
+                            label="&event.reminder.2hours.before.label;"
+                            length="2"
+                            origin="before"
+                            relation="START"
+                            unit="hours"/>
+                  <menuitem id="reminder-12hours-menuitem"
+                            label="&event.reminder.12hours.before.label;"
+                            length="12"
+                            origin="before"
+                            relation="START"
+                            unit="hours"/>
+                  <menuseparator id="reminder-hours-separator"/>
+                  <menuitem id="reminder-1day-menuitem"
+                            label="&event.reminder.1day.before.label;"
+                            length="1"
+                            origin="before"
+                            relation="START"
+                            unit="days"/>
+                  <menuitem id="reminder-2days-menuitem"
+                            label="&event.reminder.2days.before.label;"
+                            length="2"
+                            origin="before"
+                            relation="START"
+                            unit="days"/>
+                  <menuitem id="reminder-1week-menuitem"
+                            label="&event.reminder.1week.before.label;"
+                            length="7"
+                            origin="before"
+                            relation="START"
+                            unit="days"/>
+                  <menuseparator id="reminder-custom-separator"/>
+                  <menuitem id="reminder-custom-menuitem"
+                            label="&event.reminder.custom.label;"
+                            value="custom"/>
+                </menupopup>
+              </menulist>
+              <hbox id="reminder-details">
+                <hbox id="reminder-icon-box"
+                      class="alarm-icons-box"
+                      align="center"/>
+                <!-- TODO oncommand? onkeypress? -->
+                <label id="reminder-multiple-alarms-label"
+                       hidden="true"
+                       value="&event.reminder.multiple.label;"
+                       class="text-link"
+                       disable-on-readonly="true"
+                       flex="1"
+                       hyperlink="true"
+                       onclick="updateReminder()"/>
+                <label id="reminder-single-alarms-label"
+                       hidden="true"
+                       class="text-link"
+                       disable-on-readonly="true"
+                       flex="1"
+                       hyperlink="true"
+                       onclick="updateReminder()"/>
+              </hbox>
+            </hbox>
           </row>
           <row id="attachments-row"
                align="top"
                hidden="true"
                class="item-attachments-row">
             <label value="&read.only.attachments.label;"
                    control="item-attachment-cell" />
             <vbox id="item-attachment-cell">
@@ -373,10 +373,9 @@
       <separator class="groove" flex="1"/>
     </hbox>
     <label id="url-link"
            class="text-link default-indent"
            onclick="launchBrowser(this.getAttribute('href'), event)"
            oncommand="launchBrowser(this.getAttribute('href'), event)"
            crop="end"/>
   </box>
-
 </dialog>
--- a/calendar/base/content/today-pane.xul
+++ b/calendar/base/content/today-pane.xul
@@ -1,383 +1,382 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!DOCTYPE overlay
-[
-    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
-    <!ENTITY % dtd2 SYSTEM "chrome://lightning/locale/lightning.dtd" > %dtd2;
-    <!ENTITY % dtd3 SYSTEM "chrome://messenger/locale/messenger.dtd" > %dtd3;
-    <!ENTITY % dtd4 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd4;
-    <!ENTITY % dtd5 SYSTEM "chrome://global/locale/global.dtd" > %dtd5;
-    <!ENTITY % dtd6 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd6;
+<!DOCTYPE overlay [
+  <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
+  <!ENTITY % dtd2 SYSTEM "chrome://lightning/locale/lightning.dtd" > %dtd2;
+  <!ENTITY % dtd3 SYSTEM "chrome://messenger/locale/messenger.dtd" > %dtd3;
+  <!ENTITY % dtd4 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd4;
+  <!ENTITY % dtd5 SYSTEM "chrome://global/locale/global.dtd" > %dtd5;
+  <!ENTITY % dtd6 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd6;
 ]>
 
 <?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/javascript" src="chrome://calendar/content/today-pane.js"/>
-<script type="application/javascript" src="chrome://calendar/content/agenda-listbox.js"/>
-<script type="application/javascript" src="chrome://calendar/content/calendar-management.js"/>
-<script type="application/javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
-<script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/today-pane.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/agenda-listbox.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-management.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
 
-    <modevbox id="today-pane-panel"
-              mode="mail,calendar,task" modewidths="200,200,200" modesplitterstates="open,open,open"
-              refcontrol="calendar_toggle_todaypane_command"
-              broadcaster="modeBroadcaster" persist="modewidths">
-      <sidebarheader align="center">
-        <label id ="today-pane-header"/>
-        <spacer flex="1"/>
-        <modebox mode="mail,calendar" broadcaster="modeBroadcaster">
-          <toolbarbutton id="today-pane-cycler-prev"
-                         dir="prev"
-                         class="today-pane-cycler"
-                         oncommand="TodayPane.cyclePaneView(-1);"/>
-          <toolbarbutton id="today-pane-cycler-next"
-                         dir="next"
-                         class="today-pane-cycler"
-                         oncommand="TodayPane.cyclePaneView(1);"/>
-        </modebox>
-        <spacer id="buttonspacer"/>
-        <toolbarbutton id="today-closer" class="today-closebutton close-icon"
-                       oncommand="document.getElementById('today-pane-panel').setVisible(false, true, true);
-                                  TodayPane.setTodayHeader();
-                                  TodayPane.updateSplitterState();"/>
-      </sidebarheader>
-      <vbox flex="1">
-        <modevbox id="agenda-panel"
-                  flex="1"
+  <modevbox id="today-pane-panel"
+            mode="mail,calendar,task" modewidths="200,200,200" modesplitterstates="open,open,open"
+            refcontrol="calendar_toggle_todaypane_command"
+            broadcaster="modeBroadcaster" persist="modewidths">
+    <sidebarheader align="center">
+      <label id ="today-pane-header"/>
+      <spacer flex="1"/>
+      <modebox mode="mail,calendar" broadcaster="modeBroadcaster">
+        <toolbarbutton id="today-pane-cycler-prev"
+                       dir="prev"
+                       class="today-pane-cycler"
+                       oncommand="TodayPane.cyclePaneView(-1);"/>
+        <toolbarbutton id="today-pane-cycler-next"
+                       dir="next"
+                       class="today-pane-cycler"
+                       oncommand="TodayPane.cyclePaneView(1);"/>
+      </modebox>
+      <spacer id="buttonspacer"/>
+      <toolbarbutton id="today-closer" class="today-closebutton close-icon"
+                     oncommand="document.getElementById('today-pane-panel').setVisible(false, true, true);
+                                TodayPane.setTodayHeader();
+                                TodayPane.updateSplitterState();"/>
+    </sidebarheader>
+    <vbox flex="1">
+      <modevbox id="agenda-panel"
+                flex="1"
+                mode="mail,calendar,task"
+                collapsedinmodes="calendar"
+                persist="collapsed height collapsedinmodes"
+                broadcaster="modeBroadcaster">
+        <modebox id="today-none-box"
+                 mode="mail,calendar,task"
+                 collapsedinmodes="mail,calendar,task"
+                 broadcaster="modeBroadcaster"
+                 refcontrol="ltnTodayPaneDisplayNone"
+                 persist="collapsedinmodes"/>
+        <modebox id="today-minimonth-box"
+                  pack="center"
+                  class="today-subpane"
                   mode="mail,calendar,task"
-                  collapsedinmodes="calendar"
-                  persist="collapsed height collapsedinmodes"
-                  broadcaster="modeBroadcaster">
-              <modebox id="today-none-box"
-                       mode="mail,calendar,task"
-                       collapsedinmodes="mail,calendar,task"
-                       broadcaster="modeBroadcaster"
-                       refcontrol="ltnTodayPaneDisplayNone"
-                       persist="collapsedinmodes"/>
-              <modebox id="today-minimonth-box"
-                        pack="center"
-                        class="today-subpane"
-                        mode="mail,calendar,task"
-                        broadcaster="modeBroadcaster"
-                        collapsedinmodes="mail,calendar,task"
-                        refcontrol="ltnTodayPaneDisplayMinimonth"
-                        persist="collapsedinmodes">
-                <minimonth id="today-Minimonth" freebusy="true" onchange="TodayPane.setDaywithjsDate(this.value);"/>
-              </modebox>
-              <modebox id="mini-day-box"
-                       mode="mail,calendar,task"
-                       class="today-subpane"
-                       refcontrol="ltnTodayPaneDisplayMiniday"
-                       broadcaster="modeBroadcaster"
-                       collapsedinmodes=""
-                       persist="collapsedinmodes"
-                       onDOMMouseScroll="TodayPane.advance(event.detail > 0 ? 1 : -1);">
-                <stack flex="1">
-                  <image id="mini-day-image" flex="1"/>
-                  <hbox flex="1">
-                    <stack id="dateContainer">
-                      <hbox pack="center"
-                            align="center">
-                        <label id="datevalue-label" class="dateValue"
-                               ondblclick="TodayPane.onDoubleClick(event);"
-                               onmousedown="TodayPane.onMousedown(event);"/>
-                      </hbox>
-                      <hbox flex="1" pack="center" align="center" mousethrough="always">
-                        <image id="dragCenter-image" hidden="true"/>
-                      </hbox>
-                    </stack>
-                    <vbox flex="1">
-                      <hbox pack="center">
-                        <deck id="weekdayNameContainer" pack="center"
-                              ondblclick="TodayPane.onDoubleClick(event);">
-                          <label/>
-                          <label/>
-                          <label/>
-                          <label/>
-                          <label/>
-                          <label/>
-                          <label/>
-                        </deck>
-                        <spacer id="weekspacer" flex="1"/>
-                        <hbox pack="end">
-                          <toolbarbutton id="previous-day-button"
-                                         class="miniday-nav-buttons"
-                                         tooltiptext="&onedaybackward.tooltip;"
-                                         onmousedown="TodayPane.onMousedown(event, parseInt(this.getAttribute('dir')));"
-                                         dir="-1"/>
-                          <toolbarbutton id="today-button"
-                                         class="miniday-nav-buttons"
-                                         tooltiptext="&showToday.tooltip;"
-                                         oncommand="TodayPane.setDay(cal.dtz.now());"/>
-                          <toolbarbutton id="next-day-button"
-                                         class="miniday-nav-buttons"
-                                         tooltiptext="&onedayforward.tooltip;"
-                                         onmousedown="TodayPane.onMousedown(event, parseInt(this.getAttribute('dir')));"
-                                         dir="1"/>
-                        </hbox>
-                      </hbox>
-                      <hbox pack="start">
-                        <label id="monthNameContainer" class="monthlabel"
-                               ondblclick="TodayPane.onDoubleClick(event);"/>
-                        <label id="currentWeek-label" class="monthlabel"
-                               ondblclick="TodayPane.onDoubleClick(event);"/>
-                        <spacer flex="1"/>
-                      </hbox>
-                    </vbox>
-                    <toolbarbutton id="miniday-dropdown-button"
-                                   tooltiptext="&showselectedday.tooltip;"
-                                   type="menu">
-                      <panel id="miniday-month-panel" position="after_end"
-                             onpopupshown="this.firstChild.focusCalendar();">
-                        <minimonth id="todayMinimonth"
-                                   flex="1"
-                                   onchange="TodayPane.setDaywithjsDate(this.value);
-                                             document.getElementById('miniday-month-panel').hidePopup();"/>
-                      </panel>
-                   </toolbarbutton>
-                 </hbox>
-                </stack>
-              </modebox>
-            <vbox flex="1">
-              <hbox id="agenda-toolbar" iconsize="small">
-                <toolbarbutton id="todaypane-new-event-button"
-                               mode="mail"
-                               iconsize="small"
-                               orient="horizontal"
-                               label="&calendar.newevent.button.label;"
-                               tooltiptext="&calendar.newevent.button.tooltip;"
-                               oncommand="agendaListbox.createNewEvent(event)">
-                  <observes element="calendar_new_event_command" attribute="disabled"/>
-                </toolbarbutton>
-              </hbox>
-              <richlistbox id="agenda-listbox" flex="1" context="_child"
-                           onblur="agendaListbox.onBlur();"
-                           onfocus="agendaListbox.onFocus();"
-                           onkeypress="agendaListbox.onKeyPress(event);"
-                           ondblclick="agendaListbox.createNewEvent(event);"
-                           ondragstart="nsDragAndDrop.startDrag(event, calendarCalendarButtonDNDObserver);"
-                           ondragover="nsDragAndDrop.dragOver(event, calendarCalendarButtonDNDObserver);"
-                           ondrop="nsDragAndDrop.drop(event, calendarCalendarButtonDNDObserver);">
-                <menupopup id="agenda-menupopup" onpopupshowing="return agendaListbox.setupContextMenu(event.target)">
-                  <menuitem label="&calendar.context.modifyorviewitem.label;"
-                           accesskey="&calendar.context.modifyorviewitem.accesskey;"
-                           observes="agenda_edit_event_command"/>
-                  <menu id="agenda-context-menu-convert-menu"
-                       label="&calendar.context.convertmenu.label;"
-                       accesskey="&calendar.context.convertmenu.accesskey.calendar;">
-                   <menupopup id="agenda-context-menu-convert-menupopup">
-                     <menuitem id="agenda-context-menu-convert-message-menuitem"
-                               label="&calendar.context.convertmenu.message.label;"
-                               accesskey="&calendar.context.convertmenu.message.accesskey;"
-                               oncommand="calendarMailButtonDNDObserver.onDropItems(agendaListbox.getSelectedItems())"/>
-                     <menuitem id="agenda-context-menu-convert-task-menuitem"
-                               class="event-only"
-                               label="&calendar.context.convertmenu.task.label;"
-                               accesskey="&calendar.context.convertmenu.task.accesskey;"
-                               oncommand="calendarTaskButtonDNDObserver.onDropItems(agendaListbox.getSelectedItems())"/>
-                   </menupopup>
-                  </menu>
-                  <menuseparator id="calendar-today-pane-menuseparator-before-delete"/>
-                  <menuitem label="&calendar.context.deleteevent.label;"
-                           accesskey="&calendar.context.deleteevent.accesskey;"
-                           key="calendar-delete-item-key"
-                           observes="agenda_delete_event_command"/>
-                  <menu id="calendar-today-pane-menu-attendance-menu"
-                        label="&calendar.context.attendance.menu.label;"
-                        accesskey="&calendar.context.attendance.menu.accesskey;"
-                        oncommand="setContextPartstat(event.target, agendaListbox.getSelectedItems({}))"
-                        observes="calendar_attendance_command">
-                    <menupopup id="agenda-context-menu-attendance-menupopup">
-                      <label id="agenda-context-attendance-thisoccurrence-label"
-                             class="calendar-context-heading-label"
-                             scope="this-occurrence"
-                             value="&calendar.context.attendance.occurrence.label;"/>
-                      <menu id="agenda-context-menu-attendance-accepted-menu"
-                            label="&calendar.context.attendance.occ.accepted.label;"
-                            accesskey="&calendar.context.attendance.occ.accepted.accesskey;"
-                            value="ACCEPTED"
-                            name="agenda-context-attendance"
-                            scope="this-occurrence">
-                        <menupopup id="agenda-context-menu-occurrence-accepted-menupopup">
-                          <menuitem id="agenda-context-menu-attend-accept-menuitem"
-                                    scope="this-occurrence"
-                                    label="&calendar.context.attendance.send.label;"
-                                    accesskey="&calendar.context.attendance.send.accesskey;"
-                                    respvalue="ACCEPTED"
-                                    respmode="AUTO"/>
-                          <menuitem id="agenda-context-menu-attend-accept-dontsend-menuitem"
-                                    scope="this-occurrence"
-                                    label="&calendar.context.attendance.dontsend.label;"
-                                    accesskey="&calendar.context.attendance.dontsend.accesskey;"
-                                    respvalue="ACCEPTED"
-                                    respmode="NONE"/>
-                        </menupopup>
-                      </menu>
-                      <menu id="agenda-context-menu-attendance-tentative-menu"
-                            label="&calendar.context.attendance.occ.tentative.label;"
-                            accesskey="&calendar.context.attendance.occ.tentative.accesskey;"
-                            value="TENTATIVE"
-                            name="agenda-context-attendance"
-                            scope="this-occurrence">
-                        <menupopup id="agenda-context-menu-occurrence-tentative-menupopup">
-                          <menuitem id="agenda-context-menu-attend-tentative-menuitem"
-                                    scope="this-occurrence"
-                                    label="&calendar.context.attendance.send.label;"
-                                    accesskey="&calendar.context.attendance.send.accesskey;"
-                                    respvalue="TENTATIVE"
-                                    respmode="AUTO"/>
-                          <menuitem id="agenda-context-menu-attend-tentative-dontsend-menuitem"
-                                    scope="this-occurrence"
-                                    label="&calendar.context.attendance.dontsend.label;"
-                                    accesskey="&calendar.context.attendance.dontsend.accesskey;"
-                                    respvalue="TENTATIVE"
-                                    respmode="NONE"/>
-                        </menupopup>
-                      </menu>
-                      <menu id="agenda-context-menu-attendance-declined-menu"
-                            label="&calendar.context.attendance.occ.declined.label;"
-                            accesskey="&calendar.context.attendance.occ.declined.accesskey;"
-                            value="DECLINED"
-                            name="agenda-context-attendance"
-                            scope="this-occurrence">
-                        <menupopup id="agenda-context-menu-occurrence-tentative-menupopup">
-                          <menuitem id="agenda-context-menu-attend-declined-menuitem"
-                                    scope="this-occurrence"
-                                    label="&calendar.context.attendance.send.label;"
-                                    accesskey="&calendar.context.attendance.send.accesskey;"
-                                    respvalue="DECLINED"
-                                    respmode="AUTO"/>
-                          <menuitem id="agenda-context-menu-attend-declined-dontsend-menuitem"
-                                    scope="this-occurrence"
-                                    label="&calendar.context.attendance.dontsend.label;"
-                                    accesskey="&calendar.context.attendance.dontsend.accesskey;"
-                                    respvalue="DECLINED"
-                                    respmode="NONE"/>
-                        </menupopup>
-                      </menu>
-                      <menuitem id="agenda-context-menu-attendance-delegated-menu"
-                                label="&calendar.context.attendance.occ.delegated.label;"
-                                name="agenda-context-attendance"
+                  broadcaster="modeBroadcaster"
+                  collapsedinmodes="mail,calendar,task"
+                  refcontrol="ltnTodayPaneDisplayMinimonth"
+                  persist="collapsedinmodes">
+          <minimonth id="today-Minimonth" freebusy="true" onchange="TodayPane.setDaywithjsDate(this.value);"/>
+        </modebox>
+        <modebox id="mini-day-box"
+                 mode="mail,calendar,task"
+                 class="today-subpane"
+                 refcontrol="ltnTodayPaneDisplayMiniday"
+                 broadcaster="modeBroadcaster"
+                 collapsedinmodes=""
+                 persist="collapsedinmodes"
+                 onDOMMouseScroll="TodayPane.advance(event.detail > 0 ? 1 : -1);">
+          <stack flex="1">
+            <image id="mini-day-image" flex="1"/>
+            <hbox flex="1">
+              <stack id="dateContainer">
+                <hbox pack="center"
+                      align="center">
+                  <label id="datevalue-label" class="dateValue"
+                         ondblclick="TodayPane.onDoubleClick(event);"
+                         onmousedown="TodayPane.onMousedown(event);"/>
+                </hbox>
+                <hbox flex="1" pack="center" align="center" mousethrough="always">
+                  <image id="dragCenter-image" hidden="true"/>
+                </hbox>
+              </stack>
+              <vbox flex="1">
+                <hbox pack="center">
+                  <deck id="weekdayNameContainer" pack="center"
+                        ondblclick="TodayPane.onDoubleClick(event);">
+                    <label/>
+                    <label/>
+                    <label/>
+                    <label/>
+                    <label/>
+                    <label/>
+                    <label/>
+                  </deck>
+                  <spacer id="weekspacer" flex="1"/>
+                  <hbox pack="end">
+                    <toolbarbutton id="previous-day-button"
+                                   class="miniday-nav-buttons"
+                                   tooltiptext="&onedaybackward.tooltip;"
+                                   onmousedown="TodayPane.onMousedown(event, parseInt(this.getAttribute('dir')));"
+                                   dir="-1"/>
+                    <toolbarbutton id="today-button"
+                                   class="miniday-nav-buttons"
+                                   tooltiptext="&showToday.tooltip;"
+                                   oncommand="TodayPane.setDay(cal.dtz.now());"/>
+                    <toolbarbutton id="next-day-button"
+                                   class="miniday-nav-buttons"
+                                   tooltiptext="&onedayforward.tooltip;"
+                                   onmousedown="TodayPane.onMousedown(event, parseInt(this.getAttribute('dir')));"
+                                   dir="1"/>
+                  </hbox>
+                </hbox>
+                <hbox pack="start">
+                  <label id="monthNameContainer" class="monthlabel"
+                         ondblclick="TodayPane.onDoubleClick(event);"/>
+                  <label id="currentWeek-label" class="monthlabel"
+                         ondblclick="TodayPane.onDoubleClick(event);"/>
+                  <spacer flex="1"/>
+                </hbox>
+              </vbox>
+              <toolbarbutton id="miniday-dropdown-button"
+                             tooltiptext="&showselectedday.tooltip;"
+                             type="menu">
+                <panel id="miniday-month-panel" position="after_end"
+                       onpopupshown="this.firstChild.focusCalendar();">
+                  <minimonth id="todayMinimonth"
+                             flex="1"
+                             onchange="TodayPane.setDaywithjsDate(this.value);
+                                       document.getElementById('miniday-month-panel').hidePopup();"/>
+                </panel>
+              </toolbarbutton>
+            </hbox>
+          </stack>
+        </modebox>
+        <vbox flex="1">
+          <hbox id="agenda-toolbar" iconsize="small">
+            <toolbarbutton id="todaypane-new-event-button"
+                           mode="mail"
+                           iconsize="small"
+                           orient="horizontal"
+                           label="&calendar.newevent.button.label;"
+                           tooltiptext="&calendar.newevent.button.tooltip;"
+                           oncommand="agendaListbox.createNewEvent(event)">
+              <observes element="calendar_new_event_command" attribute="disabled"/>
+            </toolbarbutton>
+          </hbox>
+          <richlistbox id="agenda-listbox" flex="1" context="_child"
+                       onblur="agendaListbox.onBlur();"
+                       onfocus="agendaListbox.onFocus();"
+                       onkeypress="agendaListbox.onKeyPress(event);"
+                       ondblclick="agendaListbox.createNewEvent(event);"
+                       ondragstart="nsDragAndDrop.startDrag(event, calendarCalendarButtonDNDObserver);"
+                       ondragover="nsDragAndDrop.dragOver(event, calendarCalendarButtonDNDObserver);"
+                       ondrop="nsDragAndDrop.drop(event, calendarCalendarButtonDNDObserver);">
+            <menupopup id="agenda-menupopup" onpopupshowing="return agendaListbox.setupContextMenu(event.target)">
+              <menuitem label="&calendar.context.modifyorviewitem.label;"
+                       accesskey="&calendar.context.modifyorviewitem.accesskey;"
+                       observes="agenda_edit_event_command"/>
+              <menu id="agenda-context-menu-convert-menu"
+                   label="&calendar.context.convertmenu.label;"
+                   accesskey="&calendar.context.convertmenu.accesskey.calendar;">
+                <menupopup id="agenda-context-menu-convert-menupopup">
+                  <menuitem id="agenda-context-menu-convert-message-menuitem"
+                            label="&calendar.context.convertmenu.message.label;"
+                            accesskey="&calendar.context.convertmenu.message.accesskey;"
+                            oncommand="calendarMailButtonDNDObserver.onDropItems(agendaListbox.getSelectedItems())"/>
+                  <menuitem id="agenda-context-menu-convert-task-menuitem"
+                            class="event-only"
+                            label="&calendar.context.convertmenu.task.label;"
+                            accesskey="&calendar.context.convertmenu.task.accesskey;"
+                            oncommand="calendarTaskButtonDNDObserver.onDropItems(agendaListbox.getSelectedItems())"/>
+                </menupopup>
+              </menu>
+              <menuseparator id="calendar-today-pane-menuseparator-before-delete"/>
+              <menuitem label="&calendar.context.deleteevent.label;"
+                       accesskey="&calendar.context.deleteevent.accesskey;"
+                       key="calendar-delete-item-key"
+                       observes="agenda_delete_event_command"/>
+              <menu id="calendar-today-pane-menu-attendance-menu"
+                    label="&calendar.context.attendance.menu.label;"
+                    accesskey="&calendar.context.attendance.menu.accesskey;"
+                    oncommand="setContextPartstat(event.target, agendaListbox.getSelectedItems({}))"
+                    observes="calendar_attendance_command">
+                <menupopup id="agenda-context-menu-attendance-menupopup">
+                  <label id="agenda-context-attendance-thisoccurrence-label"
+                         class="calendar-context-heading-label"
+                         scope="this-occurrence"
+                         value="&calendar.context.attendance.occurrence.label;"/>
+                  <menu id="agenda-context-menu-attendance-accepted-menu"
+                        label="&calendar.context.attendance.occ.accepted.label;"
+                        accesskey="&calendar.context.attendance.occ.accepted.accesskey;"
+                        value="ACCEPTED"
+                        name="agenda-context-attendance"
+                        scope="this-occurrence">
+                    <menupopup id="agenda-context-menu-occurrence-accepted-menupopup">
+                      <menuitem id="agenda-context-menu-attend-accept-menuitem"
                                 scope="this-occurrence"
-                                value="DELEGATED"/>
-                      <menuitem id="agenda-context-menu-attendance-needsaction-menu"
-                                label="&calendar.context.attendance.occ.needsaction.label;"
-                                name="agenda-context-attendance"
+                                label="&calendar.context.attendance.send.label;"
+                                accesskey="&calendar.context.attendance.send.accesskey;"
+                                respvalue="ACCEPTED"
+                                respmode="AUTO"/>
+                      <menuitem id="agenda-context-menu-attend-accept-dontsend-menuitem"
                                 scope="this-occurrence"
-                                value="NEEDS-ACTION"/>
-                      <label id="agenda-context-attendance-alloccurrence-label"
-                             class="calendar-context-heading-label"
-                             scope="all-occurrences"
-                             value="&calendar.context.attendance.all2.label;"/>
-                      <menu id="agenda-context-menu-attendance-accepted-all-menu"
-                            label="&calendar.context.attendance.all.accepted.label;"
-                            accesskey="&calendar.context.attendance.all.accepted.accesskey;"
-                            value="ACCEPTED"
-                            name="agenda-context-attendance-all"
-                            scope="all-occurrences">
-                        <menupopup id="agenda-context-menu-alloccurrences-accept-menupopup">
-                          <menuitem id="agenda-context-menu-attend-accept-all-menuitem"
-                                    scope="all-occurrences"
-                                    label="&calendar.context.attendance.send.label;"
-                                    accesskey="&calendar.context.attendance.send.accesskey;"
-                                    respvalue="ACCEPTED"
-                                    respmode="AUTO"/>
-                          <menuitem id="agenda-context-menu-attend-accept-all-dontsend-menuitem"
-                                    scope="all-occurrences"
-                                    label="&calendar.context.attendance.dontsend.label;"
-                                    accesskey="&calendar.context.attendance.dontsend.accesskey;"
-                                    respvalue="ACCEPTED"
-                                    respmode="NONE"/>
-                        </menupopup>
-                      </menu>
-                      <menu id="agenda-context-menu-attendance-tentative-all-menu"
-                            label="&calendar.context.attendance.all.tentative.label;"
-                            accesskey="&calendar.context.attendance.all.tentative.accesskey;"
-                            value="TENTATIVE"
-                            name="agenda-context-attendance-all"
-                            scope="all-occurrences">
-                        <menupopup id="agenda-context-menu-alloccurrences-tentative-menupopup">
-                          <menuitem id="agenda-context-menu-attend-tentative-all-menuitem"
-                                    scope="all-occurrences"
-                                    label="&calendar.context.attendance.send.label;"
-                                    accesskey="&calendar.context.attendance.send.accesskey;"
-                                    respvalue="TENTATIVE"
-                                    respmode="AUTO"/>
-                          <menuitem id="agenda-context-menu-attend-tentative-all-dontsend-menuitem"
-                                    scope="all-occurrences"
-                                    label="&calendar.context.attendance.dontsend.label;"
-                                    accesskey="&calendar.context.attendance.dontsend.accesskey;"
-                                    respvalue="TENTATIVE"
-                                    respmode="NONE"/>
-                        </menupopup>
-                      </menu>
-                      <menu id="agenda-context-menu-attendance-decline-all-menu"
-                            label="&calendar.context.attendance.all.declined.label;"
-                            accesskey="&calendar.context.attendance.all.declined.accesskey;"
-                            value="DECLINED"
-                            name="agenda-context-attendance-all"
-                            scope="all-occurrences">
-                        <menupopup id="agenda-context-menu-alloccurrences-decline-menupopup">
-                          <menuitem id="agenda-context-menu-attend-declined-all-menuitem"
-                                    scope="all-occurrences"
-                                    label="&calendar.context.attendance.send.label;"
-                                    accesskey="&calendar.context.attendance.send.accesskey;"
-                                    respvalue="DECLINED"
-                                    respmode="AUTO"/>
-                          <menuitem id="agenda-context-menu-attend-declined-all-dontsend-menuitem"
-                                    scope="all-occurrences"
-                                    label="&calendar.context.attendance.dontsend.label;"
-                                    accesskey="&calendar.context.attendance.dontsend.accesskey;"
-                                    respvalue="DECLINED"
-                                    respmode="NONE"/>
-                        </menupopup>
-                      </menu>
-                      <menuitem id="agenda-context-menu-attendance-delegated-all-menu"
-                                label="&calendar.context.attendance.all.delegated.label;"
-                                name="agenda-context-attendance-delegated-all"
-                                scope="all-occurrences"
-                                value="DELEGATED"/>
-                      <menuitem id="agenda-context-menu-attendance-needsaction-all-menu"
-                                label="&calendar.context.attendance.all.needsaction.label;"
-                                name="agenda-context-attendance-needaction-all"
-                                scope="all-occurrences"
-                                value="NEEDS-ACTION"/>
+                                label="&calendar.context.attendance.dontsend.label;"
+                                accesskey="&calendar.context.attendance.dontsend.accesskey;"
+                                respvalue="ACCEPTED"
+                                respmode="NONE"/>
                     </menupopup>
                   </menu>
+                  <menu id="agenda-context-menu-attendance-tentative-menu"
+                        label="&calendar.context.attendance.occ.tentative.label;"
+                        accesskey="&calendar.context.attendance.occ.tentative.accesskey;"
+                        value="TENTATIVE"
+                        name="agenda-context-attendance"
+                        scope="this-occurrence">
+                    <menupopup id="agenda-context-menu-occurrence-tentative-menupopup">
+                      <menuitem id="agenda-context-menu-attend-tentative-menuitem"
+                                scope="this-occurrence"
+                                label="&calendar.context.attendance.send.label;"
+                                accesskey="&calendar.context.attendance.send.accesskey;"
+                                respvalue="TENTATIVE"
+                                respmode="AUTO"/>
+                      <menuitem id="agenda-context-menu-attend-tentative-dontsend-menuitem"
+                                scope="this-occurrence"
+                                label="&calendar.context.attendance.dontsend.label;"
+                                accesskey="&calendar.context.attendance.dontsend.accesskey;"
+                                respvalue="TENTATIVE"
+                                respmode="NONE"/>
+                    </menupopup>
+                  </menu>
+                  <menu id="agenda-context-menu-attendance-declined-menu"
+                        label="&calendar.context.attendance.occ.declined.label;"
+                        accesskey="&calendar.context.attendance.occ.declined.accesskey;"
+                        value="DECLINED"
+                        name="agenda-context-attendance"
+                        scope="this-occurrence">
+                    <menupopup id="agenda-context-menu-occurrence-tentative-menupopup">
+                      <menuitem id="agenda-context-menu-attend-declined-menuitem"
+                                scope="this-occurrence"
+                                label="&calendar.context.attendance.send.label;"
+                                accesskey="&calendar.context.attendance.send.accesskey;"
+                                respvalue="DECLINED"
+                                respmode="AUTO"/>
+                      <menuitem id="agenda-context-menu-attend-declined-dontsend-menuitem"
+                                scope="this-occurrence"
+                                label="&calendar.context.attendance.dontsend.label;"
+                                accesskey="&calendar.context.attendance.dontsend.accesskey;"
+                                respvalue="DECLINED"
+                                respmode="NONE"/>
+                    </menupopup>
+                  </menu>
+                  <menuitem id="agenda-context-menu-attendance-delegated-menu"
+                            label="&calendar.context.attendance.occ.delegated.label;"
+                            name="agenda-context-attendance"
+                            scope="this-occurrence"
+                            value="DELEGATED"/>
+                  <menuitem id="agenda-context-menu-attendance-needsaction-menu"
+                            label="&calendar.context.attendance.occ.needsaction.label;"
+                            name="agenda-context-attendance"
+                            scope="this-occurrence"
+                            value="NEEDS-ACTION"/>
+                  <label id="agenda-context-attendance-alloccurrence-label"
+                         class="calendar-context-heading-label"
+                         scope="all-occurrences"
+                         value="&calendar.context.attendance.all2.label;"/>
+                  <menu id="agenda-context-menu-attendance-accepted-all-menu"
+                        label="&calendar.context.attendance.all.accepted.label;"
+                        accesskey="&calendar.context.attendance.all.accepted.accesskey;"
+                        value="ACCEPTED"
+                        name="agenda-context-attendance-all"
+                        scope="all-occurrences">
+                    <menupopup id="agenda-context-menu-alloccurrences-accept-menupopup">
+                      <menuitem id="agenda-context-menu-attend-accept-all-menuitem"
+                                scope="all-occurrences"
+                                label="&calendar.context.attendance.send.label;"
+                                accesskey="&calendar.context.attendance.send.accesskey;"
+                                respvalue="ACCEPTED"
+                                respmode="AUTO"/>
+                      <menuitem id="agenda-context-menu-attend-accept-all-dontsend-menuitem"
+                                scope="all-occurrences"
+                                label="&calendar.context.attendance.dontsend.label;"
+                                accesskey="&calendar.context.attendance.dontsend.accesskey;"
+                                respvalue="ACCEPTED"
+                                respmode="NONE"/>
+                    </menupopup>
+                  </menu>
+                  <menu id="agenda-context-menu-attendance-tentative-all-menu"
+                        label="&calendar.context.attendance.all.tentative.label;"
+                        accesskey="&calendar.context.attendance.all.tentative.accesskey;"
+                        value="TENTATIVE"
+                        name="agenda-context-attendance-all"
+                        scope="all-occurrences">
+                    <menupopup id="agenda-context-menu-alloccurrences-tentative-menupopup">
+                      <menuitem id="agenda-context-menu-attend-tentative-all-menuitem"
+                                scope="all-occurrences"
+                                label="&calendar.context.attendance.send.label;"
+                                accesskey="&calendar.context.attendance.send.accesskey;"
+                                respvalue="TENTATIVE"
+                                respmode="AUTO"/>
+                      <menuitem id="agenda-context-menu-attend-tentative-all-dontsend-menuitem"
+                                scope="all-occurrences"
+                                label="&calendar.context.attendance.dontsend.label;"
+                                accesskey="&calendar.context.attendance.dontsend.accesskey;"
+                                respvalue="TENTATIVE"
+                                respmode="NONE"/>
+                    </menupopup>
+                  </menu>
+                  <menu id="agenda-context-menu-attendance-decline-all-menu"
+                        label="&calendar.context.attendance.all.declined.label;"
+                        accesskey="&calendar.context.attendance.all.declined.accesskey;"
+                        value="DECLINED"
+                        name="agenda-context-attendance-all"
+                        scope="all-occurrences">
+                    <menupopup id="agenda-context-menu-alloccurrences-decline-menupopup">
+                      <menuitem id="agenda-context-menu-attend-declined-all-menuitem"
+                                scope="all-occurrences"
+                                label="&calendar.context.attendance.send.label;"
+                                accesskey="&calendar.context.attendance.send.accesskey;"
+                                respvalue="DECLINED"
+                                respmode="AUTO"/>
+                      <menuitem id="agenda-context-menu-attend-declined-all-dontsend-menuitem"
+                                scope="all-occurrences"
+                                label="&calendar.context.attendance.dontsend.label;"
+                                accesskey="&calendar.context.attendance.dontsend.accesskey;"
+                                respvalue="DECLINED"
+                                respmode="NONE"/>
+                    </menupopup>
+                  </menu>
+                  <menuitem id="agenda-context-menu-attendance-delegated-all-menu"
+                            label="&calendar.context.attendance.all.delegated.label;"
+                            name="agenda-context-attendance-delegated-all"
+                            scope="all-occurrences"
+                            value="DELEGATED"/>
+                  <menuitem id="agenda-context-menu-attendance-needsaction-all-menu"
+                            label="&calendar.context.attendance.all.needsaction.label;"
+                            name="agenda-context-attendance-needaction-all"
+                            scope="all-occurrences"
+                            value="NEEDS-ACTION"/>
                 </menupopup>
-                <agenda-checkbox-richlist-item id="today-header"
-                                               title="&calendar.today.button.label;"
-                                               checked="true"
-                                               persist="checked"/>
-                <agenda-checkbox-richlist-item id="tomorrow-header"
-                                               title="&calendar.tomorrow.button.label;"
-                                               checked="false"
-                                               persist="checked"/>
-                <agenda-checkbox-richlist-item id="nextweek-header"
-                                               title="&calendar.upcoming.button.label;"
-                                               checked="false"
-                                               persist="checked"/>
-              </richlistbox>
-            </vbox>
-        </modevbox>
-        <splitter id="today-pane-splitter" persist="hidden"/>
-        <modevbox id="todo-tab-panel" flex="1" mode="mail,calendar"
-                  collapsedinmodes="mail,task"
-                  broadcaster="modeBroadcaster"
-                  persist="height collapsedinmodes"
-                  ondragstart="nsDragAndDrop.startDrag(event, calendarTaskButtonDNDObserver);"
-                  ondragover="nsDragAndDrop.dragOver(event, calendarTaskButtonDNDObserver);"
-                  ondrop="nsDragAndDrop.drop(event, calendarTaskButtonDNDObserver);"/>
+              </menu>
+            </menupopup>
+            <agenda-checkbox-richlist-item id="today-header"
+                                           title="&calendar.today.button.label;"
+                                           checked="true"
+                                           persist="checked"/>
+            <agenda-checkbox-richlist-item id="tomorrow-header"
+                                           title="&calendar.tomorrow.button.label;"
+                                           checked="false"
+                                           persist="checked"/>
+            <agenda-checkbox-richlist-item id="nextweek-header"
+                                           title="&calendar.upcoming.button.label;"
+                                           checked="false"
+                                           persist="checked"/>
+          </richlistbox>
+        </vbox>
+      </modevbox>
+      <splitter id="today-pane-splitter" persist="hidden"/>
+      <modevbox id="todo-tab-panel" flex="1" mode="mail,calendar"
+                collapsedinmodes="mail,task"
+                broadcaster="modeBroadcaster"
+                persist="height collapsedinmodes"
+                ondragstart="nsDragAndDrop.startDrag(event, calendarTaskButtonDNDObserver);"
+                ondragover="nsDragAndDrop.dragOver(event, calendarTaskButtonDNDObserver);"
+                ondrop="nsDragAndDrop.drop(event, calendarTaskButtonDNDObserver);"/>
     </vbox>
   </modevbox>
 
   <commandset id="calendar_commands">
     <command id="calendar_toggle_todaypane_command" oncommand="TodayPane.toggleVisibility(event)"/>
   </commandset>
 </overlay>
--- a/calendar/lightning/content/lightning-item-iframe.xul
+++ b/calendar/lightning/content/lightning-item-iframe.xul
@@ -638,17 +638,17 @@
                     accesskey="&event.attendees.notifyundisclosed.accesskey;"
                     tooltiptext="&event.attendees.notifyundisclosed.tooltip;"
                     pack="start"/>
           <checkbox id="disallow-counter-checkbox"
                     label="&event.attendees.disallowcounter.label;"
                     accesskey="&event.attendees.disallowcounter.accesskey;"
                     tooltiptext="&event.attendees.disallowcounter.tooltip;"
                     pack="start"/>
-         </hbox>
+        </hbox>
       </tabbox>
 
       <separator id="event-grid-link-separator"
                  class="groove"
                  hidden="true"/>
       <row id="event-grid-link-row"
            align="center"
            hidden="true">
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -150,30 +150,30 @@
           <separator id="minimonth-splitter" minwidth="100"/>
           <vbox id="calendar-panel" flex="1">
             <modevbox id="task-filter-pane" mode="task" broadcaster="modeBroadcaster" refcontrol="calendar_toggle_filter_command">
               <checkbox id="task-tree-filter-header"
                                checked="true"
                                class="treenode-checkbox"
                                label="&calendar.task.filter.title.label;"/>
               <modevbox id="task-filtertree-pane" flex="1" mode="task" broadcaster="modeBroadcaster" refcontrol="task-tree-filter-header">
-                 <radiogroup id="task-tree-filtergroup" class="task-tree-subpane"
-                             persist="value">
-                   <observes element="filterBroadcaster"
-                             attribute="value"
-                             onbroadcast="checkRadioControl(this.parentNode, document.getElementById('filterBroadcaster').getAttribute('value'));"/>
-                   <radio id="opt_throughcurrent_filter" label="&calendar.task.filter.current.label;" value="throughcurrent" command="calendar_task_filter_command"/>
-                   <radio id="opt_today_filter" label="&calendar.task.filter.today.label;" value="throughtoday" command="calendar_task_filter_command"/>
-                   <radio id="opt_next7days_filter" label="&calendar.task.filter.next7days.label;" value="throughsevendays" command="calendar_task_filter_command"/>
-                   <radio id="opt_notstarted_filter" label="&calendar.task.filter.notstarted.label;" value="notstarted" command="calendar_task_filter_command"/>
-                   <radio id="opt_overdue_filter" label="&calendar.task.filter.overdue.label;" value="overdue" command="calendar_task_filter_command"/>
-                   <radio id="opt_completed_filter" label="&calendar.task.filter.completed.label;" value="completed" command="calendar_task_filter_command"/>
-                   <radio id="opt_open_filter" label="&calendar.task.filter.open.label;" value="open" command="calendar_task_filter_command"/>
-                   <radio id="opt_all_filter" label="&calendar.task.filter.all.label;" value="all" command="calendar_task_filter_command"/>
-                 </radiogroup>
+                <radiogroup id="task-tree-filtergroup" class="task-tree-subpane"
+                            persist="value">
+                  <observes element="filterBroadcaster"
+                            attribute="value"
+                            onbroadcast="checkRadioControl(this.parentNode, document.getElementById('filterBroadcaster').getAttribute('value'));"/>
+                  <radio id="opt_throughcurrent_filter" label="&calendar.task.filter.current.label;" value="throughcurrent" command="calendar_task_filter_command"/>
+                  <radio id="opt_today_filter" label="&calendar.task.filter.today.label;" value="throughtoday" command="calendar_task_filter_command"/>
+                  <radio id="opt_next7days_filter" label="&calendar.task.filter.next7days.label;" value="throughsevendays" command="calendar_task_filter_command"/>
+                  <radio id="opt_notstarted_filter" label="&calendar.task.filter.notstarted.label;" value="notstarted" command="calendar_task_filter_command"/>
+                  <radio id="opt_overdue_filter" label="&calendar.task.filter.overdue.label;" value="overdue" command="calendar_task_filter_command"/>
+                  <radio id="opt_completed_filter" label="&calendar.task.filter.completed.label;" value="completed" command="calendar_task_filter_command"/>
+                  <radio id="opt_open_filter" label="&calendar.task.filter.open.label;" value="open" command="calendar_task_filter_command"/>
+                  <radio id="opt_all_filter" label="&calendar.task.filter.all.label;" value="all" command="calendar_task_filter_command"/>
+                </radiogroup>
               </modevbox>
             </modevbox>
             <modevbox id="calendar-list-pane" flex="1" mode="calendar,task" broadcaster="modeBroadcaster"
                       refcontrol="calendar_toggle_calendarlist_command">
               <checkbox id="calendar-list-header"
                                checked="true"
                                class="treenode-checkbox"
                                ondrop="return document.getElementById('calendar-list-tree-widget').foreignDrop(event)"
--- a/calendar/providers/gdata/content/gdata-calendar-creation.xul
+++ b/calendar/providers/gdata/content/gdata-calendar-creation.xul
@@ -21,27 +21,27 @@
 
   <wizard id="calendar-wizard">
     <description id="gdata-nextstep-description" hidden="true">&gdata.wizard.nextstep.description;</description>
 
     <wizardpage id="gdata-session"
                 pageid="gdata-session"
                 onpageshow="gdataSessionShow(); checkRequired()"
                 description="&wizard.description;">
-       <description>&gdata.wizard.session.description;</description>
-       <radiogroup id="gdata-session-group" onselect="checkRequired()">
-         <hbox id="session-new">
-           <radio value=""/>
-           <textbox id="gdata-session-name"
-                    type="email"
-                    onfocus="gdataFocusNewSession()"
-                    oninput="gdataFocusNewSession(); checkRequired();"
-                    flex="1"/>
-         </hbox>
-       </radiogroup>
+      <description>&gdata.wizard.session.description;</description>
+      <radiogroup id="gdata-session-group" onselect="checkRequired()">
+        <hbox id="session-new">
+          <radio value=""/>
+          <textbox id="gdata-session-name"
+                   type="email"
+                   onfocus="gdataFocusNewSession()"
+                   oninput="gdataFocusNewSession(); checkRequired();"
+                   flex="1"/>
+        </hbox>
+      </radiogroup>
     </wizardpage>
     <wizardpage id="gdata-calendars"
                 pageid="gdata-calendars"
                 onpageshow="gdataCalendarsShow(); checkRequired()"
                 onpageadvanced="return gdataCalendarsAdvance()"
                 description="&wizard.description;">
       <description>&gdata.wizard.calendars.description;</description>
       <calendar-list-tree type="gdata" id="calendar-list" flex="1"
--- a/calendar/timezones/install.rdf
+++ b/calendar/timezones/install.rdf
@@ -22,18 +22,18 @@
       </Description>
     </em:targetApplication>
     <em:targetApplication>
       <Description>
         <!-- Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.35a1</em:minVersion>
         <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
-       </Description>
-     </em:targetApplication>
+      </Description>
+    </em:targetApplication>
 
     <em:name>Timezone Definitions for Mozilla Calendar</em:name>
     <em:description>Timezone definitions required by Lightning</em:description>
     <em:creator>Mozilla Calendar Project</em:creator>
 #if 0
     <em:homepageURL>https://addons.mozilla.org/en-US/thunderbird/addon/xxx todo</em:homepageURL>
 #endif
   </Description>