Commit c1ee4864 authored by Kathleen Brade's avatar Kathleen Brade Committed by Georg Koppen
Browse files

Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set.

If the TOR_HIDE_BROWSER_LOGO environment variable is set, hide
Tor Browser logo within the network settings wizard. Based on
contributions from linostar and proper.
parent ae0cd668
<?xml version="1.0"?>
<!--
- Copyright (c) 2014, The Tor Project, Inc.
- Copyright (c) 2015, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
-->
......@@ -35,7 +35,7 @@
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator orient="vertical" />
<separator class="tbb-logo-separator" orient="vertical" />
<groupbox flex="1">
<description>&torsettings.prompt;</description>
</groupbox>
......@@ -60,7 +60,7 @@
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator />
<separator class="tbb-logo-separator" />
<hbox>
<vbox flex="1">
<label class="question">&torSettings.proxyQuestion;</label>
......@@ -79,7 +79,7 @@
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator />
<separator class="tbb-logo-separator" />
<label class="instructions">&torSettings.enterProxy;</label>
<groupbox id="proxySpecificSettings" />
</wizardpage>
......@@ -89,7 +89,7 @@
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator />
<separator class="tbb-logo-separator" />
<hbox>
<vbox flex="1">
<label class="question">&torSettings.bridgeQuestion;</label>
......@@ -109,7 +109,7 @@
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator />
<separator class="tbb-logo-separator" />
<vbox>
<label id="bridgeSettingsPrompt"
class="question">&torSettings.bridgeSettingsPrompt;</label>
......
// Copyright (c) 2014, The Tor Project, Inc.
// Copyright (c) 2015, The Tor Project, Inc.
// See LICENSE for licensing information.
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
......@@ -120,6 +120,13 @@ function initDialog()
var haveWizard = (wizardElem != null);
if (haveWizard)
{
// Hide the Tor Browser logo and associated separator element if the
// TOR_HIDE_BROWSER_LOGO environment variable is set.
let env = Cc["@mozilla.org/process/environment;1"]
.getService(Ci.nsIEnvironment);
if (env.exists("TOR_HIDE_BROWSER_LOGO"))
wizardElem.setAttribute("tor_hide_browser_logo", true);
// Set "Copy Tor Log" label and move it after the Quit (cancel) button.
var copyLogBtn = document.documentElement.getButton("extra2");
if (copyLogBtn)
......
/*
* Copyright (c) 2014, The Tor Project, Inc.
* Copyright (c) 2015, The Tor Project, Inc.
* See LICENSE for licensing information.
*
* vim: set sw=2 sts=2 ts=8 et syntax=css:
......@@ -94,6 +94,11 @@ button.firstAnswer {
margin-right: 20px;
}
wizard[tor_hide_browser_logo="true"] .tbb-logo,
wizard[tor_hide_browser_logo="true"] .tbb-logo-separator {
display: none;
}
#bridgeCustomEntry {
margin-left: 30px;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment