[tbb-commits] [torbutton/master] Bug #5698: Use "Tor Browser" branding in "About Tor Browser" dialog
gk at torproject.org
gk at torproject.org
Wed Feb 18 10:27:09 UTC 2015
commit 7fd169e56e60ff70254c2d60600fab88a03246da
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date: Sat Feb 14 16:58:44 2015 -0800
Bug #5698: Use "Tor Browser" branding in "About Tor Browser" dialog
---
src/chrome.manifest | 1 +
src/chrome/content/aboutDialog.xul | 56 ++++++++++++++++++++++++++++++++++
src/chrome/locale/en/aboutDialog.dtd | 19 ++++++++++++
src/chrome/skin/about-wordmark.png | Bin 0 -> 4609 bytes
src/chrome/skin/aboutDialog.css | 34 +++++++++++++++++++++
src/chrome/skin/default256.png | Bin 0 -> 48898 bytes
6 files changed, 110 insertions(+)
diff --git a/src/chrome.manifest b/src/chrome.manifest
index 2ab3c8f..6ef50dc 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -8,6 +8,7 @@ resource torbutton ./
# browser branding
override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd
override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties
+overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul
locale torbutton af chrome/locale/af/
locale torbutton ak chrome/locale/ak/
diff --git a/src/chrome/content/aboutDialog.xul b/src/chrome/content/aboutDialog.xul
new file mode 100644
index 0000000..5b89a81
--- /dev/null
+++ b/src/chrome/content/aboutDialog.xul
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: HTML -*- -->
+<?xml-stylesheet href="chrome://torbutton/skin/aboutDialog.css" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd" >
+%aboutDialogDTD;
+]>
+
+<overlay id="main-overlay"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ <vbox id="rightBox">
+ <vbox id="detailsBox">
+ <description class="text-blurb" id="projectDesc">
+ &project.start;
+ <label class="text-link"
+ href="https://www.torproject.org/">
+ &project.tpoLink;
+ </label>&project.end;
+ </description>
+ <description class="text-blurb" id="helpDesc">
+ &help.start;
+ <label class="text-link"
+ href="https://www.torproject.org/donate/donate.html.en">
+ &help.donateLink;
+ </label>
+ &help.or;
+ <label class="text-link"
+ href="https://www.torproject.org/getinvolved/volunteer.html.en">
+ &help.getInvolvedLink;
+ </label>&help.end;
+ </description>
+ </vbox>
+ </vbox>
+
+ <vbox id="bottomBox">
+ <hbox id="newBottom" pack="center" position="1">
+ <label class="text-link bottom-link"
+ href="https://www.torproject.org/docs/faq.html.en">
+ &bottomLinks.questions;
+ </label>
+ <label class="text-link bottom-link"
+ href="https://www.torproject.org/getinvolved/relays">
+ &bottomLinks.grow;
+ </label>
+ <label class="text-link bottom-link"
+ href="about:license">
+ &bottomLinks.license;
+ </label>
+ </hbox>
+ <description id="trademarkTor" insertafter="trademark">
+ &tor.TrademarkStatement;
+ </description>
+ </vbox>
+</overlay>
diff --git a/src/chrome/locale/en/aboutDialog.dtd b/src/chrome/locale/en/aboutDialog.dtd
new file mode 100644
index 0000000..844f4e0
--- /dev/null
+++ b/src/chrome/locale/en/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start "&brandShortName; is developed by ">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink "the &vendorShortName;">
+<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online.">
+
+<!ENTITY help.start "Want to help? ">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink "Donate">
+<!ENTITY help.or " or ">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink "get involved">
+<!ENTITY help.end "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions "Questions?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow "Help the Tor Network Grow!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license "Licensing Information">
+<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc.">
diff --git a/src/chrome/skin/about-wordmark.png b/src/chrome/skin/about-wordmark.png
new file mode 100644
index 0000000..1becd87
Binary files /dev/null and b/src/chrome/skin/about-wordmark.png differ
diff --git a/src/chrome/skin/aboutDialog.css b/src/chrome/skin/aboutDialog.css
new file mode 100644
index 0000000..89eff53
--- /dev/null
+++ b/src/chrome/skin/aboutDialog.css
@@ -0,0 +1,34 @@
+#leftBox {
+ background-image: url('chrome://torbutton/skin/default256.png');
+ background-position: right top;
+ background-size: 180px;
+}
+
+#rightBox {
+ background-image: url('chrome://torbutton/skin/about-wordmark.png');
+ background-position: left top;
+}
+
+#contributeDesc {
+ display: none;
+}
+
+#communityDesc {
+ display: none;
+}
+
+#trademark {
+ display: none;
+}
+
+#trademarkTor {
+ font-size: xx-small;
+ text-align: center;
+ color: #999999;
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+#bottomBox > hbox:not(#newBottom) {
+ display: none;
+}
diff --git a/src/chrome/skin/default256.png b/src/chrome/skin/default256.png
new file mode 100644
index 0000000..3d440fb
Binary files /dev/null and b/src/chrome/skin/default256.png differ
More information about the tbb-commits
mailing list