Bug 1608610 - Inline calendar tab bar buttons into messenger.xhtml. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Tue, 14 Jan 2020 12:13:47 -0500
changeset 38113 1331b8f4fdfbca172f68df2d9412c908dd299843
parent 38112 b959058157bc2fb2029ab22fc82e7920d01c9ab9
child 38114 e397711a34f577f729d0d65df7cfedb69f97d08c
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersFallen
bugs1608610
Bug 1608610 - Inline calendar tab bar buttons into messenger.xhtml. r=Fallen
calendar/lightning/content/messenger-overlay-sidebar.xhtml
mail/base/content/messenger.xhtml
--- a/calendar/lightning/content/messenger-overlay-sidebar.xhtml
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xhtml
@@ -4,29 +4,16 @@
    - 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/. -->
 
 <overlay id="ltnSidebarOverlay"
          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">
 
-  <toolbar id="tabbar-toolbar">
-    <toolbarbutton id="calendar-tab-button"
-                   class="toolbarbutton-1"
-                   title="&lightning.toolbar.calendar.label;"
-                   tooltiptext="&lightning.toolbar.calendar.tooltip;"
-                   command="new_calendar_tab"/>
-    <toolbarbutton id="task-tab-button"
-                   class="toolbarbutton-1"
-                   title="&lightning.toolbar.task.label;"
-                   tooltiptext="&lightning.toolbar.task.tooltip;"
-                   command="new_task_tab"/>
-  </toolbar>
-
   <tabpanels id="tabpanelcontainer">
     <vbox id="calendarTabPanel">
       <!-- Unfortunately we use the same panel for task and calendar tabs, so
            we need to show one toolbar or the other. -->
       <calendar-modevbox id="calendar-toolbox-container"
                          mode="calendar">
         <toolbox id="calendar-toolbox"
                  class="mail-toolbox"
--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@@ -581,17 +581,29 @@
 #endif
       </box>
 
       <toolbar is="customizable-toolbar" id="tabbar-toolbar" toolboxid="mail-toolbox"
                context="toolbar-context-menu"
                customizable="true"
                mode="icons" defaultmode="icons" lockmode="true"
                iconsize="small" defaulticonsize="small" lockiconsize="true"
-               defaultset=""/>
+               defaultset="">
+        <!-- CALENDAR TAB BAR BUTTONS -->
+        <toolbarbutton id="calendar-tab-button"
+                       class="toolbarbutton-1"
+                       title="&lightning.toolbar.calendar.label;"
+                       tooltiptext="&lightning.toolbar.calendar.tooltip;"
+                       command="new_calendar_tab"/>
+        <toolbarbutton id="task-tab-button"
+                       class="toolbarbutton-1"
+                       title="&lightning.toolbar.task.label;"
+                       tooltiptext="&lightning.toolbar.task.tooltip;"
+                       command="new_task_tab"/>
+      </toolbar>
 
       <toolbarbutton class="toolbarbutton-1 tabs-alltabs-button"
                      id="alltabs-button"
                      type="menu"
                      hidden="true"
                      tooltiptext="&listAllTabs.label;">
         <menupopup is="tabmail-alltabs-menupopup" id="alltabs-popup"
                    position="after_end"