summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-01-16 01:57:41 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-01-16 01:57:41 +0100
commitdb15a3fdb7fa9bb9e35ca0f2b7bc808a3783e4c5 (patch)
tree870b09fbbb924fee9fad31bc669c2eb7fc652752
parent2ab82d7fc901f3d0545f8bf75460c7fa94ef18ed (diff)
downloadUXP-db15a3fdb7fa9bb9e35ca0f2b7bc808a3783e4c5.tar
UXP-db15a3fdb7fa9bb9e35ca0f2b7bc808a3783e4c5.tar.gz
UXP-db15a3fdb7fa9bb9e35ca0f2b7bc808a3783e4c5.tar.lz
UXP-db15a3fdb7fa9bb9e35ca0f2b7bc808a3783e4c5.tar.xz
UXP-db15a3fdb7fa9bb9e35ca0f2b7bc808a3783e4c5.zip
[PALEMOON] Add captive portal preference to the UI.
Tag #860
-rw-r--r--application/palemoon/components/preferences/advanced.xul12
-rw-r--r--application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd3
2 files changed, 15 insertions, 0 deletions
diff --git a/application/palemoon/components/preferences/advanced.xul b/application/palemoon/components/preferences/advanced.xul
index 402a66bbf..34998c1b8 100644
--- a/application/palemoon/components/preferences/advanced.xul
+++ b/application/palemoon/components/preferences/advanced.xul
@@ -48,6 +48,8 @@
type="bool"/>
#endif
<preference id="pref.general.compatmode" name="general.useragent.compatMode" type="int"/>
+
+ <preference id="pref.general.captiveportal" name="network.captive-portal-service.enabled" type="bool"/>
<!-- Network tab -->
<preference id="browser.cache.disk.capacity" name="browser.cache.disk.capacity" type="int"/>
@@ -179,6 +181,7 @@
</hbox>
</groupbox>
#endif
+ <!-- User Agent compatibility -->
<groupbox id="UACompatGroup" orient="vertical">
<caption label="&UACompatGroup.label;"/>
<hbox align="center">
@@ -192,6 +195,15 @@
</menulist>
</hbox>
</groupbox>
+
+ <!-- Captive portal detection -->
+ <groupbox id="captivePortalGroup" orient="vertical">
+ <caption label="&captivePortalGroup.label;"/>
+ <checkbox id="captivePortalDetect"
+ label="&captivePortalDetect.label;"
+ preference="pref.general.captiveportal"/>
+ </groupbox>
+
</tabpanel>
<!-- Network -->
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
index f8203c6f6..dcb7b0e90 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -39,6 +39,9 @@
<!ENTITY UACompat.Gecko "Gecko Compatibility">
<!ENTITY UACompat.Firefox "Firefox Compatibility">
+<!ENTITY captivePortalGroup.label "Captive portals">
+<!ENTITY captivePortalDetect.label "Detect restricted network access">
+
<!ENTITY dataChoicesTab.label "Data Choices">
<!ENTITY crashReporterSection.label "Crash Reporter">