From 42cc3fc347f94c3062f850df44a99319393868c4 Mon Sep 17 00:00:00 2001
From: "pete%mozdevgroup.com" <pete%mozdevgroup.com>
Date: Thu, 10 Jan 2008 21:02:46 +0000
Subject: [PATCH] b=328070 r=Jan.Varga

opt-in UI for data collection

addendum to original prefs UI work, just some minor tweaks so UI isn't cut off on
OSX.

Also set maxVersion to 3.*

--pete
---
 extensions/metrics/Makefile.in       | 2 +-
 extensions/metrics/content/prefs.xul | 7 ++++---
 extensions/metrics/install.rdf       | 2 +-
 extensions/metrics/skin/prefs.css    | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/extensions/metrics/Makefile.in b/extensions/metrics/Makefile.in
index 8e3ef414bf7..30606a9dc9c 100644
--- a/extensions/metrics/Makefile.in
+++ b/extensions/metrics/Makefile.in
@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-METRICS_VERSION = 2a1
+METRICS_VERSION = 2a3
 XPI_NAME		= metrics
 USE_EXTENSION_MANIFEST	= 1
 NO_JAR_AUTO_REG		= 1
diff --git a/extensions/metrics/content/prefs.xul b/extensions/metrics/content/prefs.xul
index 3b4c0c21464..8e8bd979c1e 100644
--- a/extensions/metrics/content/prefs.xul
+++ b/extensions/metrics/content/prefs.xul
@@ -14,14 +14,15 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <prefpane id="metricsPrefsPanel" class="prefs" flex="1">
-    <preferences id="metrics-prefs" label="Test Label">
+  <prefpane id="metricsPrefsPanel" flex="1">
+    <preferences id="metrics-prefs">
       <preference id="metrics-pref-upload-enable" name="extensions.mozilla.metrics.upload.enable" type="bool" instantApply="tue"  />
     </preferences>
-    <vbox flex="1">
+    <vbox class="prefs" flex="1">
       <description class="msg">&prefs.label.msg;</description>
       <checkbox id="metrics-enable-checkbox" checked="true" label="&prefs.checkbox.enable;" preference="metrics-pref-upload-enable" 
                 persist="checked" class="cb" />
     </vbox>
+    <spacer flex="1" />
   </prefpane>
 </prefwindow>
diff --git a/extensions/metrics/install.rdf b/extensions/metrics/install.rdf
index 8febd114244..ea4a18740fa 100644
--- a/extensions/metrics/install.rdf
+++ b/extensions/metrics/install.rdf
@@ -13,7 +13,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.0a1</em:minVersion>
-        <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
+        <em:maxVersion>3.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 
diff --git a/extensions/metrics/skin/prefs.css b/extensions/metrics/skin/prefs.css
index 66553004a19..00de29957db 100644
--- a/extensions/metrics/skin/prefs.css
+++ b/extensions/metrics/skin/prefs.css
@@ -1,12 +1,13 @@
 .prefs
 {
   background     : white;
-  margin         : 10px 10px 0px 10px;
+  margin         : 5px 5px 0px 5px;
   border         : 1px inset ThreeDFace;
 }
 
 .msg
 {
+  margin-left    : 4px;
   margin-bottom  : 10px;
 }