bug 369920 iMIP bar not displayed in standalone message window r=lilmatt

calendar/lightning/chrome.manifest

@@ -2,6 +2,8 @@ content lightning	jar:chrome/lightning.jar!/content/lightning/
 locale  lightning en-US jar:chrome/lightning-en-US.jar!/locale/en-US/lightning/
 overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-migration.xul
 overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul
+overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/imip-bar-overlay.xul
+overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/imip-bar-overlay.xul
 overlay chrome://messenger/content/preferences/preferences.xul chrome://lightning/content/messenger-overlay-preferences.xul
 overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/alarms.xul
 overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/categories.xul

calendar/lightning/content/imip-bar-overlay.xul

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Simdesk Technologies code.
+   -
+   - The Initial Developer of the Original Code is Simdesk Technologies.
+   - Portions created by the Initial Developer are Copyright (C) 2007
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Clint Talbert <ctalbert.moz@gmail.com>
+   -   Matthew Willis <lilmatt@mozilla.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay [
+    <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
+    %lightningDTD;
+]>
+
+<!-- Use the Thunderbird Notification bar style for our iMIP warning -->
+<?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
+
+<?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
+
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <script type="application/x-javascript"
+            src="chrome://lightning/content/lightning-utils.js"/>
+    <script type="application/x-javascript"
+            src="chrome://lightning/content/imip-bar.js"/>
+
+    <vbox id="messagepanebox">
+        <hbox id="imip-bar" collapsed="true" insertbefore="msgHeaderView">
+            <hbox id="imipNotificationBar"
+                  class="imipBar"
+                  align="center"
+                  flex="1">
+                <image id="imipNotificationImage"/>
+                <description id="imip-description"
+                             class="msgNotificationBarText"
+                             flex="1">
+                    &lightning.imipbar.description;
+                </description>
+                <spacer flex="1"/>
+                <button id="imip-button1" align="center" pack="end"/>
+                <button id="imip-button2" align="center" pack="end" hidden="true"/>
+            </hbox>
+        </hbox>
+    </vbox>
+</overlay>

calendar/lightning/content/imip-bar.js

@@ -106,8 +106,8 @@ function imipOnLoad()
     gMessageListeners.push(listener);
 
     // Set up our observers
-    var observerSvc = Cc["@mozilla.org/observer-service;1"].
+    var observerSvc = Components.classes["@mozilla.org/observer-service;1"]
-                      getService(Ci.nsIObserverService);
+                                .getService(Components.interfaces.nsIObserverService);
     observerSvc.addObserver(onItipItem, "onItipItemCreation", false);
 }
 
@@ -116,8 +116,8 @@ function imipOnUnload()
     removeEventListener("messagepane-loaded", imipOnLoad, true);
     removeEventListener("messagepane-unloaded", imipOnUnload, true);
 
-    var observerSvc = Cc["@mozilla.org/observer-service;1"].
+    var observerSvc = Components.classes["@mozilla.org/observer-service;1"]
-                      getService(Ci.nsIObserverService);
+                                .getService(Components.interfaces.nsIObserverService);
     observerSvc.removeObserver(onItipItem, "onItipItemCreation");
 
     gItipItem = null;
@@ -204,8 +204,8 @@ function getMsgRecipient()
         recipientList = recipientList.split(" ").join("");
         recipientList = recipientList.split(",");
 
-        var emailSvc = Cc["@mozilla.org/calendar/itip-transport;1?type=email"].
+        var emailSvc = Components.classes["@mozilla.org/calendar/itip-transport;1?type=email"]
-                       getService(Ci.calIItipTransport);
+                                 .getService(Components.interfaces.calIItipTransport);
         var me = emailSvc.defaultIdentity;
 
         var lt;
@@ -234,8 +234,8 @@ function getMsgRecipient()
  */
 function getTargetCalendar()
 {
-    var calMgr = Cc["@mozilla.org/calendar/manager;1"].
+    var calMgr = Components.classes["@mozilla.org/calendar/manager;1"]
-                 getService(Ci.calICalendarManager);
+                           .getService(Components.interfaces.calICalendarManager);
     var cals = calMgr.getCalendars({});
     return cals[0];
 }
@@ -298,8 +298,8 @@ function doResponse(aLocalStatus)
         gItipItem.localStatus = aLocalStatus;
     }
 
-    var itipProc = Cc["@mozilla.org/calendar/itip-processor;1"].
+    var itipProc = Components.classes["@mozilla.org/calendar/itip-processor;1"]
-                   createInstance(Ci.calIItipProcessor);
+                             .createInstance(Components.interfaces.calIItipProcessor);
 
     itipProc.processItipItem(gItipItem, operationListener);
 }

calendar/lightning/content/messenger-overlay-sidebar.xul

@@ -48,11 +48,6 @@
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd3;
 ]>
 
-<!-- This is used so that we can reuse the Thunderbird Notification bar style
-   - for our iMIP warning -->
-<?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
-
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/content/calendar-view-bindings.css" type="text/css"?>
@@ -74,7 +69,6 @@
 <script type="application/x-javascript" src="chrome://lightning/content/calendar-management.js"/>
 <script type="application/x-javascript" src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
 <script type="application/x-javascript" src="chrome://calendar/content/calendar-views.js"/>
-<script type="application/x-javascript" src="chrome://lightning/content/imip-bar.js"/>
 <script type="application/x-javascript" src="chrome://calendar/content/clipboard.js"/>
 <window id="messengerWindow">
   <commandset id="calendar_commands">
@@ -213,24 +207,7 @@
   </deck>
 </deck>
 
-<vbox id="messagepanebox">
+<vbox id="messagepanebox"/>
-  <hbox id="imip-bar" collapsed="true" insertbefore="msgHeaderView">
-    <hbox id="imipNotificationBar"
-          align="center"
-          flex="1">
-      <image id="imipNotificationImage"/>
-      <description id="imip-description"
-                   class="msgNotificationBarText"
-                   flex="1">
-        &lightning.imipbar.description;
-      </description>
-      <spacer flex="1"/>
-      <button id="imip-button1" align="center" pack="end"/>
-      <button id="imip-button2" align="center" pack="end" hidden="true"/>
-    </hbox>
-  </hbox>
-</vbox>
-
 </overlay>
 
 <!-- -*- Mode: xml; sgml-ident-step: 2; indent-tabs-mode: nil; -*- -->

calendar/lightning/jar.mn

@@ -16,6 +16,7 @@ lightning.jar:
   content/lightning/calendar-todo-list.css		(content/calendar-todo-list.css)
   content/lightning/calendar-todo-list.xml		(content/calendar-todo-list.xml)
   content/lightning/toolkit-overlay-custombar.xul       (content/toolkit-overlay-custombar.xul)
+  content/lightning/imip-bar-overlay.xul                (content/imip-bar-overlay.xul)
   content/lightning/imip-bar.js                         (content/imip-bar.js)
   content/lightning/sun-messenger-overlay-sidebar.xul	(/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.xul)
   content/lightning/sun-messenger-overlay-sidebar.js	(/calendar/prototypes/wcap/sun-messenger-overlay-sidebar.js)

calendar/lightning/themes/pinstripe/lightning.css

@@ -160,14 +160,11 @@ radio[pane=paneLightning] {
  */
 #imipNotificationImage {
     list-style-image: url("chrome://calendar/skin/cal-icon32.png");
-    -moz-image-region: rect(0px, 32px, 32px, 0px);
+    margin-right: 8px;
 }
 
 #imipNotificationBar {
-    border: 1px solid #87bbcc;
-    -moz-border-radius: 7px;
     background-color: #baeeff;
-    padding: 3px 6px 4px 6px;
+    padding: 6px 8px;
-    margin: 6px 6px 0px 6px;
     color: black;
 }