From 67962748b2ef8f44a78c206be8eb07dbdfff4b14 Mon Sep 17 00:00:00 2001
From: Tasawer Nawaz <tasawer.nawaz@arbisoft.com>
Date: Wed, 4 Apr 2018 12:43:07 +0500
Subject: [PATCH] add note on for logged out users on support form LEARNER-3783

---
 .../support/static/support/jsx/logged_out_user.jsx          | 6 +++++-
 .../support/static/support/jsx/single_support_form.jsx      | 1 +
 lms/djangoapps/support/views/contact_us.py                  | 1 +
 lms/static/sass/views/_support.scss                         | 4 ++++
 lms/templates/support/contact_us.html                       | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/support/static/support/jsx/logged_out_user.jsx b/lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
index a5d1430d1e..ee8fdf30f9 100644
--- a/lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
+++ b/lms/djangoapps/support/static/support/jsx/logged_out_user.jsx
@@ -3,7 +3,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-function LoggedOutUser({ platformName, loginQuery }) {
+function LoggedOutUser({ platformName, loginQuery, supportEmail }) {
   return (
     <div>
       <div className="row">
@@ -21,6 +21,9 @@ function LoggedOutUser({ platformName, loginQuery }) {
       <div className="row">
         <div className="col-sm-12">
           <a className="create-account" href={`/register${loginQuery}`}>{gettext(`Create an ${platformName} account`)}</a>
+          <p className="create-account-note">
+            {gettext(`If you are unable to access your account contact us via email using ${supportEmail}.`)}
+          </p>
         </div>
       </div>
     </div>
@@ -30,6 +33,7 @@ function LoggedOutUser({ platformName, loginQuery }) {
 LoggedOutUser.propTypes = {
   platformName: PropTypes.string.isRequired,
   loginQuery: PropTypes.string.isRequired,
+  supportEmail: PropTypes.string.isRequired,
 };
 
 export default LoggedOutUser;
diff --git a/lms/djangoapps/support/static/support/jsx/single_support_form.jsx b/lms/djangoapps/support/static/support/jsx/single_support_form.jsx
index 0b3d6b6cbc..721fc95bfb 100644
--- a/lms/djangoapps/support/static/support/jsx/single_support_form.jsx
+++ b/lms/djangoapps/support/static/support/jsx/single_support_form.jsx
@@ -124,6 +124,7 @@ class RenderForm extends React.Component {
       userElement = (<LoggedOutUser
         platformName={this.props.context.platformName}
         loginQuery={this.props.context.loginQuery}
+        supportEmail={this.props.context.supportEmail}
       />);
     }
 
diff --git a/lms/djangoapps/support/views/contact_us.py b/lms/djangoapps/support/views/contact_us.py
index e6abfce96b..a4ecae66fe 100644
--- a/lms/djangoapps/support/views/contact_us.py
+++ b/lms/djangoapps/support/views/contact_us.py
@@ -18,6 +18,7 @@ class ContactUsView(View):
     def get(self, request):
         context = {
             'platform_name': configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME),
+            'support_email': configuration_helpers.get_value('CONTACT_EMAIL', settings.CONTACT_EMAIL),
             'custom_fields': settings.ZENDESK_CUSTOM_FIELDS
         }
 
diff --git a/lms/static/sass/views/_support.scss b/lms/static/sass/views/_support.scss
index b64f6e3c6d..da4872d80b 100644
--- a/lms/static/sass/views/_support.scss
+++ b/lms/static/sass/views/_support.scss
@@ -300,6 +300,10 @@
     font-size: $support-form-base-font-size + 4;
   }
 
+  .create-account-note {
+    padding-top: $baseline - 5;
+  }
+
   input[type='text'] {
     font-size: $support-form-base-font-size - 2;
     font-family: $font-family-sans-serif;
diff --git a/lms/templates/support/contact_us.html b/lms/templates/support/contact_us.html
index f13831eaf8..3966ec106e 100644
--- a/lms/templates/support/contact_us.html
+++ b/lms/templates/support/contact_us.html
@@ -36,6 +36,7 @@ from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_j
             'submitFormUrl': "${reverse('zendesk_proxy_v1') | n, js_escaped_string}",
             'customFields': ${custom_fields | n, dump_js_escaped_json},
             'tags': ${tags | n, dump_js_escaped_json},
+            'supportEmail': "${support_email | n, js_escaped_string}",
         }
 
         % if user.is_authenticated():