[tor-commits] [tor-launcher/master] Display help at rt.torproject.org in Network Settings.

[brade at torproject.org]

commit 748564586b231b43b98e06d86192d1ad33b7fb92
Author: Kathy Brade <brade at torproject.org>
Date:   Mon Apr 29 16:42:20 2013 -0400

    Display help at rt.torproject.org in Network Settings.
---
 src/chrome/content/network-settings-wizard.xul |    4 +++-
 src/chrome/content/network-settings.js         |   10 ++++++++++
 src/chrome/content/network-settings.xul        |    3 ++-
 src/chrome/locale/en/torlauncher.properties    |    2 ++
 src/chrome/skin/network-settings.css           |   10 +++++++++-
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul
index 249c9ce..2316db6 100644
--- a/src/chrome/content/network-settings-wizard.xul
+++ b/src/chrome/content/network-settings-wizard.xul
@@ -35,7 +35,6 @@
       <separator orient="vertical" />
       <groupbox flex="1">
         <description>&torsettings.prompt;</description>
-        <separator orient="horizontal" class="thin" />
       </groupbox>
     </hbox>
     <separator />
@@ -127,4 +126,7 @@
     <description>&torsettings.bridgeHelp3;</description>
   </wizardpage>
 
+  <hbox pack="start">
+    <label id="forAssistance" />
+  </hbox>
 </wizard>
diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index 904e5f8..0af6d90 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -15,6 +15,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil",
 XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger",
                           "resource://torlauncher/modules/tl-logger.jsm");
 
+
+const kSupportAddr = "help at rt.torproject.org";
+
 const kTorProcessReadyTopic = "TorProcessIsReady";
 const kTorProcessExitedTopic = "TorProcessExited";
 const kTorProcessDidNotStartTopic = "TorProcessDidNotStart";
@@ -55,6 +58,13 @@ var gRestoreAfterHelpPanelID = null;
 
 function initDialog()
 {
+  var forAssistance = document.getElementById("forAssistance");
+  if (forAssistance)
+  {
+    forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString(
+                                        "forAssistance", [kSupportAddr], 1);
+  }
+
   var cancelBtn = document.documentElement.getButton("cancel");
   gIsInitialBootstrap = window.arguments[0];
   if (gIsInitialBootstrap)
diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul
index 7de2f60..f88b178 100644
--- a/src/chrome/content/network-settings.xul
+++ b/src/chrome/content/network-settings.xul
@@ -70,5 +70,6 @@
       <description>&torsettings.bridgeHelp3;</description>
     </vbox>
   </deck>
-  <spring />
+  <spring flex="1" />
+  <label id="forAssistance" />
 </dialog>
diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties
index 362f122..5ed593a 100644
--- a/src/chrome/locale/en/torlauncher.properties
+++ b/src/chrome/locale/en/torlauncher.properties
@@ -26,3 +26,5 @@ torlauncher.connect=Connect
 torlauncher.quit=Quit
 torlauncher.quit_win=Exit
 torlauncher.done=Done
+
+torlauncher.forAssistance=For assistance, contact %S
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index 9970585..c826358 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -7,16 +7,24 @@
 
 dialog {
   width: 520px;
-  height: 440px;
+  height: 464px;
   font: -moz-dialog;
 }
 
 wizard {
   width: 540px;
+  height: 410px;
   font: -moz-dialog;
   padding-top: 0px;
 }
 
+#forAssistance {
+  margin-bottom: 6px;
+  -moz-user-select: text;
+  -moz-user-focus: normal;
+  cursor: text;
+}
+
 wizard label {
   margin: 0px;
 }