From c9e72b298e5266602ad655f75c6193a0aa3e05fa Mon Sep 17 00:00:00 2001
From: "matt%netscape.com" <matt%netscape.com>
Date: Tue, 7 Sep 1999 23:21:09 +0000
Subject: [PATCH] rewriting prefs for smartupdate and fixing bug13272

---
 suite/common/pref/pref-navigator.xul            |  2 +-
 suite/common/pref/pref-smartupdate.xul          | 17 ++++++++---------
 .../resources/content/pref-navigator.xul        |  2 +-
 .../resources/content/pref-smartupdate.xul      | 17 ++++++++---------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/suite/common/pref/pref-navigator.xul b/suite/common/pref/pref-navigator.xul
index 64c6881cab29..8920962ae921 100644
--- a/suite/common/pref/pref-navigator.xul
+++ b/suite/common/pref/pref-navigator.xul
@@ -73,7 +73,7 @@
 					</html:legend>
 			<html:div>&clickRadio;</html:div>
 			&location;
-			<html:input name="homepage" type="text"	id="pref:char:browser.startup.homepage" size="30" /> 
+			<html:input name="homepage" type="text"	id="pref:string:browser.startup.homepage" size="30" /> 
 			<html:div>
 				<spring flex="100%"/>
 				<titledbutton name="starts" type="button" value="&useCurrent;" />
diff --git a/suite/common/pref/pref-smartupdate.xul b/suite/common/pref/pref-smartupdate.xul
index aae5133b268c..10fe64bfd5ef 100644
--- a/suite/common/pref/pref-smartupdate.xul
+++ b/suite/common/pref/pref-smartupdate.xul
@@ -27,27 +27,26 @@
 	
 	  <box align="vertical">
 	  <html:fieldset style="width: 100%;">
-      <box align="horizontal">
+	  <html:div>
 			  <html:input type="checkbox" id="pref:0:bool:autoupdate.enabled" />
 			  <html:label for="pref:0:bool:autoupdate.enabled">
 				  &enableSU.label;
 			  </html:label>
-      </box>
-
-      <box align="horizontal">
-			  <html:input type="checkbox" id="pref:0:bool:autoupdate.enabled" />
-			  <html:label for="pref:0:bool:autoupdate.enabled">
+	  </html:div>
+	  <html:div>
+			  <html:input type="checkbox" id="pref:0:bool:autoupdate.confirm_install" />
+			  <html:label for="pref:0:bool:autoupdate.confirm_install">
   			  &requireConfirmation.label;
 			  </html:label>
-	    </box>
+		</html:div>
 	</html:fieldset>
 	  <html:fieldset style="width: 100%;">
       <box align="horizontal">
 	   &selectUninstall.label;
-            <html:textarea name="textstyle" ROWS="10" COLS="30" id="pref:string:browser.related.disabledForDomains">
+            <html:textarea name="textstyle" ROWS="40" COLS="30" id="pref:string:browser.related.disabledForDomains">
             </html:textarea>
           <spring flex="15%"/>
-          <titledbutton id="pref:0:bool:smartupdate" value="&uninstallButton.label;" style="height:20px;" />
+          <titledbutton id="pref:0:bool:smartupdate" value="&uninstallButton.label;" flex="1" style="max-height:13px;"/>
 	  </box>
 	  </html:fieldset>
     </box>
diff --git a/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index 64c6881cab29..8920962ae921 100644
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -73,7 +73,7 @@
 					</html:legend>
 			<html:div>&clickRadio;</html:div>
 			&location;
-			<html:input name="homepage" type="text"	id="pref:char:browser.startup.homepage" size="30" /> 
+			<html:input name="homepage" type="text"	id="pref:string:browser.startup.homepage" size="30" /> 
 			<html:div>
 				<spring flex="100%"/>
 				<titledbutton name="starts" type="button" value="&useCurrent;" />
diff --git a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index aae5133b268c..10fe64bfd5ef 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -27,27 +27,26 @@
 	
 	  <box align="vertical">
 	  <html:fieldset style="width: 100%;">
-      <box align="horizontal">
+	  <html:div>
 			  <html:input type="checkbox" id="pref:0:bool:autoupdate.enabled" />
 			  <html:label for="pref:0:bool:autoupdate.enabled">
 				  &enableSU.label;
 			  </html:label>
-      </box>
-
-      <box align="horizontal">
-			  <html:input type="checkbox" id="pref:0:bool:autoupdate.enabled" />
-			  <html:label for="pref:0:bool:autoupdate.enabled">
+	  </html:div>
+	  <html:div>
+			  <html:input type="checkbox" id="pref:0:bool:autoupdate.confirm_install" />
+			  <html:label for="pref:0:bool:autoupdate.confirm_install">
   			  &requireConfirmation.label;
 			  </html:label>
-	    </box>
+		</html:div>
 	</html:fieldset>
 	  <html:fieldset style="width: 100%;">
       <box align="horizontal">
 	   &selectUninstall.label;
-            <html:textarea name="textstyle" ROWS="10" COLS="30" id="pref:string:browser.related.disabledForDomains">
+            <html:textarea name="textstyle" ROWS="40" COLS="30" id="pref:string:browser.related.disabledForDomains">
             </html:textarea>
           <spring flex="15%"/>
-          <titledbutton id="pref:0:bool:smartupdate" value="&uninstallButton.label;" style="height:20px;" />
+          <titledbutton id="pref:0:bool:smartupdate" value="&uninstallButton.label;" flex="1" style="max-height:13px;"/>
 	  </box>
 	  </html:fieldset>
     </box>