Bug 1109325 - Change the help url for Hello's standalone rooms. r=nperriault a=sylvestre
authorRomain Gauthier <romain.gauthier@monkeypatch.me>
Mon, 15 Dec 2014 22:28:18 +0000
changeset 242486 70f5d0f70c683e0b2d44e0da225a57bec45dde7f
parent 242485 67828882b7df8847887fe58e1def6b4e2f7f25ab
child 242487 4bb4a4d373382b99d255e2ffa90c5e8e3842e1b9
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnperriault, sylvestre
bugs1109325
milestone36.0a2
Bug 1109325 - Change the help url for Hello's standalone rooms. r=nperriault a=sylvestre
browser/components/loop/standalone/Makefile
browser/components/loop/standalone/content/js/standaloneRoomViews.js
browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
browser/components/loop/standalone/content/js/webapp.js
browser/components/loop/standalone/content/js/webapp.jsx
browser/components/loop/standalone/server.js
--- a/browser/components/loop/standalone/Makefile
+++ b/browser/components/loop/standalone/Makefile
@@ -81,8 +81,9 @@ config:
 	@echo "loop.config.privacyWebsiteUrl = '`echo $(LOOP_PRIVACY_WEBSITE_URL)`';" >> content/config.js
 	@echo "loop.config.legalWebsiteUrl = '`echo $(LOOP_LEGAL_WEBSITE_URL)`';" >> content/config.js
 	@echo "loop.config.learnMoreUrl = '`echo $(LOOP_PRODUCT_HOMEPAGE_URL)`';" >> content/config.js
 	@echo "loop.config.fxosApp = loop.config.fxosApp || {};" >> content/config.js
 	@echo "loop.config.fxosApp.name = 'Loop';" >> content/config.js
 	@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
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -142,17 +142,17 @@ loop.standaloneRoomViews = (function(moz
     }
   });
 
   var StandaloneRoomHeader = React.createClass({displayName: 'StandaloneRoomHeader',
     render: function() {
       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"})
           )
         )
       );
     }
   });
 
   var StandaloneRoomFooter = React.createClass({displayName: 'StandaloneRoomFooter',
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -142,17 +142,17 @@ loop.standaloneRoomViews = (function(moz
     }
   });
 
   var StandaloneRoomHeader = React.createClass({
     render: function() {
       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>
       );
     }
   });
 
   var StandaloneRoomFooter = React.createClass({
--- a/browser/components/loop/standalone/content/js/webapp.js
+++ b/browser/components/loop/standalone/content/js/webapp.js
@@ -252,17 +252,17 @@ loop.webapp = (function($, _, OT, mozL10
   var ConversationFooter = React.createClass({displayName: 'ConversationFooter',
     render: function() {
       return (
         React.DOM.div({className: "standalone-footer container-box"}, 
           React.DOM.div({title: mozL10n.get("vendor_alttext",
                                   {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")
             )
           )
         )
       );
     }
   });
 
--- a/browser/components/loop/standalone/content/js/webapp.jsx
+++ b/browser/components/loop/standalone/content/js/webapp.jsx
@@ -252,17 +252,17 @@ loop.webapp = (function($, _, OT, mozL10
   var ConversationFooter = React.createClass({
     render: function() {
       return (
         <div className="standalone-footer container-box">
           <div title={mozL10n.get("vendor_alttext",
                                   {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>
         </div>
       );
     }
   });
 
--- a/browser/components/loop/standalone/server.js
+++ b/browser/components/loop/standalone/server.js
@@ -27,17 +27,18 @@ function getConfigFile(req, res) {
     "loop.config.brandWebsiteUrl = 'https://www.mozilla.org/firefox/';",
     "loop.config.privacyWebsiteUrl = 'https://www.mozilla.org/privacy/firefox-hello/';",
     "loop.config.learnMoreUrl = 'https://www.mozilla.org/hello/';",
     "loop.config.legalWebsiteUrl = 'https://www.mozilla.org/about/legal/terms/firefox-hello/';",
     "loop.config.fxosApp = loop.config.fxosApp || {};",
     "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"));
 }
 
 app.get('/content/config.js', getConfigFile);
 app.get('/content/c/config.js', getConfigFile);
 
 // Various mappings to let us end up with:
 // /test - for the test files