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
authorpete@mozdevgroup.com
Thu, 10 Jan 2008 13:02:45 -0800
changeset 10154 6bb124779ffd43a9cbf7259808fccd56cbe5d3fa
parent 10153 0f76ab30cdcd8b17a54d47682fb0f56471be52ac
child 10155 04d4776e5269977bc6007a38dee35b1056a8d914
push idunknown
push userunknown
push dateunknown
reviewersJan.Varga
bugs328070
milestone1.9b3pre
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
extensions/metrics/content/prefs.xul
extensions/metrics/install.rdf
extensions/metrics/skin/prefs.css
--- a/extensions/metrics/Makefile.in
+++ b/extensions/metrics/Makefile.in
@@ -37,17 +37,17 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 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
 INSTALL_EXTENSION_ID	= metrics@mozilla.org
 XPI_PKGNAME		= metrics-$(METRICS_VERSION)
 
 DIRS		= public src build
 
--- a/extensions/metrics/content/prefs.xul
+++ b/extensions/metrics/content/prefs.xul
@@ -9,19 +9,20 @@
     id="metrics-options-window"
     type="prefwindow"
     windowtype="Metrics:Preferences"
     title="&prefs.title;"
     width="400" height="160"
     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>
--- a/extensions/metrics/install.rdf
+++ b/extensions/metrics/install.rdf
@@ -8,17 +8,17 @@
     <em:id>metrics@mozilla.org</em:id>
     <em:version>@EXTENSION_VERSION@</em:version>
 
     <em:targetApplication>
       <!-- Firefox -->
       <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>
 
     <!-- front-end metadata -->
     <em:name>Metrics Collector</em:name>
     <em:description>Collects anonymous usage statistics from the browser</em:description>
     <em:creator>mozilla.org</em:creator>
     <em:optionsURL>chrome://metrics/content/prefs.xul</em:optionsURL>
--- a/extensions/metrics/skin/prefs.css
+++ b/extensions/metrics/skin/prefs.css
@@ -1,17 +1,18 @@
 .prefs
 {
   background     : white;
-  margin         : 10px 10px 0px 10px;
+  margin         : 5px 5px 0px 5px;
   border         : 1px inset ThreeDFace;
 }
 
 .msg
 {
+  margin-left    : 4px;
   margin-bottom  : 10px;
 }
 
 .cb
 {
   margin-left    : 20px;
 }