Bug 1608610 - Integrate lightning-item-panel.xhtml. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Mon, 13 Jan 2020 14:32:21 -0500
changeset 37225 8f7bf0b238cbd5d9d35a326443fd3d7e4661032b
parent 37224 1fa6810ac522dd414cddf26937113a14599674c3
child 37226 dca41d3769966fa8c3a4286240ef7bfa0fc78cf7
push id2552
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:24:16 +0000
treeherdercomm-beta@f95a6f4408a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1608610
Bug 1608610 - Integrate lightning-item-panel.xhtml. r=Fallen
calendar/lightning/content/lightning-item-panel.inc.xhtml
calendar/lightning/content/lightning-item-panel.xhtml
calendar/lightning/content/messenger-overlay-sidebar.xhtml
calendar/lightning/jar.mn
mail/base/content/messenger.xhtml
rename from calendar/lightning/content/lightning-item-panel.xhtml
rename to calendar/lightning/content/lightning-item-panel.inc.xhtml
--- a/calendar/lightning/content/lightning-item-panel.xhtml
+++ b/calendar/lightning/content/lightning-item-panel.inc.xhtml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
+# 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/.
 
-<!-- lightning-toolbar.dtd is only needed for the app menu button -->
-<!DOCTYPE overlay [
-    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-    <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
-    <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
-    <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
-    <!ENTITY % toolbarDTD SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd">
-    %brandDTD;
-    %globalDTD;
-    %calendarDTD;
-    %eventDialogDTD;
-    %toolbarDTD;
-]>
+# This file requires the following localization files:
+# chrome://calendar/locale/global.dtd
+# chrome://calendar/locale/calendar.dtd
+# chrome://calendar/locale/calendar-event-dialog.dtd
+# chrome://lightning/locale/lightning-toolbar.dtd
 
-<overlay id="ltnCalendarItemPanelContentOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-
-  <tabpanels id="tabpanelcontainer">
     <vbox id="lightningItemPanel" collapsed="true">
 
       <!-- The id of the inner vbox and the iframe are set dynamically
            when a tab is created. -->
       <vbox flex="1"
             id="dummy-calendar-event-dialog-tab"
             class="calendar-event-dialog-tab">
 
@@ -144,22 +131,8 @@
                    context="event-dialog-toolbar-context-menu"
                    defaultset="button-saveandclose,button-attendees,button-privacy,button-url,button-priority,button-status,button-freebusy,button-delete,spring,calendar-item-appmenu-button"/>
         </toolbox>
 
         <iframe id="lightning-item-panel-iframe" flex="1"/>
 
       </vbox>
     </vbox>
-  </tabpanels>
-
-  <popupset id="calendar-popupset">
-    <menupopup id="event-dialog-toolbar-context-menu"
-               onpopupshowing="onToolbarsPopupShowingForTabType(event);">
-      <menuseparator id="customizeEventToolbarMenuSeparator"/>
-      <menuitem id="CustomizeDialogToolbar"
-                label="&event.menu.view.toolbars.customize.label;"
-                command="cmd_customize"/>
-    </menupopup>
-  </popupset>
-
-</overlay>
-
--- a/calendar/lightning/content/messenger-overlay-sidebar.xhtml
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xhtml
@@ -1057,16 +1057,25 @@
 
       <!-- TASKVIEW LINK CONTEXT MENU -->
       <menupopup id="taskview-link-context-menu">
         <menuitem id="taskview-link-context-menu-copy"
                   label="&calendar.copylink.label;"
                   accesskey="&calendar.copylink.accesskey;"
                   oncommand="taskViewCopyLink(document.popupNode)"/>
       </menupopup>
+
+      <!-- CALENDAR EVENT DIALOG (IN TAB) TOOLBAR CONTEXT MENU -->
+      <menupopup id="event-dialog-toolbar-context-menu"
+                 onpopupshowing="onToolbarsPopupShowingForTabType(event);">
+        <menuseparator id="customizeEventToolbarMenuSeparator"/>
+        <menuitem id="CustomizeDialogToolbar"
+                  label="&event.menu.view.toolbars.customize.label;"
+                  command="cmd_customize"/>
+      </menupopup>
     </popupset>
   </window>
 
   <toolbar id="tabbar-toolbar">
     <toolbarbutton id="calendar-tab-button"
                    class="toolbarbutton-1"
                    title="&lightning.toolbar.calendar.label;"
                    tooltiptext="&lightning.toolbar.calendar.tooltip;"
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -1,17 +1,16 @@
 #filter substitution
 # 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/.
 
 lightning.jar:
 % override chrome://messagebody/skin/imip.css chrome://lightning/skin/imip.css
 % override chrome://messagebody/skin/calendar-event-dialog-attendees.png chrome://calendar-common/skin/calendar-event-dialog-attendees.png
-% overlay chrome://messenger/content/messenger.xhtml chrome://lightning/content/lightning-item-panel.xhtml
 % overlay chrome://messenger/content/messenger.xhtml chrome://lightning/content/messenger-overlay-sidebar.xhtml
 % overlay chrome://messenger/content/messageWindow.xhtml chrome://lightning/content/imip-bar-overlay.xhtml
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xhtml chrome://lightning/content/imip-bar-overlay.xhtml
 % overlay chrome://communicator/content/pref/preferences.xhtml chrome://lightning/content/suite-overlay-preferences.xhtml application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay about:addons chrome://lightning/content/suite-overlay-addons.xhtml application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://mozapps/content/extensions/extensions.xhtml chrome://lightning/content/suite-overlay-addons.xhtml application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://messenger/content/preferences/preferences.xhtml chrome://lightning/content/messenger-overlay-preferences.xhtml
 % overlay about:preferences chrome://lightning/content/messenger-overlay-preferences.xhtml
@@ -20,17 +19,17 @@ lightning.jar:
 % 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)
     content/imip-bar-overlay.xhtml                         (content/imip-bar-overlay.xhtml)
     content/lightning-calendar-creation.js                 (content/lightning-calendar-creation.js)
     content/lightning-calendar-properties.js               (content/lightning-calendar-properties.js)
     content/lightning-invitation.xhtml                     (content/lightning-invitation.xhtml)
-*   content/lightning-item-panel.xhtml                     (content/lightning-item-panel.xhtml)
+*   content/lightning-item-panel.inc.xhtml                 (content/lightning-item-panel.inc.xhtml)
     content/lightning-item-panel.js                        (content/lightning-item-panel.js)
     content/lightning-item-iframe.xhtml                    (content/lightning-item-iframe.xhtml)
     content/lightning-item-iframe.js                       (content/lightning-item-iframe.js)
     content/lightning-utils.js                             (content/lightning-utils.js)
     content/messenger-overlay-sidebar.js                   (content/messenger-overlay-sidebar.js)
     content/messenger-overlay-sidebar.xhtml                (content/messenger-overlay-sidebar.xhtml)
     content/messenger-overlay-preferences.js               (content/messenger-overlay-preferences.js)
 *   content/messenger-overlay-preferences.xhtml            (content/messenger-overlay-preferences.xhtml)
--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@@ -56,16 +56,24 @@
 <!ENTITY % msgReadSMIMEDTD SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
 %msgReadSMIMEDTD;
 #ifdef MOZ_OPENPGP
 <!ENTITY % bondOpenPGPDTD SYSTEM "chrome://openpgp/content/strings/bond.dtd">
 %bondOpenPGPDTD;
 #endif
 <!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
 %msgViewPickerDTD;
+<!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+%globalDTD;
+<!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
+%calendarDTD;
+<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
+%eventDialogDTD;
+<!ENTITY % toolbarDTD SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd">
+%toolbarDTD;
 ]>
 
 <!--
   - The 'what you think of when you think of thunderbird' window;
   -  3-pane view inside of tabs.
   -->
 <window id="messengerWindow"
         xmlns:html="http://www.w3.org/1999/xhtml"
@@ -675,16 +683,17 @@
                 <hbox id="messenger-notification-footer">
                   <!-- notificationbox will be added here lazily. -->
                 </hbox>
               </box>
             </vbox>
           </box>
         </box> <!-- end of mailContent -->
 #include ../../components/im/content/chat-messenger.inc.xhtml
+#include ../../../calendar/lightning/content/lightning-item-panel.inc.xhtml
       </tabpanels>
      </tabbox>
     </tabmail>
     <vbox id="contentTab" collapsed="true">
       <vbox flex="1" class="contentTabInstance">
         <vbox id="dummycontenttoolbox" class="contentTabToolbox">
           <hbox id="dummycontenttoolbar" class="contentTabToolbar">
             <toolbarbutton class="back-btn nav-button"