Bug 1608610 - Integrate messenger-overlay-accountCentral.xhtml. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Mon, 13 Jan 2020 11:50:24 -0500
changeset 37223 8d524b01c605ad4acba95b5924842fbe60e06c94
parent 37222 50ae36bb50fdd97b9f8efd795f5c5be12130abd0
child 37224 1fa6810ac522dd414cddf26937113a14599674c3
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 messenger-overlay-accountCentral.xhtml. r=Fallen
calendar/lightning/content/messenger-overlay-accountCentral.xhtml
calendar/lightning/jar.mn
mailnews/base/content/msgAccountCentral.xhtml
deleted file mode 100644
--- a/calendar/lightning/content/messenger-overlay-accountCentral.xhtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/. -->
-
-<!DOCTYPE overlay [
-  <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %lightningDTD;
-  %globalDTD;
-]>
-
-<?xml-stylesheet href="chrome://lightning-common/skin/accountCentral.css" type="text/css"?>
-
-<overlay id="calendar-list-overlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <rows id="acctCentralRows">
-    <spacer id="lightning-newCalendar-separator"
-            flex="1"
-            insertbefore="AccountsSection.spacer"/>
-    <row id="lightning-newCalendar-row"
-         class="acctCentralRow"
-         insertbefore="AccountsSection.spacer">
-      <hbox>
-        <label class="acctCentralText acctCentralLinkText"
-               value="&lightning.acctCentral.newCalendar.label;"
-               onclick="window.parent.cal.window.openCalendarWizard(window);"/>
-      </hbox>
-    </row>
-  </rows>
-</overlay>
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -2,17 +2,16 @@
 # 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/msgAccountCentral.xhtml chrome://lightning/content/messenger-overlay-accountCentral.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://messenger/content/messageWindow.xhtml chrome://lightning/content/messenger-overlay-messageWindow.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
@@ -27,17 +26,16 @@ lightning.jar:
     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.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-accountCentral.xhtml         (content/messenger-overlay-accountCentral.xhtml)
     content/messenger-overlay-messageWindow.xhtml          (content/messenger-overlay-messageWindow.xhtml)
     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)
 #ifdef MOZ_SUITE
     content/suite-overlay-addons.xhtml                     (content/suite-overlay-addons.xhtml)
     content/suite-overlay-preferences.xhtml                (content/suite-overlay-preferences.xhtml)
--- a/mailnews/base/content/msgAccountCentral.xhtml
+++ b/mailnews/base/content/msgAccountCentral.xhtml
@@ -1,22 +1,25 @@
 <?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 href="chrome://messenger/skin/accountCentral.css" type="text/css"?>
+<?xml-stylesheet href="chrome://lightning-common/skin/accountCentral.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
    %brandDTD;
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
    %globalDTD;
   <!ENTITY % acctCentralDTD SYSTEM "chrome://messenger/locale/msgAccountCentral.dtd">
    %acctCentralDTD;
+  <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
+   %lightningDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="OnInit();">
 
   <stringbundle id="bundle_brand"
                 src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_messenger"
@@ -178,16 +181,25 @@
                  value="&movemail.label;"
                  chromedir="&locale.dir;"
                  onclick="CreateNewAccountTB('movemail');"/>
 #endif
         </vbox>
       </hbox>
 #endif
 
+      <spacer id="calendar-newCalendar-separator" flex="1"/>
+      <hbox id="calendar-newCalendar-row" class="acctCentralRow">
+        <hbox>
+          <label class="acctCentralText acctCentralLinkText"
+                 value="&lightning.acctCentral.newCalendar.label;"
+                 onclick="window.parent.cal.window.openCalendarWizard(window);"/>
+        </hbox>
+      </hbox>
+
       <spacer id="accountsSectionSpacer" class="big" flex="5" collapsed="true"/>
 
       <hbox id="advancedFeaturesHeader" class="acctCentralTitleRow" collapsed="true">
         <hbox class="acctCentralRowTitleBox" flex="1">
           <description>&advFeaturesSectionHdr.label;</description>
         </hbox>
       </hbox>