[tor-commits] [tor-launcher/master] Bug #10894: Help desk is not a bridge autoresponder.

[brade at torproject.org]

commit d53bcc2e772b3ff9e949ec8f961023f11f903991
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Thu Feb 27 14:58:56 2014 -0500

    Bug #10894: Help desk is not a bridge autoresponder.
    
    Use revised Bridge Relay Help text/layout in Network Settings dialog.
---
 src/chrome/content/network-settings-overlay.xul |   23 ++++++++++++++++++++++-
 src/chrome/content/network-settings-wizard.xul  |   19 +------------------
 src/chrome/content/network-settings.xul         |    6 +-----
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul
index efbc3c6..b7141f0 100644
--- a/src/chrome/content/network-settings-overlay.xul
+++ b/src/chrome/content/network-settings-overlay.xul
@@ -8,7 +8,8 @@
 <!DOCTYPE overlay SYSTEM "chrome://torlauncher/locale/network-settings.dtd">
 
 <overlay id="TorNetworkSettingsOverlay"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml">
 
   <groupbox id="proxySpecificSettings">
     <grid flex="1">
@@ -92,6 +93,26 @@
 -->
     </hbox>
   </groupbox>
+
+  <vbox id="bridgeHelpContent">
+    <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox>
+    <description>&torsettings.bridgeHelp1;</description>
+    <description class="prelist">&torsettings.bridgeHelp1B;</description>
+    <html:ol>
+      <html:li>
+        <html:div class="heading">&torsettings.bridgeHelp2Heading;</html:div>
+        <html:div>&torsettings.bridgeHelp2;</html:div>
+      </html:li>
+      <html:li>
+        <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div>
+        <html:div>&torsettings.bridgeHelp3;</html:div>
+      </html:li>
+      <html:li>
+        <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div>
+        <html:div class="endOfHelp">&torsettings.bridgeHelp4;</html:div>
+      </html:li>
+    </html:ol>
+  </vbox>
 </overlay>
 
 
diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul
index dcc169e..b1c5c82 100644
--- a/src/chrome/content/network-settings-wizard.xul
+++ b/src/chrome/content/network-settings-wizard.xul
@@ -15,7 +15,6 @@
 
 <wizard id="TorNetworkSettings"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         title="&torsettings.dialog.title;"
         windowtype="TorLauncher:NetworkSettings"
         persist="screenX screenY"
@@ -148,23 +147,7 @@
 
   <wizardpage class="help"  label=" " pageid="bridgeHelp" next="notUsed"
               onpageadvanced="closeHelp(); return false;">
-    <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox>
-    <description>&torsettings.bridgeHelp1;</description>
-    <description class="prelist">&torsettings.bridgeHelp1B;</description>
-    <html:ol>
-      <html:li>
-        <html:div class="heading">&torsettings.bridgeHelp2Heading;</html:div>
-        <html:div>&torsettings.bridgeHelp2;</html:div>
-      </html:li>
-      <html:li>
-        <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div>
-        <html:div>&torsettings.bridgeHelp3;</html:div>
-      </html:li>
-      <html:li>
-        <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div>
-        <html:div class="endOfHelp">&torsettings.bridgeHelp4;</html:div>
-      </html:li>
-    </html:ol>
+    <vbox id="bridgeHelpContent" />
   </wizardpage>
 
   <hbox pack="start">
diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul
index ae4eb8d..4c4eeed 100644
--- a/src/chrome/content/network-settings.xul
+++ b/src/chrome/content/network-settings.xul
@@ -70,11 +70,7 @@
     </vbox>
     <vbox id="errorPanel"/>
     <vbox id="bridgeHelp" class="help">
-      <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox>
-      <description>&torsettings.bridgeHelp1;</description>
-      <description>&torsettings.bridgeHelp2;</description>
-      <description>&torsettings.bridgeHelp3;</description>
-      <description class="endOfHelp">&torsettings.bridgeHelp4;</description>
+      <vbox id="bridgeHelpContent" />
     </vbox>
   </deck>
   <spring flex="1" />