Your password has been set. You may go ahead and log in now..
+Your password has been set. You may go ahead and log in now..
diff --git a/common/djangoapps/mitxmako/shortcuts.py b/common/djangoapps/mitxmako/shortcuts.py
index 4298c60f71..0766564027 100644
--- a/common/djangoapps/mitxmako/shortcuts.py
+++ b/common/djangoapps/mitxmako/shortcuts.py
@@ -47,6 +47,26 @@ def marketing_link(name):
return '#'
+def marketing_link_context_processor(request):
+ """
+ A django context processor to give templates access to marketing URLs
+
+ Returns a dict whose keys are the marketing link names usable with the
+ marketing_link method (e.g. 'ROOT', 'CONTACT', etc.) prefixed with
+ 'MKTG_URL_' and whose values are the corresponding URLs as computed by the
+ marketing_link method.
+ """
+ return dict(
+ [
+ ("MKTG_URL_" + k, marketing_link(k))
+ for k in (
+ settings.MKTG_URL_LINK_MAP.viewkeys() |
+ settings.MKTG_URLS.viewkeys()
+ )
+ ]
+ )
+
+
def render_to_string(template_name, dictionary, context=None, namespace='main'):
context_instance = Context(dictionary)
# add dictionary to context_instance
diff --git a/lms/envs/common.py b/lms/envs/common.py
index e2347f47cc..f0da29a0ed 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -176,6 +176,9 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.contrib.messages.context_processors.messages',
'sekizai.context_processors.sekizai',
'course_wiki.course_nav.context_processor',
+
+ # Hack to get required link URLs to password reset templates
+ 'mitxmako.shortcuts.marketing_link_context_processor',
)
STUDENT_FILEUPLOAD_MAX_SIZE = 4 * 1000 * 1000 # 4 MB
diff --git a/lms/templates/registration/password_reset_complete.html b/lms/templates/registration/password_reset_complete.html
index a88176c485..3847f615b9 100644
--- a/lms/templates/registration/password_reset_complete.html
+++ b/lms/templates/registration/password_reset_complete.html
@@ -44,7 +44,7 @@
Your password has been set. You may go ahead and log in now.. Your password has been set. You may go ahead and log in now..
@@ -112,7 +112,7 @@
Your Password Reset Was Unsuccessful
The password reset link was invalid, possibly because the link has already been used. Please request a new password reset.
+The password reset link was invalid, possibly because the link has already been used. Please return to the login page and start the password reset process again.
{% endif %} @@ -124,7 +124,7 @@