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

@@ -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

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>

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>
 

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;
 }