Merge pull request #2528 from adaptlearning/issue/2527

Add configurable support fields

Author: tomgreenfield

frontend/src/core/helpers.js

@@ -326,6 +326,11 @@ define(function(require){
         }
       }
       return flatProperties;
+    },
+
+    importConstants: function() {
+      this.constants = Origin.constants;
+      return '';
     }
   };
 

frontend/src/modules/help/index.js

@@ -2,7 +2,12 @@ define(function(require) {
   var Origin = require('core/origin');
 
   Origin.on('navigation:help', function() {
-    openWikiLink(getLink());
+    var override = Origin.constants.supportLink;
+    if (override) {
+      window.open(override);
+    } else {
+      openWikiLink(getLink());
+    }
   });
 
   function getLink() {

frontend/src/modules/user/templates/forgotPassword.hbs

@@ -1,3 +1,5 @@
+{{importConstants}}
+
 <div class="login-logo"></div>
 
 <div class="login-title">{{t 'app.resetpassword'}}</div>
@@ -24,6 +26,11 @@
     </form>
   </div>
     <div class="forgot-footer">
-    <strong>{{t 'app.hasyouremailchanged'}}</strong> {{t 'app.forgotpasswordfooter'}}
+    <strong>{{t 'app.hasyouremailchanged'}}</strong>
+    {{#if constants.supportContact}}
+    {{t 'app.forgotpasswordfooter' supportContact=constants.supportContact}}
+    {{else}}
+    {{t 'app.forgotpasswordfooter' supportContact=(t 'app.anadmin')}}
+    {{/if}}
   </div>
 </div>

lib/configuration.js

@@ -34,7 +34,9 @@ var ALLOWED_CLIENT_SIDE_KEYS = [
   'maxLoginAttempts',
   'ckEditorExtraAllowedContent',
   'ckEditorEnterMode',
-  'maxFileUploadSize'
+  'maxFileUploadSize',
+  'supportLink',
+  'supportContact'
 ];
 
 /**

routes/lang/en.json

@@ -133,7 +133,8 @@
   "app.confirmpassword": "Confirm password",
   "app.passwordtip": "Enter a new password below. The most secure passwords have a mix of numbers, letters (including capitals) and other characters.",
   "app.forgotpasswordblurb": "Enter the email address associated with your Adapt account, then click Continue.",
-  "app.forgotpasswordfooter": "Contact Support for help with restoring access to your account.",
+  "app.forgotpasswordfooter": "Contact %{supportContact} for help with restoring access to your account.",
+  "app.anadmin": "an administrator",
   "app.hasyouremailchanged": "Has your email address changed?",
   "app.forgotpasswordsuccess": "Your request is being processed. If the details you provided match our records, you will receive further instructions via email.",
   "app.returnto": "Return to",