Skip to content

Commit f1eec6f

Browse files
Micah Leepde
authored andcommitted
made observatory opt-in xul
1 parent 9a5f645 commit f1eec6f

File tree

3 files changed

+29
-43
lines changed

3 files changed

+29
-43
lines changed

src/chrome/content/observatory.xul

Lines changed: 26 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,28 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
3-
<?xml-stylesheet href="chrome://https-everywhere/content/observatory-prefs.css" type="text/css"?>
3+
<window id="ssl-observatory-dialog"
4+
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
5+
xmlns:html="http://www.w3.org/1999/xhtml"
6+
title="Should HTTPS Everywhere use the SSL Observatory?"
7+
width="500"
8+
height="400"
9+
align="center"
10+
onload="document.getElementById('ask-me-later').focus()" >
411

5-
<!DOCTYPE overlay SYSTEM "chrome://https-everywhere/locale/ssl-observatory.dtd">
6-
7-
<dialog id="ssl-observatory-prefs"
8-
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
9-
xmlns:html="http://www.w3.org/1999/xhtml"
10-
buttons="accept,cancel"
11-
title="Title"
12-
buttonlabelextra1="Button"
13-
ondialogextra1="observatory_off(document);"
14-
persist="screenX screenY"
15-
onload="observatory_prefs_init(document)"
16-
ondialogaccept="https_prefs_save(document)"
17-
ondialogcancel="https_prefs_cancel(document)">
18-
19-
<script type="application/x-javascript" src="preferences.js"/>
20-
<groupbox>
21-
<vbox class="observatory-logo" />
22-
</groupbox>
23-
<groupbox flex="1">
24-
<caption label="Which HTTPS redirection rules should apply?"
25-
align="center"/>
26-
<hbox flex="1" style="overflow:auto">
27-
<grid class="indent" align="center">
28-
<columns>
29-
<column/> <column/> <column/> <column/> <column/>
30-
</columns>
31-
<rows id="https_everywhere_RuleSetList"/>
32-
</grid>
33-
<seperator orient="vertical" width="40" flex="1"/>
34-
</hbox>
35-
<vbox>
36-
You can learn how to write your own rulesets (to add support for other web sites)
37-
<label id="ruleset link"
38-
value="here"
39-
style="color: blue; cursor:hand; text-decoration:underline;"
40-
onmouseover="event.target.style.cursor='pointer'"
41-
onmouseout="event.target.style.cursor='default'"
42-
onclick="window.open('https://eff.org/https-everywhere/rulesets')"/>.
43-
</vbox>
44-
</groupbox>
45-
</dialog>
12+
<vbox>
13+
<image src="chrome://https-everywhere/skin/SSLobservatory.jpg" />
14+
<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>
15+
<hbox>
16+
<spacer flex="2" />
17+
<button label="Yes" style="font-weight:bold" tabindex="1" acceskey="y" />
18+
<spacer flex="1" />
19+
<button label="No" tabindex="2" accesskey="n" />
20+
<spacer flex="2" />
21+
</hbox>
22+
<hbox style="padding-top:10px;">
23+
<label class="text-link" href="https://www.eff.org/" tabindex="3">Details and Privacy Information</label>
24+
<spacer flex="1" />
25+
<button label="Ask Me Later" id="ask-me-later" tabindex="0" style="font-size:0.8em;" accesskey="l" />
26+
</hbox>
27+
</vbox>
28+
</window>

src/chrome/skin/SSLobservatory.jpg

-18.4 KB
Loading

test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
./makexpi.sh uncommitted
3+
firefox pkg/https-everywhere-0.9.9.observatory.5~pre.xpi

0 commit comments

Comments
 (0)