Commit c12448c9 authored by Kathleen Brade's avatar Kathleen Brade
Browse files

Bug 15145: Visually distinguish "proxy" and "bridge" screens.

Add the following titles to the bridge and proxy wizard pages:
    "Tor Bridges Configuration"
    "Local Proxy Configuration"
parent 79bbdee3
......@@ -57,10 +57,16 @@
<wizardpage pageid="bridges" next="proxy" onextra2="onCopyLog();"
onpageshow="showWizardNavButtons(true);"
onpageadvanced="return onWizardUseBridgesNext(this)">
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator class="tbb-logo-separator" />
<hbox class="tbb-header">
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator class="tbb-logo-separator" orient="vertical" />
<vbox pack="end">
<label class="tbb-wizardpage-title" value="&torSettings.bridgePageTitle;"/>
</vbox>
</hbox>
<separator />
<hbox>
<vbox flex="1">
<label class="question">&torSettings.bridgeQuestion;</label>
......@@ -76,10 +82,16 @@
<wizardpage pageid="bridgeSettings" next="proxy" onextra2="onCopyLog();"
onpageshow="onWizardBridgeSettingsShow();">
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator class="tbb-logo-separator" />
<hbox class="tbb-header">
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator class="tbb-logo-separator" orient="vertical" />
<vbox pack="end">
<label class="tbb-wizardpage-title" value="&torSettings.bridgePageTitle;"/>
</vbox>
</hbox>
<separator />
<vbox>
<label id="bridgeSettingsPrompt"
class="question">&torSettings.bridgeSettingsPrompt;</label>
......@@ -90,10 +102,16 @@
<wizardpage pageid="proxy" onextra2="onCopyLog();"
onpageshow="onWizardUseProxyRadioChange()"
onpageadvanced="return onWizardProxyNext(this);">
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator class="tbb-logo-separator" />
<hbox class="tbb-header">
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator class="tbb-logo-separator" orient="vertical" />
<vbox pack="end">
<label class="tbb-wizardpage-title" value="&torSettings.proxyPageTitle;"/>
</vbox>
</hbox>
<separator />
<hbox>
<vbox flex="1">
<label class="question">&torSettings.proxyQuestion;</label>
......@@ -111,10 +129,16 @@
<wizardpage pageid="proxyYES" onextra2="onCopyLog();"
onpageshow="onWizardProxySettingsShow()"
onpageadvanced="return (getAndValidateProxySettings() != null)">
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator class="tbb-logo-separator" />
<hbox class="tbb-header">
<vbox class="tbb-logo-box" align="start">
<image class="tbb-logo" />
</vbox>
<separator class="tbb-logo-separator" orient="vertical" />
<vbox pack="end">
<label class="tbb-wizardpage-title" value="&torSettings.proxyPageTitle;"/>
</vbox>
</hbox>
<separator />
<label class="instructions">&torSettings.enterProxy;</label>
<groupbox id="proxySpecificSettings" />
</wizardpage>
......
......@@ -15,10 +15,12 @@
<!ENTITY torSettings.connectPrompt3 "This will work in most situations.">
<!ENTITY torSettings.connect "Connect">
<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration">
<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">
<!-- see https://www.torproject.org/docs/proxychain.html.en -->
<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy.">
<!ENTITY torSettings.enterProxy "Enter the proxy settings.">
<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration">
<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">
......
......@@ -99,6 +99,11 @@ wizard[tor_hide_browser_logo="true"] .tbb-logo-separator {
display: none;
}
.tbb-wizardpage-title {
font-size: 115%;
font-weight: bold;
}
#bridgeDefaultEntry,
#bridgeCustomEntry {
margin-left: 1.8em;
......
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