From f16cfea801d2dba3c3e8ec2ee015d095444ee9ba Mon Sep 17 00:00:00 2001
From: Tasawer Nawaz <tasawer.nawaz@arbisoft.com>
Date: Wed, 17 Jan 2018 18:17:54 +0500
Subject: [PATCH] update help link in header LEARNER-2437

---
 lms/templates/header/header.html                           | 1 -
 lms/templates/header/navbar-authenticated.html             | 7 ++++++-
 .../edx.org/lms/templates/header/navbar-authenticated.html | 7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lms/templates/header/header.html b/lms/templates/header/header.html
index 55d03c3529..eb25c78897 100644
--- a/lms/templates/header/header.html
+++ b/lms/templates/header/header.html
@@ -74,7 +74,6 @@ site_status_msg = get_site_status_msg(course_id)
 <![endif]-->
 % endif
 
-<%include file="../help_modal.html"/>
 % if settings.FEATURES.get('ENABLE_COOKIE_CONSENT', False):
   <%include file="../widgets/cookie-consent.html" />
 % endif
diff --git a/lms/templates/header/navbar-authenticated.html b/lms/templates/header/navbar-authenticated.html
index 050325b882..32b3bf4997 100644
--- a/lms/templates/header/navbar-authenticated.html
+++ b/lms/templates/header/navbar-authenticated.html
@@ -7,6 +7,7 @@
 <%!
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 %>
 
 <%
@@ -57,7 +58,11 @@ from django.utils.translation import ugettext as _
       </div>
     % endif
     <div class="mobile-nav-item hidden-mobile nav-item">
-      <a class="help-link" href="${get_online_help_info(online_help_token)['doc_url']}" target="_blank">${_("Help")}</a>
+      % if online_help_token == "instructor":
+        <a class="help-link" href="${get_online_help_info(online_help_token)['doc_url']}" target="_blank">${_("Help")}</a>
+      % else:
+        <a class="help-link" href="${configuration_helpers.get_value('SUPPORT_SITE_LINK', settings.SUPPORT_SITE_LINK)}" target="_blank">${_("Help")}</a>
+      % endif
     </div>
     <%include file="user_dropdown.html"/>
   </div>
diff --git a/themes/edx.org/lms/templates/header/navbar-authenticated.html b/themes/edx.org/lms/templates/header/navbar-authenticated.html
index 35eafa1291..eb76f36ab3 100644
--- a/themes/edx.org/lms/templates/header/navbar-authenticated.html
+++ b/themes/edx.org/lms/templates/header/navbar-authenticated.html
@@ -7,6 +7,7 @@
 <%!
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
+from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 %>
 
 <%
@@ -61,7 +62,11 @@ from django.utils.translation import ugettext as _
       </div>
     % endif
     <div class="mobile-nav-item hidden-mobile nav-item">
-      <a href="${get_online_help_info(online_help_token)['doc_url']}" target="_blank">${_("Help")}</a>
+      % if online_help_token == "instructor":
+        <a class="help-link" href="${get_online_help_info(online_help_token)['doc_url']}" target="_blank">${_("Help")}</a>
+      % else:
+        <a class="help-link" href="${configuration_helpers.get_value('SUPPORT_SITE_LINK', settings.SUPPORT_SITE_LINK)}" target="_blank">${_("Help")}</a>
+      % endif
     </div>
     <%include file="user_dropdown.html"/>
   </div>