summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-01-16 01:57:41 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-01-16 02:08:16 +0100
commit3aac95141154dde26268e0114486f5620717bb68 (patch)
tree6d9348ca81de56c8341a26e83bd0d3d21d961ad4
parent1a6159363f80b0968b74e01ba372d5ef1ffd990a (diff)
downloadUXP-3aac95141154dde26268e0114486f5620717bb68.tar
UXP-3aac95141154dde26268e0114486f5620717bb68.tar.gz
UXP-3aac95141154dde26268e0114486f5620717bb68.tar.lz
UXP-3aac95141154dde26268e0114486f5620717bb68.tar.xz
UXP-3aac95141154dde26268e0114486f5620717bb68.zip
[PALEMOON] Add captive portal preference to the UI. (uplift)
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 3bd5becb3..7fa14f259 100644
--- a/application/palemoon/components/preferences/advanced.xul
+++ b/application/palemoon/components/preferences/advanced.xul
@@ -51,6 +51,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"/>
<!-- Data Choices tab -->
@@ -193,6 +195,7 @@
</hbox>
</groupbox>
#endif
+ <!-- User Agent compatibility -->
<groupbox id="UACompatGroup" orient="vertical">
<caption label="&UACompatGroup.label;"/>
<hbox align="center">
@@ -206,6 +209,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">