Skip to content

Commit fc8022f

Browse files
Micah Leepde
Micah Lee
authored and
pde
committed
added Tools menu to access various XULs. localized observatory popup (mostly).
1 parent ec99a76 commit fc8022f

File tree

8 files changed

+71
-29
lines changed

8 files changed

+71
-29
lines changed

‎src/chrome.manifest‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ component {0f9ab521-986d-4ad8-9c1f-6934e195c15c} components/ssl-observatory.js
1818
contract @eff.org/ssl-observatory; {0f9ab521-986d-4ad8-9c1f-6934e195c15c}
1919

2020
category profile-after-change SSLObservatory @eff.org/ssl-observatory;
21+
22+
overlay chrome://browser/content/browser.xul chrome://https-everywhere/content/browser-overlay.xul
23+
overlay chrome://navigator/content/navigatorOverlay.xul chrome://https-everywhere/content/browser-overlay.xul
24+

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
var HTTPSEverywhereMenu = {
2+
onLoad: function() {
3+
// initialization code
4+
this.initialized = true;
5+
},
6+
7+
onPreferences: function() {
8+
window.open("chrome://https-everywhere/content/preferences.xul", "", "chrome");
9+
},
10+
11+
onSSLObservatoryPopup: function() {
12+
window.open("chrome://https-everywhere/content/observatory-popup.xul", "", "chrome");
13+
},
14+
15+
onSSLObservatory: function() {
16+
window.open("chrome://https-everywhere/content/observatory-preferences.xul", "", "chrome");
17+
},
18+
19+
onAbout: function() {
20+
window.open("chrome://https-everywhere/content/about.xul", "", "chrome");
21+
}
22+
};
23+
24+
window.addEventListener("load", function(e) { HTTPSEverywhereMenu.onLoad(e); }, false);

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!DOCTYPE overlay SYSTEM "chrome://https-everywhere/locale/https-everywhere.dtd">
4+
5+
<overlay id="https-everywhere-menu" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
6+
<script type="application/x-javascript" src="chrome://https-everywhere/content/browser-overlay.js"/>
7+
8+
<!-- tools menu (seamonkey) -->
9+
<menupopup id="toolsPopup">
10+
</menupopup>
11+
12+
<!-- tools menu (firefox) -->
13+
<menupopup id="menu_ToolsPopup">
14+
<menu id="https-everywhere-menu" label="HTTPS Everywhere">
15+
<menupopup id="https-everywhere-menupopup">
16+
<menuitem id="https-everywhere-menu-preferences" label="Preferences" oncommand="HTTPSEverywhereMenu.onPreferences(event)" />
17+
<menuitem id="https-everywhere-menu-ssl-observatory" label="SSL Observatory Popup" oncommand="HTTPSEverywhereMenu.onSSLObservatoryPopup(event)" />
18+
<menuitem id="https-everywhere-menu-ssl-observatory" label="SSL Observatory Preferences" oncommand="HTTPSEverywhereMenu.onSSLObservatory(event)" />
19+
<menuseparator/>
20+
<menuitem id="https-everywhere-menu-about" label="About" oncommand="HTTPSEverywhereMenu.onAbout(event)" />
21+
</menupopup>
22+
</menu>
23+
</menupopup>
24+
</overlay>

src/chrome/content/observatory.xul renamed to src/chrome/content/observatory-popup.xul

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
3+
<!DOCTYPE window SYSTEM "chrome://https-everywhere/locale/ssl-observatory.dtd">
34
<window id="ssl-observatory-dialog"
45
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
56
xmlns:html="http://www.w3.org/1999/xhtml"
6-
title="Should HTTPS Everywhere use the SSL Observatory?"
7+
title="&ssl-observatory.popup.title;"
78
width="500"
8-
height="400"
9+
height="380"
910
align="center"
1011
onload="document.getElementById('ask-me-later').focus()" >
1112

12-
<vbox>
13-
<image src="chrome://https-everywhere/skin/SSLobservatory.jpg" />
13+
<vbox>
14+
<image src="chrome://https-everywhere/skin/ssl-observatory.jpg" />
15+
<!--<label style="padding:20px;" value="&ssl-observatory.popup.text;" />-->
1416
<label style="padding:20px;">EFF's SSL Observatory can detect attacks against HTTPS websites by collecting and auditing the certificates being presented to your browser. Would you like to turn it on?</label>
1517
<hbox>
1618
<spacer flex="2" />
17-
<button label="Yes" style="font-weight:bold" tabindex="1" acceskey="y" />
19+
<button label="&ssl-observatory.popup.yes;" tabindex="1" acceskey="y" />
1820
<spacer flex="1" />
19-
<button label="No" tabindex="2" accesskey="n" />
21+
<button label="&ssl-observatory.popup.no;" tabindex="2" accesskey="n" />
2022
<spacer flex="2" />
2123
</hbox>
2224
<hbox style="padding-top:10px;">
23-
<label class="text-link" href="https://www.eff.org/" tabindex="3">Details and Privacy Information</label>
25+
<label class="text-link" href="https://www.eff.org/" tabindex="3" value="&ssl-observatory.popup.details;" />
2426
<spacer flex="1" />
25-
<button label="Ask Me Later" id="ask-me-later" tabindex="0" style="font-size:0.8em;" accesskey="l" />
27+
<button label="&ssl-observatory.popup.later;" id="ask-me-later" tabindex="0" style="font-size:0.8em;" accesskey="l" />
2628
</hbox>
27-
</vbox>
29+
</vbox>
2830
</window>

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

Whitespace-only changes.

‎src/chrome/content/observatory-prefs.css‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
<!ENTITY ssl-observatory.prefs.title "Use the SSL Observatory?">
2-
<!ENTITY ssl-observatory.prefs.no_obs "No thanks">
1+
<!ENTITY ssl-observatory.popup.title "Should HTTPS Everywhere use the SSL Observatory?">
2+
<!ENTITY ssl-observatory.popup.text "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting and auditing the certificates being presented to your browser. Would you like to turn it on?">
3+
<!ENTITY ssl-observatory.popup.yes "Yes">
4+
<!ENTITY ssl-observatory.popup.no "No">
5+
<!ENTITY ssl-observatory.popup.details "Details and Privacy Information">
6+
<!ENTITY ssl-observatory.popup.later "Ask Me Later">
7+
8+

src/chrome/skin/SSLobservatory.jpg renamed to src/chrome/skin/ssl-observatory.jpg

File renamed without changes.

0 commit comments

Comments
 (0)