Bug 762513 - Merge abCardViewOverlay.xul into addressbook.xul r/moa=Mnyromyr
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 12 Jul 2012 22:15:42 +0100
changeset 10642 cf074c127ab9bfe21769ee8448a88df6b4a10e43
parent 10641 175f81ed0caa3e1aee2d69e632f8621adfa1f5e2
child 10643 47a3e05561568368957b6d82e97e39c3008b0f11
push id8032
push useriann_cvs@blueyonder.co.uk
push dateThu, 12 Jul 2012 21:15:56 +0000
treeherdercomm-central@47a3e0556156 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs762513
Bug 762513 - Merge abCardViewOverlay.xul into addressbook.xul r/moa=Mnyromyr
suite/locales/en-US/chrome/mailnews/addressbook/abCardViewOverlay.dtd
suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
suite/locales/jar.mn
suite/mailnews/addrbook/abCardViewOverlay.js
suite/mailnews/addrbook/abCardViewOverlay.xul
suite/mailnews/addrbook/addressbook.xul
suite/mailnews/jar.mn
deleted file mode 100644
--- a/suite/locales/en-US/chrome/mailnews/addressbook/abCardViewOverlay.dtd
+++ /dev/null
@@ -1,17 +0,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/. -->
-
-<!-- Box Headings -->
-<!ENTITY contact.heading             "Contact">
-<!ENTITY home.heading                "Home">
-<!ENTITY other.heading               "Other">
-<!ENTITY phone.heading               "Phone">
-<!ENTITY work.heading                "Work">
-<!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading         "Description">
-<!ENTITY addresses.heading           "Addresses">
-<!-- For Map It! -->
-<!ENTITY mapItButton.label           "Get Map">
-<!ENTITY mapIt.tooltip               "Display a map of this address from the Web">
-
--- a/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -93,14 +93,28 @@
 <!ENTITY newIM.tooltip                                  "Send an instant message or chat"> 
 <!ENTITY deleteItemButton.tooltip                       "Delete selected item">
 <!ENTITY throbber.tooltip                               "Go to the &vendorShortName; home page">
 <!ENTITY advancedButton.tooltip                         "Advanced address search">
 
 <!-- Dir Tree header -->
 <!ENTITY dirTreeHeader.label                            "Address Books">
 
+<!-- Card Summary Pane -->
+<!-- Box Headings -->
+<!ENTITY contact.heading                                "Contact">
+<!ENTITY home.heading                                   "Home">
+<!ENTITY other.heading                                  "Other">
+<!ENTITY phone.heading                                  "Phone">
+<!ENTITY work.heading                                   "Work">
+<!-- Special Box Headings, for mailing lists -->
+<!ENTITY description.heading                            "Description">
+<!ENTITY addresses.heading                              "Addresses">
+<!-- For Map It! -->
+<!ENTITY mapItButton.label                              "Get Map">
+<!ENTITY mapIt.tooltip                                  "Display a map of this address from the Web">
+
 <!-- Status Bar -->  
 <!ENTITY statusText.label                               "">
 
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY  hideSwapFnLnUI                                "true">
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -214,17 +214,16 @@
   locale/@AB_CD@/communicator-platform/win/platformCommunicatorOverlay.dtd  (%chrome/common/win/platformCommunicatorOverlay.dtd)
   locale/@AB_CD@/communicator-platform/unix/platformCommunicatorOverlay.dtd (%chrome/common/unix/platformCommunicatorOverlay.dtd)
   locale/@AB_CD@/communicator-platform/mac/platformCommunicatorOverlay.dtd  (%chrome/common/mac/platformCommunicatorOverlay.dtd)
   locale/@AB_CD@/communicator-region/region.properties                      (%chrome/common/region.properties)
   locale/@AB_CD@/messenger/AccountManager.dtd                               (%chrome/mailnews/pref/AccountManager.dtd)
   locale/@AB_CD@/messenger/AccountWizard.dtd                                (%chrome/mailnews/pref/AccountWizard.dtd)
   locale/@AB_CD@/messenger/addressbook/abAddressBookNameDialog.dtd          (%chrome/mailnews/addressbook/abAddressBookNameDialog.dtd)
   locale/@AB_CD@/messenger/addressbook/abCardOverlay.dtd                    (%chrome/mailnews/addressbook/abCardOverlay.dtd)
-  locale/@AB_CD@/messenger/addressbook/abCardViewOverlay.dtd                (%chrome/mailnews/addressbook/abCardViewOverlay.dtd)
   locale/@AB_CD@/messenger/addressbook/abMailListDialog.dtd                 (%chrome/mailnews/addressbook/abMailListDialog.dtd)
   locale/@AB_CD@/messenger/addressbook/abMainWindow.dtd                     (%chrome/mailnews/addressbook/abMainWindow.dtd)
   locale/@AB_CD@/messenger/addressbook/abNewCardDialog.dtd                  (%chrome/mailnews/addressbook/abNewCardDialog.dtd)
   locale/@AB_CD@/messenger/addressbook/abResultsPaneOverlay.dtd             (%chrome/mailnews/addressbook/abResultsPaneOverlay.dtd)
   locale/@AB_CD@/messenger/addressbook/abSelectAddressesDialog.dtd          (%chrome/mailnews/addressbook/abSelectAddressesDialog.dtd)
   locale/@AB_CD@/messenger/addressbook/addressBook.properties               (%chrome/mailnews/addressbook/addressBook.properties)
   locale/@AB_CD@/messenger/addressbook/ldapAutoCompErrs.properties          (%chrome/mailnews/addressbook/ldapAutoCompErrs.properties)
   locale/@AB_CD@/messenger/addressbook/pref-addressing.dtd                  (%chrome/mailnews/pref/pref-addressing.dtd)
--- a/suite/mailnews/addrbook/abCardViewOverlay.js
+++ b/suite/mailnews/addrbook/abCardViewOverlay.js
@@ -6,17 +6,17 @@
 //NOTE: gAddressBookBundle must be defined and set or this Overlay won't work
 
 var gPrefs = Components.classes["@mozilla.org/preferences-service;1"];
 gPrefs = gPrefs.getService();
 gPrefs = gPrefs.QueryInterface(Components.interfaces.nsIPrefBranch);
 
 var gProfileDirURL;
 
-var gMapItURLFormat = GetLocalizedStringPref("mail.addr_book.mapit_url.format");
+var gMapItURLFormat;
 
 var gFileHandler = Services.io.getProtocolHandler("file").QueryInterface(Components.interfaces.nsIFileProtocolHandler);
 var gPhotoDisplayHandlers = {};
 
 var zListName;
 var zPrimaryEmail;
 var zSecondaryEmail;
 var zScreenName;
@@ -32,16 +32,18 @@ var zCustom1;
 var zCustom2;
 var zCustom3;
 var zCustom4;
 
 var cvData;
 
 function OnLoadCardView()
 {
+  gMapItURLFormat = GetLocalizedStringPref("mail.addr_book.mapit_url.format");
+
   zPrimaryEmail = gAddressBookBundle.getString("propertyPrimaryEmail");
   zSecondaryEmail = gAddressBookBundle.getString("propertySecondaryEmail");
   zScreenName = gAddressBookBundle.getString("propertyScreenName");
   zNickname = gAddressBookBundle.getString("propertyNickname");
   zDisplayName = gAddressBookBundle.getString("propertyDisplayName");
   zListName = gAddressBookBundle.getString("propertyListName");
   zWork = gAddressBookBundle.getString("propertyWork");
   zHome = gAddressBookBundle.getString("propertyHome");
deleted file mode 100644
--- a/suite/mailnews/addrbook/abCardViewOverlay.xul
+++ /dev/null
@@ -1,136 +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/. -->
-
-<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abCardViewOverlay.dtd">
-
-<overlay xmlns:html="http://www.w3.org/1999/xhtml"
-     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
-
-  <vbox id="CardViewBox" flex="1">
-  
-  <vbox id="CardViewInnerBox" collapsed="true" flex="1">
-    
-    <description id="CardTitle"/>
-
-    <hbox style="width:100%" flex="1">
-      <vbox id="cvbPhoto" class="cardViewGroup">
-        <hbox style="min-width: 10ch; max-width: 10ch;">
-          <spacer flex="1"/>
-          <html:img align="center" src="" id="cvPhoto"
-            style="max-width: 10ch; max-height: 10ch; min-width: 1ch; display: block"/>
-          <spacer flex="1"/>
-        </hbox>
-      </vbox>
-      <vbox flex="1">
-        <vbox id="cvbContact" class="cardViewGroup">
-            <description class="CardViewHeading" id="cvhContact">&contact.heading;</description>          
-
-            <description class="CardViewLink" id="cvListNameBox">
-              <html:p><html:a href="" id="cvListName"/></html:p>
-            </description>
-
-            <description class="CardViewText" id="cvDisplayName"/>
-
-            <description class="CardViewText" id="cvNickname"/>
-
-            <description class="CardViewLink" id="cvEmail1Box">
-              <html:a href="" id="cvEmail1"/>
-            </description>
-
-            <description class="CardViewLink" id="cvEmail2Box">
-              <html:a href="" id="cvEmail2"/>
-            </description>
-            <description class="CardViewLink" id="cvScreennameBox">
-              <html:a href="" id="cvScreenname"/>
-            </description>
-        </vbox>
-        
-        <vbox id="cvbHome" class="cardViewGroup">
-          <description class="CardViewHeading" id="cvhHome">&home.heading;</description>          
-          <hbox>
-            <vbox flex="1">
-              <description class="CardViewText" id="cvHomeAddress"/>
-              <description class="CardViewText" id="cvHomeAddress2"/>
-              <description class="CardViewText" id="cvHomeCityStZip"/>
-              <description class="CardViewText" id="cvHomeCountry"/>
-            </vbox>
-            <vbox id="cvbHomeMapItBox" pack="end">
-              <button id="cvHomeMapIt" url="" label="&mapItButton.label;" oncommand="MapIt('cvHomeMapIt');" tooltiptext="&mapIt.tooltip;"/>
-            </vbox>
-          </hbox>
-          <description class="CardViewLink" id="cvHomeWebPageBox">
-            <html:a onclick="return openLink(event);" href="" id="cvHomeWebPage"/>
-          </description>
-        </vbox>
-
-        <vbox id="cvbOther" class="cardViewGroup">
-          <description class="CardViewHeading" id="cvhOther">&other.heading;</description>
-          <description class="CardViewText" id="cvBirthday"/>
-          <description class="CardViewText" id="cvCustom1"/>
-          <description class="CardViewText" id="cvCustom2"/>
-          <description class="CardViewText" id="cvCustom3"/>
-          <description class="CardViewText" id="cvCustom4"/>
-          <description class="CardViewText" id="cvNotes" style="white-space: pre-wrap;"/>
-
-          <hbox>
-            <image id="cvBuddyIcon"/> 
-          </hbox>
-        </vbox>
-
-        <vbox id="cvbDescription" class="cardViewGroup">
-          <description class="CardViewHeading" id="cvhDescription">&description.heading;</description>
-          <description class="CardViewText" id="cvDescription"/>
-        </vbox>
-
-        <vbox id="cvbAddresses" class="cardViewGroup">
-          <description class="CardViewHeading" id="cvhAddresses">&addresses.heading;</description>
-          <vbox id="cvAddresses"/>                                                                                             
-        </vbox>
-      </vbox>
-      
-      <spacer style="width:20px"/>
-
-      <vbox flex="1">
-        <vbox id="cvbPhone" class="cardViewGroup">
-          <description class="CardViewHeading" id="cvhPhone">&phone.heading;</description>
-          <description class="CardViewText" id="cvPhWork"/>
-          <description class="CardViewText" id="cvPhHome"/>
-          <description class="CardViewText" id="cvPhFax"/>
-          <description class="CardViewText" id="cvPhCellular"/>
-          <description class="CardViewText" id="cvPhPager"/>
-        </vbox>
-        
-        <vbox id="cvbWork" class="cardViewGroup">
-          <description class="CardViewHeading" id="cvhWork">&work.heading;</description>
-          <description class="CardViewText" id="cvJobTitle"/>
-          <description class="CardViewText" id="cvDepartment"/>
-          <description class="CardViewText" id="cvCompany"/>
-          <hbox>
-            <vbox flex="1">
-              <description class="CardViewText" id="cvWorkAddress"/>
-              <description class="CardViewText" id="cvWorkAddress2"/>
-              <description class="CardViewText" id="cvWorkCityStZip"/>
-              <description class="CardViewText" id="cvWorkCountry"/>
-            </vbox>
-            <vbox id="cvbWorkMapItBox" pack="end">
-              <button id="cvWorkMapIt" url="" label="&mapItButton.label;" oncommand="MapIt('cvWorkMapIt');" tooltiptext="&mapIt.tooltip;"/>
-            </vbox>
-          </hbox>
-          <description class="CardViewLink" id="cvWorkWebPageBox">
-            <html:a onclick="return openLink(event);" href="" id="cvWorkWebPage"/>
-          </description>
-        </vbox>
-      </vbox>
-
-    </hbox>
-
-  </vbox>
-
-</vbox>
-
-</overlay>
--- a/suite/mailnews/addrbook/addressbook.xul
+++ b/suite/mailnews/addrbook/addressbook.xul
@@ -6,17 +6,16 @@
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressPanes.css"
                  type="text/css"?>
 
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/addressbook/abResultsPaneOverlay.xul"?>
-<?xul-overlay href="chrome://messenger/content/addressbook/abCardViewOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/platformMailOverlay.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % abMainWindowDTD SYSTEM "chrome://messenger/locale/addressbook/abMainWindow.dtd" >
 %abMainWindowDTD;
 <!ENTITY % abResultsPaneOverlayDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd" >
 %abResultsPaneOverlayDTD;
 <!ENTITY % mailOverlayDTD SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
@@ -24,16 +23,17 @@
 <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
 %messengerDTD;
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:html="http://www.w3.org/1999/xhtml"
     id="addressbookWindow"
     height="450"
     width="750"
     title="&addressbookWindow.title;"
     lightweightthemes="true"
     lightweightthemesfooter="status-bar"
     windowtype="mail:addressbook"
     macanimationtype="document"
@@ -52,16 +52,17 @@
 <script type="application/javascript" src="chrome://messenger/content/addressbook/abTrees.js"/>
 <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
 <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
 <script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
 <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
 <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
 <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
 <script type="application/javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
 
   <commandset id="addressBook">
     <commandset id="CommandUpdate_AddressBook"
                 commandupdater="true"
                 events="focus,addrbook-select"
                 oncommandupdate="CommandUpdate_AddressBook()"/>
     <commandset id="selectEditMenuItems"/> 
     <commandset id="undoEditMenuItems"/>
@@ -527,17 +528,137 @@
       <tree id="abResultsTree" context="abResultsTreeContext" flex="1" />
       
       <splitter id="results-splitter" collapse="after" persist="state">
         <grippy/>
       </splitter>
       
       <!-- card view -->
       <hbox id="CardViewOuterBox" flex="1" persist="height">
-        <vbox id="CardViewBox" style="height:170px; min-height:1px; min-width:1px"/>
+        <vbox id="CardViewBox"
+              flex="1"
+              style="height:170px; min-height:1px; min-width:1px">
+          <vbox id="CardViewInnerBox" collapsed="true" flex="1">
+            <description id="CardTitle"/>
+            <hbox style="width:100%" flex="1">
+              <vbox id="cvbPhoto" class="cardViewGroup">
+                <hbox style="min-width: 10ch; max-width: 10ch;">
+                  <spacer flex="1"/>
+                  <html:img align="center" src="" id="cvPhoto"
+                            style="max-width: 10ch; max-height: 10ch; min-width: 1ch; display: block"/>
+                  <spacer flex="1"/>
+                </hbox>
+              </vbox>
+              <vbox flex="1">
+                <vbox id="cvbContact" class="cardViewGroup">
+                  <description class="CardViewHeading" id="cvhContact">&contact.heading;</description>
+                  <description class="CardViewLink" id="cvListNameBox">
+                    <html:p><html:a href="" id="cvListName"/></html:p>
+                  </description>
+                  <description class="CardViewText" id="cvDisplayName"/>
+                  <description class="CardViewText" id="cvNickname"/>
+                  <description class="CardViewLink" id="cvEmail1Box">
+                    <html:a href="" id="cvEmail1"/>
+                  </description>
+                  <description class="CardViewLink" id="cvEmail2Box">
+                    <html:a href="" id="cvEmail2"/>
+                  </description>
+                  <description class="CardViewLink" id="cvScreennameBox">
+                    <html:a href="" id="cvScreenname"/>
+                  </description>
+                </vbox>
+                <vbox id="cvbHome" class="cardViewGroup">
+                  <description class="CardViewHeading" id="cvhHome">&home.heading;</description>
+                  <hbox>
+                    <vbox flex="1">
+                      <description class="CardViewText" id="cvHomeAddress"/>
+                      <description class="CardViewText" id="cvHomeAddress2"/>
+                      <description class="CardViewText" id="cvHomeCityStZip"/>
+                      <description class="CardViewText" id="cvHomeCountry"/>
+                    </vbox>
+                    <vbox id="cvbHomeMapItBox" pack="end">
+                      <button id="cvHomeMapIt"
+                              url=""
+                              label="&mapItButton.label;"
+                              oncommand="MapIt('cvHomeMapIt');"
+                              tooltiptext="&mapIt.tooltip;"/>
+                    </vbox>
+                  </hbox>
+                  <description class="CardViewLink" id="cvHomeWebPageBox">
+                    <html:a onclick="return openLink(event);"
+                            href=""
+                            id="cvHomeWebPage"/>
+                  </description>
+                </vbox>
+                <vbox id="cvbOther" class="cardViewGroup">
+                  <description class="CardViewHeading" id="cvhOther">&other.heading;</description>
+                  <description class="CardViewText" id="cvBirthday"/>
+                  <description class="CardViewText" id="cvCustom1"/>
+                  <description class="CardViewText" id="cvCustom2"/>
+                  <description class="CardViewText" id="cvCustom3"/>
+                  <description class="CardViewText" id="cvCustom4"/>
+                  <description class="CardViewText" id="cvNotes"
+                               style="white-space: pre-wrap;"/>
+                  <hbox>
+                    <image id="cvBuddyIcon"/>
+                  </hbox>
+                </vbox>
+                <!-- the description and addresses groups are only for
+                      mailing lists -->
+                <vbox id="cvbDescription" class="cardViewGroup">
+                  <description class="CardViewHeading" id="cvhDescription">&description.heading;</description>
+                  <description class="CardViewText" id="cvDescription"/>
+                </vbox>
+                <vbox id="cvbAddresses" class="cardViewGroup">
+                  <description class="CardViewHeading" id="cvhAddresses">&addresses.heading;</description>
+                  <vbox id="cvAddresses"/>
+                </vbox>
+              </vbox>
+
+              <spacer style="width:20px"/>
+
+              <vbox flex="1">
+                <vbox id="cvbPhone" class="cardViewGroup">
+                  <description class="CardViewHeading" id="cvhPhone">&phone.heading;</description>
+                  <description class="CardViewText" id="cvPhWork"/>
+                  <description class="CardViewText" id="cvPhHome"/>
+                  <description class="CardViewText" id="cvPhFax"/>
+                  <description class="CardViewText" id="cvPhCellular"/>
+                  <description class="CardViewText" id="cvPhPager"/>
+                </vbox>
+                <vbox id="cvbWork" class="cardViewGroup">
+                  <description class="CardViewHeading" id="cvhWork">&work.heading;</description>
+                  <description class="CardViewText" id="cvJobTitle"/>
+                  <description class="CardViewText" id="cvDepartment"/>
+                  <description class="CardViewText" id="cvCompany"/>
+                  <hbox>
+                    <vbox flex="1">
+                      <description class="CardViewText" id="cvWorkAddress"/>
+                      <description class="CardViewText" id="cvWorkAddress2"/>
+                      <description class="CardViewText" id="cvWorkCityStZip"/>
+                      <description class="CardViewText" id="cvWorkCountry"/>
+                    </vbox>
+                    <vbox id="cvbWorkMapItBox" pack="end">
+                      <button id="cvWorkMapIt"
+                              url=""
+                              label="&mapItButton.label;"
+                              oncommand="MapIt('cvWorkMapIt');"
+                              tooltiptext="&mapIt.tooltip;"/>
+                    </vbox>
+                  </hbox>
+                  <description class="CardViewLink" id="cvWorkWebPageBox">
+                    <html:a onclick="return openLink(event);"
+                            href=""
+                            id="cvWorkWebPage"/>
+                  </description>
+                </vbox>
+              </vbox>
+            </hbox>
+          </vbox>
+        </vbox>
       </hbox>
     </vbox>
   </hbox>
 
   <panel id="customizeToolbarSheetPopup"/>
   <statusbar id="status-bar" class="chromeclass-status">
     <statusbarpanel id="component-bar"/>
     <statusbarpanel id="statusText" flex="1" value="&statusText.label;"/>  
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -95,17 +95,16 @@ messenger.jar:
     content/messenger/messengercompose/addressingWidgetOverlay.xul             (compose/addressingWidgetOverlay.xul)
     content/messenger/messengercompose/mailComposeExtrasOverlay.xul            (compose/mailComposeExtrasOverlay.xul)
     content/messenger/addressbook/addressbook.js                               (addrbook/addressbook.js)
     content/messenger/addressbook/addressbook.xul                              (addrbook/addressbook.xul)
     content/messenger/addressbook/abCommon.js                                  (addrbook/abCommon.js)
     content/messenger/addressbook/abCardOverlay.js                             (addrbook/abCardOverlay.js)
     content/messenger/addressbook/abCardOverlay.xul                            (addrbook/abCardOverlay.xul)
     content/messenger/addressbook/abCardViewOverlay.js                         (addrbook/abCardViewOverlay.js)
-    content/messenger/addressbook/abCardViewOverlay.xul                        (addrbook/abCardViewOverlay.xul)
     content/messenger/addressbook/abMailListDialog.xul                         (addrbook/abMailListDialog.xul)
     content/messenger/addressbook/abEditListDialog.xul                         (addrbook/abEditListDialog.xul)
     content/messenger/addressbook/abListOverlay.xul                            (addrbook/abListOverlay.xul)
     content/messenger/addressbook/abSelectAddressesDialog.js                   (addrbook/abSelectAddressesDialog.js)
     content/messenger/addressbook/abSelectAddressesDialog.xul                  (addrbook/abSelectAddressesDialog.xul)
     content/messenger/addressbook/abTrees.js                                   (addrbook/abTrees.js)
     content/messenger/addressbook/addressbook-panel.xul                        (addrbook/addressbook-panel.xul)
     content/messenger/addressbook/addressbook-panel.js                         (addrbook/addressbook-panel.js)