Bug 1524264 - move noproxy textbox lower to hint as a global effect r=ewright,flod a=lizzard
authorJunior Hsu <juhsu@mozilla.com>
Wed, 13 Feb 2019 10:46:19 +0000
changeset 516168 0ccb6406ff135639a179f81d4502ffac7cddcda6
parent 516167 370feb0729375ad9d0b65e3551fe0e0e2321995b
child 516169 7bd928c859a554df57f30f2f7525c06fa6402fb1
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewright, flod, lizzard
bugs1524264
milestone66.0
Bug 1524264 - move noproxy textbox lower to hint as a global effect r=ewright,flod a=lizzard Differential Revision: https://phabricator.services.mozilla.com/D18981
browser/components/preferences/connection.xul
browser/components/preferences/in-content/tests/browser_extension_controlled.js
browser/locales/en-US/browser/preferences/connection.ftl
--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@@ -120,33 +120,33 @@
             <box pack="start">
             <radiogroup id="networkProxySOCKSVersion" orient="horizontal"
                         preference="network.proxy.socks_version">
               <radio id="networkProxySOCKSVersion4" value="4" data-l10n-id="connection-proxy-socks4" />
               <radio id="networkProxySOCKSVersion5" value="5" data-l10n-id="connection-proxy-socks5" />
             </radiogroup>
             </box>
           </row>
-          <label data-l10n-id="connection-proxy-noproxy" control="networkProxyNone"/>
-          <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
-          <label control="networkProxyNone" data-l10n-id="connection-proxy-noproxy-desc" />
         </rows>
       </grid>
       <radio value="2" data-l10n-id="connection-proxy-autotype" />
       <hbox class="indent" flex="1" align="center">
         <textbox id="networkProxyAutoconfigURL" flex="1" preference="network.proxy.autoconfig_url"
                  oninput="gConnectionsDialog.updateReloadButton();"/>
         <button id="autoReload" icon="refresh"
                 data-l10n-id="connection-proxy-reload"
                 oncommand="gConnectionsDialog.reloadPAC();"
                 preference="pref.advanced.proxies.disable_button.reload"/>
       </hbox>
     </radiogroup>
   </groupbox>
   <separator class="thin"/>
+  <label data-l10n-id="connection-proxy-noproxy" control="networkProxyNone"/>
+  <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/>
+  <label control="networkProxyNone" data-l10n-id="connection-proxy-noproxy-desc" />
   <checkbox id="autologinProxy"
             data-l10n-id="connection-proxy-autologin"
             preference="signon.autologin.proxy" />
   <checkbox id="networkProxySOCKSRemoteDNS"
             preference="network.proxy.socks_remote_dns"
             data-l10n-id="connection-proxy-socks-remote-dns" />
   <checkbox id="networkDnsOverHttps"
             data-l10n-id="connection-dns-over-https"
--- a/browser/components/preferences/in-content/tests/browser_extension_controlled.js
+++ b/browser/components/preferences/in-content/tests/browser_extension_controlled.js
@@ -751,17 +751,17 @@ add_task(async function testExtensionCon
         return {
           manualControls: [
             ...manualControlContainer.querySelectorAll("label:not([control=networkProxyNone])"),
             ...manualControlContainer.querySelectorAll("textbox:not(#networkProxyNone)"),
             ...manualControlContainer.querySelectorAll("checkbox"),
             ...doc.querySelectorAll("#networkProxySOCKSVersion > radio")],
           pacControls: [doc.getElementById("networkProxyAutoconfigURL")],
           otherControls: [
-            manualControlContainer.querySelector("label[control=networkProxyNone]"),
+            doc.querySelector("label[control=networkProxyNone]"),
             doc.getElementById("networkProxyNone"),
             ...controlGroup.querySelectorAll(":scope > radio"),
             ...doc.querySelectorAll("#ConnectionsDialogPane > checkbox")],
         };
       }
       let controlState = isControlled ? "disabled" : "enabled";
       let controls = getProxyControls();
       for (let element of controls.manualControls) {
--- a/browser/locales/en-US/browser/preferences/connection.ftl
+++ b/browser/locales/en-US/browser/preferences/connection.ftl
@@ -55,17 +55,17 @@ connection-proxy-socks-port = Port
     .accesskey = t
 
 connection-proxy-socks4 =
     .label = SOCKS v4
     .accesskey = K
 connection-proxy-socks5 =
     .label = SOCKS v5
     .accesskey = v
-connection-proxy-noproxy = No Proxy for
+connection-proxy-noproxy = No proxy for
     .accesskey = N
 
 connection-proxy-noproxy-desc = Example: .mozilla.org, .net.nz, 192.168.1.0/24
 
 connection-proxy-autotype =
     .label = Automatic proxy configuration URL
     .accesskey = A