Add 25th birthday link to menu.

jsha · jsha · commit f415c0ee38ae · 2015-07-10T14:23:32.000-07:00
Simplify makexpi.sh --fast so that it can be passed as an env var.
Move donate link higher in about box.
diff --git a/makexpi.sh b/makexpi.sh
@@ -18,11 +18,14 @@ APP_NAME=https-everywhere
 cd "`dirname $0`"
 RULESETS_SQLITE="$PWD/src/defaults/rulesets.sqlite"
 ANDROID_APP_ID=org.mozilla.firefox
+if [ "$1" == "--fast" ]; then
+  FAST=true
+fi
 
 [ -d pkg ] || mkdir pkg
 
 # If the command line argument is a tag name, check that out and build it
-if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
+if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ -z "$FAST" ] ; then
   BRANCH=`git branch | head -n 1 | cut -d \  -f 2-`
   SUBDIR=checkout
   [ -d $SUBDIR ] || mkdir $SUBDIR
@@ -51,7 +54,7 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] && [ "$1" != "--fast" ] ; then
   exit 0
 fi
 
-if [ "$1" != "--fast" -o ! -f "$RULESETS_SQLITE" ] ; then
+if [ -z "$FAST" -o ! -f "$RULESETS_SQLITE" ] ; then
   # This is an optimization to get the OS reading the rulesets into RAM ASAP;
   # it's useful on machines with slow disk seek times; doing several of these
   # at once allows the IO subsystem to seek more efficiently.
@@ -72,7 +75,7 @@ die() {
   exit 1
 }
 
-if [ "$1" != "--fast" -a -z "$FAST" ] ; then
+if [ -z "$FAST" ] ; then
   if python2.7 ./utils/trivial-validate.py --quiet --db $RULESETS_SQLITE >&2
   then
     echo Validation of included rulesets completed. >&2
@@ -120,7 +123,7 @@ fi
 
 # The name/version of the XPI we're building comes from src/install.rdf
 XPI_NAME="pkg/$APP_NAME-`grep em:version src/install.rdf | sed -e 's/[<>]/	/g' | cut -f3`"
-if [ "$1" ] && [ "$1" != "--fast" ] ; then
+if [ "$1" -a -z "$FAST" ] ; then
   XPI_NAME="$XPI_NAME"
 else
   # During development, generate packages named with the short hash of HEAD.
diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul
@@ -19,6 +19,23 @@
     <label style="text-align:center; font-weight:bold; font-size:22px;">&https-everywhere.about.ext_name;</label>
     <label style="text-align:center; font-size:18px; margin-bottom:10px;">&https-everywhere.about.ext_description;</label>
 
+    <label style="font-weight:bold; margin-top:10px;">
+      &https-everywhere.about.contribute;
+      <label id="donate link"
+        value="&https-everywhere.about.donate_tor;"
+        style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
+        onmouseover="event.target.style.cursor='pointer'"
+        onmouseout="event.target.style.cursor='default'"
+        onclick="window_opener('https://www.torproject.org/donate/donate.html.en')"/>
+      &https-everywhere.about.or;
+      <label id="donate link2"
+        value="&https-everywhere.about.donate_eff;"
+        style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
+        onmouseover="event.target.style.cursor='pointer'"
+        onmouseout="event.target.style.cursor='default'"
+        onclick="window_opener('https://www.eff.org/donate')"/>
+    </label>
+
     <groupbox>
       <caption label="&https-everywhere.about.version;" />
       <label>5.0.5</label>
@@ -51,22 +68,5 @@
       from NoScript, by Giorgio Maone and others.  We are grateful for their
       excellent work!</label>
     </groupbox>
-
-    <label style="font-weight:bold; margin-top:10px;">
-      &https-everywhere.about.contribute;
-      <label id="donate link"
-        value="&https-everywhere.about.donate_tor;"
-        style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
-        onmouseover="event.target.style.cursor='pointer'"
-        onmouseout="event.target.style.cursor='default'"
-        onclick="window_opener('https://www.torproject.org/donate/donate.html.en')"/>
-      &https-everywhere.about.or;
-      <label id="donate link2"
-        value="&https-everywhere.about.donate_eff;"
-        style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
-        onmouseover="event.target.style.cursor='pointer'"
-        onmouseout="event.target.style.cursor='default'"
-        onclick="window_opener('https://www.eff.org/donate')"/>
-    </label>
   </vbox>
 </dialog>
diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul
@@ -51,6 +51,8 @@
         <menuseparator />
         <menuitem label="&https-everywhere.menu.observatory;" command="https-everywhere-menuitem-observatory" />
         <menuitem label="&https-everywhere.menu.about;" command="https-everywhere-menuitem-about" />
+        <menuitem type="checkbox" class="birthday menuitem-iconic" image="chrome://https-everywhere/skin/eff-16.png"
+          label="Happy 25th birthday, EFF!" command="https-everywhere-menuitem-birthday" />
       </menupopup>
     </toolbarbutton>
   </toolbarpalette>
@@ -61,6 +63,8 @@
       oncommand="HTTPSEverywhere.chrome_opener('chrome://https-everywhere/content/preferences.xul', 'chrome,centerscreen,resizable=yes');" />
     <command id="https-everywhere-menuitem-about"
       oncommand="HTTPSEverywhere.chrome_opener('chrome://https-everywhere/content/about.xul');" />
+    <command id="https-everywhere-menuitem-birthday"
+      oncommand="open_in_tab('https://www.eff.org/EFF25');" />
     <command id="https-everywhere-menuitem-observatory"
       oncommand="HTTPSEverywhere.chrome_opener('chrome://https-everywhere/content/observatory-preferences.xul', 'chrome,centerscreen,resizable=yes');" />
     <command id="https-everywhere-menuitem-donate-eff" 
diff --git a/src/chrome/skin/eff-16.png b/src/chrome/skin/eff-16.png
diff --git a/src/chrome/skin/https-everywhere.css b/src/chrome/skin/https-everywhere.css
@@ -75,3 +75,6 @@ toolbar[iconsize="small"] #https-everywhere-button[status="disabled"] > .https-e
   color: #999999;
   font-weight: bold;
 }
+#https-everywhere-button menuitem.birthday label {
+  font-weight: bold;
+}

Original file line number	Diff line number	Diff line change
`@@ -75,3 +75,6 @@ toolbar[iconsize="small"] #https-everywhere-button[status="disabled"] > .https-e`
`75`	`75`	`color: #999999;`
`76`	`76`	`font-weight: bold;`
`77`	`77`	`}`
	`78`	`+#https-everywhere-button menuitem.birthday label {`
	`79`	`+ font-weight: bold;`
	`80`	`+}`