Skip to content

Commit 097ff23

Browse files
author
Micah Lee
committed
Improving UI for dev popup
1 parent 0318fdc commit 097ff23

3 files changed

Lines changed: 52 additions & 34 deletions

File tree

‎src/chrome/content/dev-popup.css‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#dev-popup-dialog {
2+
padding: 20px;
3+
}
4+
#wrapper {
5+
background-color: #ffffff;
6+
margin: 0 auto;
7+
max-width: 700px;
8+
padding: 20px;
9+
}
10+
#paragraph1, #paragraph2 {
11+
font-size: 1.2em;
12+
text-align: center;
13+
}
14+
button {
15+
font-size: 1.2em;
16+
}
17+
button#revert-to-stable {
18+
font-weight: bold;
19+
}

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
3+
<?xml-stylesheet href="dev-popup.css" type="text/css"?>
34
<!DOCTYPE window SYSTEM "chrome://https-everywhere/locale/https-everywhere.dtd">
45
<window id="dev-popup-dialog"
56
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -10,34 +11,33 @@
1011
align="center"
1112
onload="document.getElementById('keep-on-dev').focus()"
1213
>
13-
<image src="chrome://https-everywhere/skin/https-everywhere-banner.jpg" />
14-
<script type="application/x-javascript" src="dev-popup.js" />
15-
<label style="padding:25px;">&https-everywhere.popup.header;</label>
14+
<html:div id="wrapper">
15+
<image src="chrome://https-everywhere/skin/https-everywhere-banner.jpg" />
16+
<script type="application/x-javascript" src="dev-popup.js" />
1617

17-
<commandgroup>
18-
<command id="revert" oncommand="download_stable(); dev_popup_done()" />
19-
<command id="keep" oncommand="dev_popup_done()" />
20-
</commandgroup>
18+
<commandgroup>
19+
<command id="revert" oncommand="download_stable(); dev_popup_done()" />
20+
<command id="keep" oncommand="dev_popup_done()" />
21+
</commandgroup>
2122

22-
<vbox flex="1">
23-
<separator class="thin"/>
24-
<label>&https-everywhere.popup.paragraph1;</label>
25-
<separator class="thin"/>
26-
<label>&https-everywhere.popup.paragraph2;</label>
27-
<separator class="thin"/>
28-
<label>&https-everywhere.popup.paragraph3;</label>
29-
<separator class="thin"/>
30-
<hbox>
31-
<spacer flex="1" />
32-
<button id="revert-to-stable" label="&https-everywhere.popup.revert;"
33-
tabindex="2"
34-
accesskey="n"
35-
command='revert' />
36-
<button id="keep-on-dev" label="&https-everywhere.popup.keep;"
37-
tabindex="1"
38-
accesskey="y"
39-
command='keep'/>
40-
<spacer flex="1" />
41-
</hbox>
42-
</vbox>
23+
<vbox flex="1">
24+
<separator class="thin"/>
25+
<label id="paragraph1">&https-everywhere.popup.paragraph1;</label>
26+
<separator class="thin"/>
27+
<label id="paragraph2">&https-everywhere.popup.paragraph2;</label>
28+
<separator class="thin"/>
29+
<hbox>
30+
<spacer flex="1" />
31+
<button id="revert-to-stable" label="&https-everywhere.popup.revert;"
32+
tabindex="2"
33+
command='revert' />
34+
<button id="keep-on-dev" label="&https-everywhere.popup.keep;"
35+
tabindex="1"
36+
command='keep'/>
37+
<spacer flex="1" />
38+
</hbox>
39+
<separator class="thick"/>
40+
<label id="paragraph3">&https-everywhere.popup.paragraph3;</label>
41+
</vbox>
42+
</html:div>
4343
</window>

‎src/chrome/locale/en/https-everywhere.dtd‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@
3636

3737

3838
<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification">
39-
<!ENTITY https-everywhere.popup.header "Would you like to download the stable version of HTTPS Everywhere?">
40-
<!ENTITY https-everywhere.popup.paragraph1 "Oops. It appears that you were recently using the stable version of HTTPS Everywhere and are now on the development version. Perhaps we accidentally upgraded you to our development channel in our last release.">
41-
<!ENTITY https-everywhere.popup.paragraph2 "However, we'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org.">
42-
<!ENTITY https-everywhere.popup.paragraph3 "Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
43-
<!ENTITY https-everywhere.popup.keep "Keep me on the development version.">
44-
<!ENTITY https-everywhere.popup.revert "Download the latest stable release.">
39+
<!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release.">
40+
<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?">
41+
<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere@eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere.">
42+
<!ENTITY https-everywhere.popup.keep "Keep me on the development version">
43+
<!ENTITY https-everywhere.popup.revert "Download the latest stable version">

0 commit comments

Comments
 (0)