Bug 1508119 - Inline the calendar-task-view.xul overlay file. r=darktrojan
authorPaul Morris <paul@thunderbird.net>
Fri, 25 Oct 2019 16:24:51 -0400
changeset 37379 9088ce19d9d4115dcc29b8c2283dbdcfce51bf85
parent 37378 656e414f283048dc645f91325b2444f7fabbb636
child 37380 7edaf5c980d383735ccfe8e300ea2783d9468956
push id396
push userclokep@gmail.com
push dateMon, 06 Jan 2020 23:11:57 +0000
reviewersdarktrojan
bugs1508119
Bug 1508119 - Inline the calendar-task-view.xul overlay file. r=darktrojan
calendar/base/content/calendar-task-view.xul
calendar/base/jar.mn
calendar/lightning/content/messenger-overlay-sidebar.xul
calendar/lightning/jar.mn
deleted file mode 100644
--- a/calendar/base/content/calendar-task-view.xul
+++ /dev/null
@@ -1,230 +0,0 @@
-<?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/. -->
-
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-tree.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
-
-<!DOCTYPE overlay [
-  <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
-  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd2;
-  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %dtd3;
-]>
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://calendar/content/calFilter.js"/>
-  <script src="chrome://calendar/content/calendar-task-tree-utils.js"/>
-  <script src="chrome://calendar/content/calendar-task-tree-view.js"/>
-  <script src="chrome://calendar/content/calendar-task-tree.js"/>
-  <script src="chrome://calendar/content/calendar-task-view.js"/>
-  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script src="chrome://calendar/content/calApplicationUtils.js"/>
-  <script src="chrome://calendar/content/calendar-item-bindings.js"/>
-  <script src="chrome://global/content/globalOverlay.js"/>
-  <script src="chrome://calendar/content/calendar-menus.js"/>
-
-  <vbox id="calendarDisplayDeck">
-    <vbox id="calendar-task-box" flex="1"
-          onselect="taskDetailsView.onSelect(event);">
-      <hbox id="task-addition-box" align="center">
-        <box align="center" flex="1">
-          <toolbarbutton id="calendar-add-task-button"
-                         label="&calendar.newtask.button.label;"
-                         tooltiptext="&calendar.newtask.button.tooltip;"
-                         command="calendar_new_todo_command"/>
-          <hbox align="center" flex="1" class="input-container">
-            <html:input id="view-task-edit-field"
-                        class="task-edit-field themeableSearchBox"
-                        onfocus="taskEdit.onFocus(event)"
-                        onblur="taskEdit.onBlur(event)"
-                        onkeypress="taskEdit.onKeyPress(event)"/>
-          </hbox>
-        </box>
-        <box align="center" flex="1">
-          <search-textbox id="task-text-filter-field"
-                          class="themeableSearchBox"
-                          flex="1"
-                          placeholder=""
-                          emptytextbase="&calendar.task.text-filter.textbox.emptytext.base1;"
-                          keyLabelNonMac="&calendar.task.text-filter.textbox.emptytext.keylabel.nonmac;"
-                          keyLabelMac="&calendar.task.text-filter.textbox.emptytext.keylabel.mac;"
-                          oncommand="taskViewUpdate();"/>
-        </box>
-      </hbox>
-      <vbox flex="1">
-        <tree is="calendar-task-tree" id="calendar-task-tree"
-              flex="1"
-              visible-columns="completed priority title entryDate dueDate"
-              persist="visible-columns ordinals widths sort-active sort-direction height"
-              context="taskitem-context-menu"/>
-        <splitter id="calendar-task-view-splitter" collapse="none" persist="state" class="calendar-splitter"/>
-        <vbox id="calendar-task-details-container"
-              class="main-header-area"
-              flex="1"
-              persist="height"
-              hidden="true">
-          <hbox id="calendar-task-details">
-            <hbox id="other-actions-box">
-              <vbox id="task-actions-toolbox">
-                <hbox id="task-actions-toolbar" class="toolbar">
-                  <toolbarbutton id="task-actions-category"
-                                 type="menu"
-                                 label="&calendar.unifinder.tree.categories.label;"
-                                 tooltiptext="&calendar.task.category.button.tooltip;"
-                                 command="calendar_task_category_command"
-                                 class="toolbarbutton-1 msgHeaderView-button">
-                    <menupopup id="task-actions-category-popup"
-                               onpopupshowing="taskDetailsView.loadCategories(event);"
-                               onpopuphiding="return taskDetailsView.saveCategories(event);">
-                      <html:input id="task-actions-category-textbox"
-                                  placeholder="&event.categories.textbox.label;"
-                                  onblur="this.parentNode.removeAttribute(&quot;ignorekeys&quot;);"
-                                  onfocus="this.parentNode.setAttribute(&quot;ignorekeys&quot;, &quot;true&quot;);"
-                                  onkeypress="taskDetailsView.categoryTextboxKeypress(event);"/>
-                      <menuseparator/>
-                    </menupopup>
-                  </toolbarbutton>
-                  <toolbarbutton is="toolbarbutton-menu-button" id="task-actions-markcompleted"
-                                 type="menu-button"
-                                 label="&calendar.context.markcompleted.label;"
-                                 tooltiptext="&calendar.task.complete.button.tooltip;"
-                                 command="calendar_toggle_completed_command"
-                                 class="toolbarbutton-1 msgHeaderView-button">
-                    <menupopup is="calendar-task-progress-menupopup" id="task-actions-markcompleted-menupopup"/>
-                  </toolbarbutton>
-                  <toolbarbutton id="task-actions-priority"
-                                 type="menu"
-                                 label="&calendar.context.priority.label;"
-                                 tooltiptext="&calendar.task.priority.button.tooltip;"
-                                 command="calendar_general-priority_command"
-                                 class="toolbarbutton-1 msgHeaderView-button">
-                    <menupopup is="calendar-task-priority-menupopup" id="task-actions-priority-menupopup"/>
-                  </toolbarbutton>
-                  <toolbarbutton id="calendar-delete-task-button"
-                                 class="toolbarbutton-1 msgHeaderView-button"
-                                 label="&calendar.taskview.delete.label;"
-                                 tooltiptext="&calendar.context.deletetask.label;"
-                                 command="calendar_delete_todo_command"/>
-                </hbox>
-              </vbox>
-            </hbox>
-            <hbox id ="calendar-task-details-box">
-              <html:table id="calendar-task-details-grid">
-                <html:tr id="calendar-task-details-title-row"
-                         hidden="hidden">
-                  <html:th class="task-details-name">
-                    &calendar.task-details.title.label;
-                  </html:th>
-                  <html:td id="calendar-task-details-title"
-                           class="task-details-value">
-                  </html:td>
-                </html:tr>
-                <html:tr id="calendar-task-details-priority-row"
-                         hidden="hidden">
-                  <html:th id="calendar-task-details-priority-label"
-                           class="task-details-name">
-                    &calendar.task-details.priority.label;
-                  </html:th>
-                  <html:td id="calendar-task-details-priority-td">
-                    <label id="calendar-task-details-priority-low"
-                           value="&calendar.task-details.priority.low.label;"
-                           class="task-details-value"
-                           hidden="true"/>
-                    <label id="calendar-task-details-priority-normal"
-                           value="&calendar.task-details.priority.normal.label;"
-                           class="task-details-value"
-                           hidden="true"/>
-                    <label id="calendar-task-details-priority-high"
-                           value="&calendar.task-details.priority.high.label;"
-                           class="task-details-value"
-                           hidden="true"/>
-                  </html:td>
-                </html:tr>
-                <html:tr id="calendar-task-details-organizer-row"
-                         hidden="hidden">
-                  <html:th class="task-details-name">
-                    &calendar.task-details.organizer.label;
-                  </html:th>
-                  <html:td id="calendar-task-details-organizer"
-                           class="task-details-value text-link"
-                           onclick="sendMailToOrganizer()">
-                  </html:td>
-                </html:tr>
-                <html:tr id="calendar-task-details-status-row"
-                         hidden="hidden">
-                  <html:th class="task-details-name">
-                    &calendar.task-details.status.label;
-                  </html:th>
-                  <html:td id="calendar-task-details-status"
-                           class="task-details-value">
-                  </html:td>
-                </html:tr>
-                <html:tr id="calendar-task-details-category-row"
-                         hidden="hidden">
-                  <html:th class="task-details-name">
-                    &calendar.task-details.category.label;
-                  </html:th>
-                  <html:td id="calendar-task-details-category"
-                           class="task-details-value">
-                  </html:td>
-                </html:tr>
-                <html:tr id="task-start-row"
-                         class="item-date-row"
-                         hidden="hidden">
-                  <html:th class="headline"
-                           control="task-start-date">
-                    &calendar.task-details.start.label;
-                  </html:th>
-                  <html:td>
-                    <html:input is="calendar-item-date-input" id="task-start-date" mode="start"/>
-                  </html:td>
-                </html:tr>
-                <html:tr id="task-due-row"
-                         class="item-date-row"
-                         hidden="hidden">
-                  <html:th class="headline"
-                           control="task-due-date">
-                    &calendar.task-details.due.label;
-                  </html:th>
-                  <html:td>
-                    <html:input is="calendar-item-date-input" id="task-due-date" mode="end"/>
-                  </html:td>
-                </html:tr>
-                <html:tr id="calendar-task-details-repeat-row"
-                         hidden="hidden">
-                  <html:th class="task-details-name">
-                    &calendar.task-details.repeat.label;
-                  </html:th>
-                  <html:td id="calendar-task-details-repeat"
-                           class="task-details-value">
-                  </html:td>
-                </html:tr>
-              </html:table>
-            </hbox>
-          </hbox>
-          <hbox id="calendar-task-details-description-wrapper" flex="1">
-            <html:textarea id="calendar-task-details-description"/>
-          </hbox>
-          <hbox id="calendar-task-details-attachment-row"
-               align="top"
-               hidden="true">
-            <hbox pack="end">
-              <label value="&calendar.task-details.attachments.label;"
-                     class="task-details-name"/>
-            </hbox>
-            <vbox id="calendar-task-details-attachment-rows"
-                  align="top"
-                  flex="1"
-                  style="overflow: auto;"
-                  hidden="true">
-            </vbox>
-          </hbox>
-        </vbox>
-      </vbox>
-    </vbox>
-  </vbox>
-
-</overlay>
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -28,17 +28,16 @@ calendar.jar:
     content/calendar-multiday-base-view.js                      (content/calendar-multiday-base-view.js)
     content/calendar-multiday-view.js                           (content/calendar-multiday-view.js)
     content/calendar-statusbar.js                               (content/calendar-statusbar.js)
     content/calendar-task-editing.js                            (content/calendar-task-editing.js)
     content/calendar-task-tree-utils.js                         (content/calendar-task-tree-utils.js)
     content/calendar-task-tree-view.js                          (content/calendar-task-tree-view.js)
     content/calendar-task-tree.js                               (content/calendar-task-tree.js)
     content/calendar-task-view.js                               (content/calendar-task-view.js)
-    content/calendar-task-view.xul                              (content/calendar-task-view.xul)
     content/calendar-ui-utils.js                                (content/calendar-ui-utils.js)
     content/calendar-unifinder.js                               (content/calendar-unifinder.js)
     content/calendar-unifinder.xul                              (content/calendar-unifinder.xul)
     content/calendar-views-utils.js                             (content/calendar-views-utils.js)
     content/calendar-views.js                                   (content/calendar-views.js)
     content/calendar-editable-item.js                           (content/calendar-editable-item.js)
     content/calendar-views.xul                                  (content/calendar-views.xul)
     content/calendar-alarm-dialog.js                            (content/dialogs/calendar-alarm-dialog.js)
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -18,25 +18,29 @@
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-event-dialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-event-dialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://calendar/skin/calendar-task-tree.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
 
 <?xul-overlay href="chrome://calendar/content/calendar-views.xul"?>
 
 <?xul-overlay href="chrome://lightning/content/lightning-toolbar.xul"?>
 <?xul-overlay href="chrome://lightning/content/lightning-menus.xul"?>
 
 <overlay id="ltnSidebarOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+         xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+         xmlns:html="http://www.w3.org/1999/xhtml">
 
   <script src="chrome://lightning/content/lightning-utils.js"/>
   <script src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
 
   <script src="chrome://calendar/content/calendar-day-label.js"/>
 
   <!-- NEEDED FOR MULTIPLE CALENDAR SUPPORT AND TODAY PANE -->
   <script src="chrome://calendar/content/calendar-management.js"/>
@@ -84,19 +88,30 @@
   <script src="chrome://lightning/content/lightning-item-panel.js"/>
 
   <script src="chrome://calendar/content/calendar-command-controller.js"/>
 
   <!-- NEEDED FOR TODAY PANE -->
   <script src="chrome://calendar/content/agenda-listbox.js"/>
   <script src="chrome://calendar/content/today-pane.js"/>
   <script src="chrome://calendar/content/agenda-listbox-utils.js"/>
+
+  <!-- NEEDED FOR TODAY PANE AND TASK VIEW -->
   <script src="chrome://calendar/content/calFilter.js"/>
   <script src="chrome://calendar/content/calendar-task-tree-utils.js"/>
 
+  <!-- NEEDED FOR TASK VIEW -->
+  <script src="chrome://calendar/content/calendar-task-tree-view.js"/>
+  <script src="chrome://calendar/content/calendar-task-tree.js"/>
+  <script src="chrome://calendar/content/calendar-task-view.js"/>
+  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script src="chrome://calendar/content/calApplicationUtils.js"/>
+  <script src="chrome://calendar/content/calendar-item-bindings.js"/>
+  <script src="chrome://calendar/content/calendar-menus.js"/>
+
   <window id="messengerWindow">
     <commandset id="calendar_commands"
                 commandupdater="true"
                 events="calendar_commands"
                 oncommandupdate="calendarController.updateCommands()">
       <command id="agenda_delete_event_command" oncommand="agendaListbox.deleteSelectedItem(false);"/>
       <command id="agenda_edit_event_command" oncommand="agendaListbox.editSelectedItem(event);"/>
       <command id="switch2calendar"
@@ -1105,16 +1120,214 @@
         <splitter id="calsidebar_splitter"
                   collapse="before"
                   persist="state"
                   class="calendar-sidebar-splitter"/>
 
         <deck id="calendarDisplayDeck" flex="1">
           <!-- vbox "calendar-view-box will be overlaid..." -->
           <vbox id="calendar-view-box"/>
+          <vbox id="calendar-task-box" flex="1"
+                onselect="taskDetailsView.onSelect(event);">
+            <hbox id="task-addition-box" align="center">
+              <box align="center" flex="1">
+                <toolbarbutton id="calendar-add-task-button"
+                               label="&calendar.newtask.button.label;"
+                               tooltiptext="&calendar.newtask.button.tooltip;"
+                               command="calendar_new_todo_command"/>
+                <hbox align="center" flex="1" class="input-container">
+                  <html:input id="view-task-edit-field"
+                              class="task-edit-field themeableSearchBox"
+                              onfocus="taskEdit.onFocus(event)"
+                              onblur="taskEdit.onBlur(event)"
+                              onkeypress="taskEdit.onKeyPress(event)"/>
+                </hbox>
+              </box>
+              <box align="center" flex="1">
+                <search-textbox id="task-text-filter-field"
+                                class="themeableSearchBox"
+                                flex="1"
+                                placeholder=""
+                                emptytextbase="&calendar.task.text-filter.textbox.emptytext.base1;"
+                                keyLabelNonMac="&calendar.task.text-filter.textbox.emptytext.keylabel.nonmac;"
+                                keyLabelMac="&calendar.task.text-filter.textbox.emptytext.keylabel.mac;"
+                                oncommand="taskViewUpdate();"/>
+              </box>
+            </hbox>
+            <vbox flex="1">
+              <tree is="calendar-task-tree" id="calendar-task-tree"
+                    flex="1"
+                    visible-columns="completed priority title entryDate dueDate"
+                    persist="visible-columns ordinals widths sort-active sort-direction height"
+                    context="taskitem-context-menu"/>
+              <splitter id="calendar-task-view-splitter" collapse="none" persist="state" class="calendar-splitter"/>
+              <vbox id="calendar-task-details-container"
+                    class="main-header-area"
+                    flex="1"
+                    persist="height"
+                    hidden="true">
+                <hbox id="calendar-task-details">
+                  <hbox id="other-actions-box">
+                    <vbox id="task-actions-toolbox">
+                      <hbox id="task-actions-toolbar" class="toolbar">
+                        <toolbarbutton id="task-actions-category"
+                                       type="menu"
+                                       label="&calendar.unifinder.tree.categories.label;"
+                                       tooltiptext="&calendar.task.category.button.tooltip;"
+                                       command="calendar_task_category_command"
+                                       class="toolbarbutton-1 msgHeaderView-button">
+                          <menupopup id="task-actions-category-popup"
+                                     onpopupshowing="taskDetailsView.loadCategories(event);"
+                                     onpopuphiding="return taskDetailsView.saveCategories(event);">
+                            <html:input id="task-actions-category-textbox"
+                                        placeholder="&event.categories.textbox.label;"
+                                        onblur="this.parentNode.removeAttribute(&quot;ignorekeys&quot;);"
+                                        onfocus="this.parentNode.setAttribute(&quot;ignorekeys&quot;, &quot;true&quot;);"
+                                        onkeypress="taskDetailsView.categoryTextboxKeypress(event);"/>
+                            <menuseparator/>
+                          </menupopup>
+                        </toolbarbutton>
+                        <toolbarbutton is="toolbarbutton-menu-button" id="task-actions-markcompleted"
+                                       type="menu-button"
+                                       label="&calendar.context.markcompleted.label;"
+                                       tooltiptext="&calendar.task.complete.button.tooltip;"
+                                       command="calendar_toggle_completed_command"
+                                       class="toolbarbutton-1 msgHeaderView-button">
+                          <menupopup is="calendar-task-progress-menupopup" id="task-actions-markcompleted-menupopup"/>
+                        </toolbarbutton>
+                        <toolbarbutton id="task-actions-priority"
+                                       type="menu"
+                                       label="&calendar.context.priority.label;"
+                                       tooltiptext="&calendar.task.priority.button.tooltip;"
+                                       command="calendar_general-priority_command"
+                                       class="toolbarbutton-1 msgHeaderView-button">
+                          <menupopup is="calendar-task-priority-menupopup" id="task-actions-priority-menupopup"/>
+                        </toolbarbutton>
+                        <toolbarbutton id="calendar-delete-task-button"
+                                       class="toolbarbutton-1 msgHeaderView-button"
+                                       label="&calendar.taskview.delete.label;"
+                                       tooltiptext="&calendar.context.deletetask.label;"
+                                       command="calendar_delete_todo_command"/>
+                      </hbox>
+                    </vbox>
+                  </hbox>
+                  <hbox id ="calendar-task-details-box">
+                    <html:table id="calendar-task-details-grid">
+                      <html:tr id="calendar-task-details-title-row"
+                               hidden="hidden">
+                        <html:th class="task-details-name">
+                          &calendar.task-details.title.label;
+                        </html:th>
+                        <html:td id="calendar-task-details-title"
+                                 class="task-details-value">
+                        </html:td>
+                      </html:tr>
+                      <html:tr id="calendar-task-details-priority-row"
+                               hidden="hidden">
+                        <html:th id="calendar-task-details-priority-label"
+                                 class="task-details-name">
+                          &calendar.task-details.priority.label;
+                        </html:th>
+                        <html:td id="calendar-task-details-priority-td">
+                          <label id="calendar-task-details-priority-low"
+                                 value="&calendar.task-details.priority.low.label;"
+                                 class="task-details-value"
+                                 hidden="true"/>
+                          <label id="calendar-task-details-priority-normal"
+                                 value="&calendar.task-details.priority.normal.label;"
+                                 class="task-details-value"
+                                 hidden="true"/>
+                          <label id="calendar-task-details-priority-high"
+                                 value="&calendar.task-details.priority.high.label;"
+                                 class="task-details-value"
+                                 hidden="true"/>
+                        </html:td>
+                      </html:tr>
+                      <html:tr id="calendar-task-details-organizer-row"
+                               hidden="hidden">
+                        <html:th class="task-details-name">
+                          &calendar.task-details.organizer.label;
+                        </html:th>
+                        <html:td id="calendar-task-details-organizer"
+                                 class="task-details-value text-link"
+                                 onclick="sendMailToOrganizer()">
+                        </html:td>
+                      </html:tr>
+                      <html:tr id="calendar-task-details-status-row"
+                               hidden="hidden">
+                        <html:th class="task-details-name">
+                          &calendar.task-details.status.label;
+                        </html:th>
+                        <html:td id="calendar-task-details-status"
+                                 class="task-details-value">
+                        </html:td>
+                      </html:tr>
+                      <html:tr id="calendar-task-details-category-row"
+                               hidden="hidden">
+                        <html:th class="task-details-name">
+                          &calendar.task-details.category.label;
+                        </html:th>
+                        <html:td id="calendar-task-details-category"
+                                 class="task-details-value">
+                        </html:td>
+                      </html:tr>
+                      <html:tr id="task-start-row"
+                               class="item-date-row"
+                               hidden="hidden">
+                        <html:th class="headline"
+                                 control="task-start-date">
+                          &calendar.task-details.start.label;
+                        </html:th>
+                        <html:td>
+                          <html:input is="calendar-item-date-input" id="task-start-date" mode="start"/>
+                        </html:td>
+                      </html:tr>
+                      <html:tr id="task-due-row"
+                               class="item-date-row"
+                               hidden="hidden">
+                        <html:th class="headline"
+                                 control="task-due-date">
+                          &calendar.task-details.due.label;
+                        </html:th>
+                        <html:td>
+                          <html:input is="calendar-item-date-input" id="task-due-date" mode="end"/>
+                        </html:td>
+                      </html:tr>
+                      <html:tr id="calendar-task-details-repeat-row"
+                               hidden="hidden">
+                        <html:th class="task-details-name">
+                          &calendar.task-details.repeat.label;
+                        </html:th>
+                        <html:td id="calendar-task-details-repeat"
+                                 class="task-details-value">
+                        </html:td>
+                      </html:tr>
+                    </html:table>
+                  </hbox>
+                </hbox>
+                <hbox id="calendar-task-details-description-wrapper" flex="1">
+                  <html:textarea id="calendar-task-details-description"/>
+                </hbox>
+                <hbox id="calendar-task-details-attachment-row"
+                      align="top"
+                      hidden="true">
+                  <hbox pack="end">
+                    <label value="&calendar.task-details.attachments.label;"
+                           class="task-details-name"/>
+                  </hbox>
+                  <vbox id="calendar-task-details-attachment-rows"
+                        align="top"
+                        flex="1"
+                        style="overflow: auto;"
+                        hidden="true">
+                  </vbox>
+                </hbox>
+              </vbox>
+            </vbox>
+          </vbox>
         </deck>
       </hbox>
     </vbox>
   </tabpanels>
 
   <!-- Today Pane -->
   <hbox id="tabmail-container">
     <splitter id="today-splitter"
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -14,17 +14,16 @@ lightning.jar:
 % overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/messenger-overlay-messageWindow.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/imip-bar-overlay.xul
 % overlay chrome://communicator/content/pref/preferences.xul chrome://lightning/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay about:addons chrome://lightning/content/suite-overlay-addons.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://mozapps/content/extensions/extensions.xul chrome://lightning/content/suite-overlay-addons.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://messenger/content/preferences/preferences.xul chrome://lightning/content/messenger-overlay-preferences.xul
 % overlay about:preferences chrome://lightning/content/messenger-overlay-preferences.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder.xul
-% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-task-view.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/suite-overlay-sidebar.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://calendar/content/calendarCreation.xul chrome://lightning/content/lightning-calendar-creation.xul
 % overlay chrome://lightning/content/lightning-calendar-creation.xul chrome://lightning/content/caldav-lightning-calendar-creation.xul
 % override chrome://lightning-common/skin/accountCentral.css chrome://lightning-common/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % content lightning %content/
     content/html-item-editing/lightning-item-iframe.html   (content/html-item-editing/lightning-item-iframe.html)
     content/html-item-editing/react-code.js                (content/html-item-editing/react-code.js)
     content/imip-bar.js                                    (content/imip-bar.js)