Skip to content

Commit 53cfed4

Browse files
pdepde
committed
Polish
- simpler, better wordings - include EFF + HTTPS Everywhere logos in the banner - popups are centered
1 parent 664aabf commit 53cfed4

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

‎src/chrome/content/browser-overlay.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,23 @@ var HTTPSEverywhereMenu = {
55
},
66

77
onPreferences: function() {
8-
window.open("chrome://https-everywhere/content/preferences.xul", "", "chrome");
8+
window.open("chrome://https-everywhere/content/preferences.xul", "",
9+
"chrome,centerscreen");
910
},
1011

1112
onSSLObservatoryPopup: function() {
12-
window.open("chrome://https-everywhere/content/observatory-popup.xul", "", "chrome");
13+
window.open("chrome://https-everywhere/content/observatory-popup.xul", "",
14+
"chrome,centerscreen");
1315
},
1416

1517
onSSLObservatory: function() {
16-
window.open("chrome://https-everywhere/content/observatory-preferences.xul", "", "chrome");
18+
window.open("chrome://https-everywhere/content/observatory-preferences.xul",
19+
"", "chrome,centerscreen");
1720
},
1821

1922
onAbout: function() {
20-
window.open("chrome://https-everywhere/content/about.xul", "", "chrome");
23+
window.open("chrome://https-everywhere/content/about.xul", "",
24+
"chrome,centerscreen");
2125
}
2226
};
2327

‎src/chrome/content/observatory-popup.xul‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@
1111
onload="document.getElementById('ask-me-later').focus()"
1212
>
1313
<script type="application/x-javascript" src="observatory-preferences.js" />
14-
<image src="chrome://https-everywhere/skin/ssl-observatory.jpg" />
15-
<label style="padding:20px;">&ssl-observatory.popup.text;</label>
14+
<image src="chrome://https-everywhere/skin/ssl-observatory-messy.jpg" />
15+
<label style="padding:25px;">&ssl-observatory.popup.text;</label>
1616

1717
<commandgroup>
1818
<command id="enable" oncommand="enable_observatory() ; popup_done()" />
1919
<command id="nope" oncommand="popup_done()" />
2020
<command id="later" oncommand="window.close()" />
2121
<command id="more-info"
2222
oncommand='popup_done() ;
23-
window.open("chrome://https-everywhere/content/observatory-preferences.xul","obsprefs","chrome")'
23+
window.open("chrome://https-everywhere/content/observatory-preferences.xul","obsprefs",
24+
"chrome, centerscreen")'
2425
/>
2526
</commandgroup>
2627

‎src/chrome/content/observatory-preferences.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ function observatory_prefs_init(doc) {
2222
obsprefs.getBoolPref("extensions.https_everywhere._observatory.alt_roots");
2323
document.getElementById("priv-dns").checked =
2424
obsprefs.getBoolPref("extensions.https_everywhere._observatory.priv_dns");
25-
document.getElementById("asn").checked =
26-
obsprefs.getBoolPref("extensions.https_everywhere._observatory.asn");
25+
document.getElementById("send-asn").checked =
26+
obsprefs.getBoolPref("extensions.https_everywhere._observatory.send_asn");
2727

2828
// More complicated: is it anonymised by Tor?
2929
var obs_how = doc.getElementById("ssl-obs-how");
@@ -120,7 +120,7 @@ function toggle_enabled() {
120120

121121
function toggle_send_asn() {
122122
var send_asn = document.getElementById("send-asn").checked;
123-
obsprefs.setBoolPref("extensions.https_everywhere._observatory.alt_roots", send_asn);
123+
obsprefs.setBoolPref("extensions.https_everywhere._observatory.send_asn", send_asn);
124124
if (send_asn) ssl_observatory.setupASNWatcher()
125125
else ssl_observatory.stopASNWatcher();
126126
}
@@ -132,6 +132,6 @@ function toggle_alt_roots() {
132132

133133
function toggle_priv_dns() {
134134
var priv_dns = document.getElementById("priv-dns").checked;
135-
obsprefs.setBoolPref("extensions.https_everywhere._observatory.alt_roots", priv_dns);
135+
obsprefs.setBoolPref("extensions.https_everywhere._observatory.priv_dns", priv_dns);
136136
}
137137

‎src/chrome/content/observatory-preferences.xul‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<hbox flex="1">
1919
<spacer flex="1" />
2020
<image id="obs-title-logo"
21-
src="chrome://https-everywhere/skin/ssl-observatory.jpg" />
21+
src="chrome://https-everywhere/skin/ssl-observatory-messy.jpg" />
2222
<spacer flex="1" />
2323
</hbox>
2424
<spacer flex="2" />

‎src/chrome/locale/en/ssl-observatory.dtd‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
33
<!ENTITY ssl-observatory.popup.later "Ask Me Later">
44
<!ENTITY ssl-observatory.popup.no "No">
5-
<!ENTITY ssl-observatory.popup.text
5+
6+
<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks
7+
against your browser by sending certificates to the Observatory. Turn this on?">
8+
9+
<!--<!ENTITY ssl-observatory.popup.text
610
"EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
711
and auditing the certificates being presented to your browser. Would you like
8-
to turn it on?">
12+
to turn it on?">-->
913

1014
<!ENTITY ssl-observatory.popup.title
1115
"Should HTTPS Everywhere use the SSL Observatory?">
@@ -19,7 +23,7 @@ to turn it on?">
1923
intrusive corporate network:">
2024

2125
<!ENTITY ssl-observatory.prefs.adv_priv_opts2
22-
"Safe to enable, unless you a corporate network with secret intranet server names:">
26+
"Safe to enable, unless you use a corporate network with secret intranet server names:">
2327

2428
<!ENTITY ssl-observatory.prefs.alt_roots
2529
"Submit and check certificates signed by non-standard root CAs">

‎src/chrome/skin/ssl-observatory-messy.jpg‎

35.3 KB
Loading

0 commit comments

Comments
 (0)