762513 - Merge abCardViewOverlay.xul into addressbook.xul

Status: RESOLVED FIXED

(SeaMonkey :: MailNews: Address Book & Contacts, defect)

Description

[Ian Neal]

Attachment: Do the merge

At the moment abCardViewOverlay.xul overlays addressbook.xul but isn't used anywhere else.
This patch:
* Merges abCardViewOverlay.xul into addressbook.xul
* Merges abCardViewOverlay.dtd into abMainWindow.dtd
* Removes relevant jar.mn entries
* Removes abCardViewOverlay.xul/dtd files

Comment 1

[Ian Neal]

Attachment: Fix missing namespace

Missed setting xmlns:html

Comment 2

[Ian Neal]

Attachment: Fix missing namespace and extra slash [Checked in: Comment 4]

Fixed extra /

Comment 3

[Karsten Düsterloh]

Comment on attachment 631178 [details] [diff] [review]
Fix missing namespace and extra slash [Checked in: Comment 4]

>+<!ENTITY mapIt.tooltip                                  "Display a map of this address from the Web">

Wow, I never noticed this feature, and it's in the code since 2001. *_*

> <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"/>

Please don't wrap this.

>+        <vbox id="CardViewBox"

I gather the content of this is more or less a verbatim copy of the deleted file — I didn't check every detail and I saw no errors. ;-)

>+                  <description class="CardViewHeading"
>+                               id="cvhOther">&other.heading;</description>
…
>+                  <description class="CardViewHeading"
>+                               id="cvhDescription">&description.heading;</description>
…
>+                  <description class="CardViewHeading"
>+                               id="cvhAddresses">&addresses.heading;</description>
…
>+                  <description class="CardViewHeading"
>+                               id="cvhPhone">&phone.heading;</description>
…
>+                  <description class="CardViewHeading"
>+                               id="cvhWork">&work.heading;</description>

These are quite some odd wrappings. I'd rather leave them unwrapped.

r/moa=me with that.

Comment 4

[Ian Neal]

Comment on attachment 631178 [details] [diff] [review]
Fix missing namespace and extra slash [Checked in: Comment 4]

Checked in with suggested fixes:
http://hg.mozilla.org/comm-central/rev/cf074c127ab9