From 8e2e47778920dd1958e5635a71082d6a742b44d4 Mon Sep 17 00:00:00 2001
From: Romain Gauthier <romain.gauthier@monkeypatch.me>
Date: Mon, 15 Dec 2014 22:28:18 +0000
Subject: [PATCH] Bug 1109325 - Change the help url for Hello's standalone
 rooms. r=nperriault

---
 browser/components/loop/standalone/Makefile                    | 1 +
 .../loop/standalone/content/js/standaloneRoomViews.js          | 2 +-
 .../loop/standalone/content/js/standaloneRoomViews.jsx         | 2 +-
 browser/components/loop/standalone/content/js/webapp.js        | 2 +-
 browser/components/loop/standalone/content/js/webapp.jsx       | 2 +-
 browser/components/loop/standalone/server.js                   | 3 ++-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/browser/components/loop/standalone/Makefile b/browser/components/loop/standalone/Makefile
index 506e9d0154ba..8071f7c54aa4 100644
--- a/browser/components/loop/standalone/Makefile
+++ b/browser/components/loop/standalone/Makefile
@@ -86,3 +86,4 @@ config:
 	@echo "loop.config.fxosApp.manifestUrl = 'http://fake-market.herokuapp.com/apps/packagedApp/manifest.webapp';" >> content/config.js
 	@echo "loop.config.roomsSupportUrl = 'https://support.mozilla.org/kb/group-conversations-firefox-hello-webrtc';" >> content/config.js
 	@echo "loop.config.guestSupportUrl = 'https://support.mozilla.org/kb/respond-firefox-hello-invitation-guest-mode';" >> content/config.js
+	@echo "loop.config.generalSupportUrl = 'https://support.mozilla.org/kb/respond-firefox-hello-invitation-guest-mode';" >> content/config.js
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.js b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
index 48077e1ed512..e61dd960121a 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -147,7 +147,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
       return (
         React.DOM.header(null, 
           React.DOM.h1(null, mozL10n.get("clientShortname2")), 
-          React.DOM.a({target: "_blank", href: loop.config.roomsSupportUrl}, 
+          React.DOM.a({target: "_blank", href: loop.config.generalSupportUrl}, 
             React.DOM.i({className: "icon icon-help"})
           )
         )
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
index 610fdf989ad9..98db359c5fa4 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -147,7 +147,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
       return (
         <header>
           <h1>{mozL10n.get("clientShortname2")}</h1>
-          <a target="_blank" href={loop.config.roomsSupportUrl}>
+          <a target="_blank" href={loop.config.generalSupportUrl}>
             <i className="icon icon-help"></i>
           </a>
         </header>
diff --git a/browser/components/loop/standalone/content/js/webapp.js b/browser/components/loop/standalone/content/js/webapp.js
index aa224f644d9d..7c64237e4140 100644
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -257,7 +257,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
                                   {vendorShortname: mozL10n.get("vendorShortname")}), 
                className: "footer-logo"}), 
           React.DOM.div({className: "footer-external-links"}, 
-            React.DOM.a({target: "_blank", href: loop.config.guestSupportUrl}, 
+            React.DOM.a({target: "_blank", href: loop.config.generalSupportUrl}, 
               mozL10n.get("support_link")
             )
           )
diff --git a/browser/components/loop/standalone/content/js/webapp.jsx b/browser/components/loop/standalone/content/js/webapp.jsx
index 55db44a548ae..24a77a9710dc 100644
--- a/browser/components/loop/standalone/content/js/webapp.jsx
+++ b/browser/components/loop/standalone/content/js/webapp.jsx
@@ -257,7 +257,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
                                   {vendorShortname: mozL10n.get("vendorShortname")})}
                className="footer-logo"></div>
           <div className="footer-external-links">
-            <a target="_blank" href={loop.config.guestSupportUrl}>
+            <a target="_blank" href={loop.config.generalSupportUrl}>
               {mozL10n.get("support_link")}
             </a>
           </div>
diff --git a/browser/components/loop/standalone/server.js b/browser/components/loop/standalone/server.js
index b94ffb248ca5..99f949192579 100644
--- a/browser/components/loop/standalone/server.js
+++ b/browser/components/loop/standalone/server.js
@@ -32,7 +32,8 @@ function getConfigFile(req, res) {
     "loop.config.fxosApp.name = 'Loop';",
     "loop.config.fxosApp.manifestUrl = 'http://fake-market.herokuapp.com/apps/packagedApp/manifest.webapp';",
     "loop.config.roomsSupportUrl = 'https://support.mozilla.org/kb/group-conversations-firefox-hello-webrtc';",
-    "loop.config.guestSupportUrl = 'https://support.mozilla.org/kb/respond-firefox-hello-invitation-guest-mode';"
+    "loop.config.guestSupportUrl = 'https://support.mozilla.org/kb/respond-firefox-hello-invitation-guest-mode';",
+    "loop.config.generalSupportUrl = 'https://support.mozilla.org/kb/respond-firefox-hello-invitation-guest-mode';"
   ].join("\n"));
 }