From 13f8915b215baf1ad32e201763a995258be84172 Mon Sep 17 00:00:00 2001
From: "hangas%netscape.com" <hangas%netscape.com>
Date: Wed, 7 Jul 1999 02:30:46 +0000
Subject: [PATCH] Modifications to adjust for Hyatt's changes to windows over
 the weekend.

---
 mailnews/addrbook/resources/content/addressbook.xul    | 2 ++
 mailnews/addrbook/resources/content/editcard.xul       | 8 ++++----
 mailnews/addrbook/resources/content/editcardDialog.xul | 4 +++-
 mailnews/addrbook/resources/content/newcardDialog.xul  | 4 +++-
 mailnews/addrbook/resources/content/resultPane.xul     | 2 +-
 mailnews/addrbook/resources/content/selectaddress.xul  | 5 +++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index 2646170ca275..d668db5eef4e 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -106,6 +106,8 @@
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		height="420"
+		width="600"
 		style="width:100%; height:100%"
 		align="vertical"
 		title="&addressbookWindow.title;"
diff --git a/mailnews/addrbook/resources/content/editcard.xul b/mailnews/addrbook/resources/content/editcard.xul
index 00c21776267e..e3fc8a1696f5 100644
--- a/mailnews/addrbook/resources/content/editcard.xul
+++ b/mailnews/addrbook/resources/content/editcard.xul
@@ -53,17 +53,17 @@
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		style="width:100%; height:100%; border:none"
+		style="height:100%; width:100%; border:none"
 		align="vertical">
 
-	<tabcontrol align="vertical" style="margin: 5px; border: 2px groove white">
-	   <tabbox include="chrome://addressbook/content/nsFrag1.xul" align="horizontal">
+	<tabcontrol align="vertical" style="margin:5px; border:2px groove white">
+	   <tabbox align="horizontal">
 	      <tab>&Name.tab;</tab>
 	      <tab>&Address.tab;</tab>
 	      <tab>&Other.tab;</tab>
 	   </tabbox>
 	   
-	   <tabpanel include="chrome://addressbook/content/nsFrag2.xul" align="vertical" flex="100%">
+	   <tabpanel align="vertical" flex="100%">
 
 			<!-- ** Name Tab ** -->
 			<box index="name" align="vertical" flex="100%">
diff --git a/mailnews/addrbook/resources/content/editcardDialog.xul b/mailnews/addrbook/resources/content/editcardDialog.xul
index c4c47bf363ba..7da8baf848ac 100644
--- a/mailnews/addrbook/resources/content/editcardDialog.xul
+++ b/mailnews/addrbook/resources/content/editcardDialog.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 
 <!DOCTYPE window
 [
@@ -9,7 +10,8 @@
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 		onload="OnLoadEditCard()"
 		class="dialog"
-		width="400" style="height:100%; padding:0px"
+		width="400" height="600"
+		style="width:100%; height:100%; padding:0px"
 		align="vertical">
 
 	<html:script language="JavaScript" src="chrome://addressbook/content/editcard.js"/>
diff --git a/mailnews/addrbook/resources/content/newcardDialog.xul b/mailnews/addrbook/resources/content/newcardDialog.xul
index a5f575338edf..db73cb5ecd87 100644
--- a/mailnews/addrbook/resources/content/newcardDialog.xul
+++ b/mailnews/addrbook/resources/content/newcardDialog.xul
@@ -1,5 +1,6 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 
 <!DOCTYPE window
 [
@@ -14,7 +15,8 @@
 		title="&editcardWindow.title;"
 		onload="OnLoadNewCard()"
 		class="dialog"
-		width="400" style="height:100%; padding:0px"
+		width="400" height="600"
+		style="width:100%; height:100%; padding:0px"
 		align="vertical">
 
 	<html:script language="JavaScript" src="chrome://addressbook/content/editcard.js"/>
diff --git a/mailnews/addrbook/resources/content/resultPane.xul b/mailnews/addrbook/resources/content/resultPane.xul
index de4d4d7a0906..fc9bb4bd9d3d 100644
--- a/mailnews/addrbook/resources/content/resultPane.xul
+++ b/mailnews/addrbook/resources/content/resultPane.xul
@@ -16,7 +16,7 @@
 		align="vertical">
 
 
-	<tree class="abResults" flex="100%" id="resultTree"
+	<tree class="abResults" id="resultTree"
 			rdf:datasources="rdf:addressdirectory rdf:addresscard"
 			onchange="top.ResultsPaneSelectionChange()" rdf:containment="http://home.netscape.com/NC-rdf#CardChild">
 
diff --git a/mailnews/addrbook/resources/content/selectaddress.xul b/mailnews/addrbook/resources/content/selectaddress.xul
index 7b5368117a98..22c9dacfdc0a 100644
--- a/mailnews/addrbook/resources/content/selectaddress.xul
+++ b/mailnews/addrbook/resources/content/selectaddress.xul
@@ -38,7 +38,7 @@ Rights Reserved.
 	<!ENTITY viewButton.label	".View"> 
 	<!ENTITY removeButton.label	"Remove"> 
 	<!ENTITY okButton.label		".OK"> 
-	<!ENTITY cancelButton.label	".Cancel"> 
+	<!ENTITY cancelButton.label	"Cancel"> 
 	<!ENTITY helpButton.label	".Help"> 
 
 <!-- Directory Pane -->
@@ -56,6 +56,7 @@ Rights Reserved.
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&selectAddressWindow.title;"
         class="dialog"
+        width="640" height="480"
         style="width:100%; height:100%; padding:0px"
         align="vertical">
 
@@ -65,7 +66,7 @@ Rights Reserved.
 <html:script language="JavaScript" src="resource://res/samples/DumpDOM.js"/>
 
 	<!-- Thin box across top, show names containing & stop, search buttons -->
-	<box align="horizontal" style="width:100%; padding: 0.5em; padding-top: 0px;">
+	<box align="horizontal" style="width:100%; padding:0.5em; padding-top:0px;">
 		<html:div style="vertical-align: middle;">
 			<html:label for="searchtext" tabindex="0">&search.label;</html:label>
 			<html:input type="text" id="searchtext" flex="100%"/>