From 4fc8aaab02c4fde4d3a4cc9ea55fe555e854668b Mon Sep 17 00:00:00 2001
From: Adam Palay
Date: Thu, 1 Aug 2013 14:54:50 -0400
Subject: [PATCH 1/3] if mktg, redirects faq to mktg. else, to '/help'
---
lms/templates/help_modal.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
index 41a751aae409..5aae550fd965 100644
--- a/lms/templates/help_modal.html
+++ b/lms/templates/help_modal.html
@@ -106,7 +106,7 @@ ${_('Thank You!')}
).format(
open_time=open_time,
close_time=close_time,
- link_start='',
+ link_start=''.format(marketing_link('FAQ')),
link_end=''
)}
From 307d27db9a8dac92c083a6b1392cbad6e0c02c61 Mon Sep 17 00:00:00 2001
From: Adam Palay
Date: Tue, 13 Aug 2013 12:53:39 -0400
Subject: [PATCH 2/3] fix syntax error in help_modal
---
lms/templates/help_modal.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lms/templates/help_modal.html b/lms/templates/help_modal.html
index 5aae550fd965..84cb690a031d 100644
--- a/lms/templates/help_modal.html
+++ b/lms/templates/help_modal.html
@@ -193,7 +193,7 @@ ${_('Thank You!')}
% if settings.FEEDBACK_SUBMISSION_EMAIL:
htmlStr += " " + _.template(
gettext("Please {link_start}send us e-mail{link_end}."),
- {link_start: '', link_end=''},
+ {link_start: '', link_end: ''},
{interpolate: /\{(.+?)\}/g})
% else:
// If no email is configured, we can't do much other than
From 172d415929cd04ced917a5bfaebde182f608e846 Mon Sep 17 00:00:00 2001
From: Adam Palay
Date: Tue, 13 Aug 2013 16:11:51 -0400
Subject: [PATCH 3/3] add dummy FEEDBACK_SUBMISSION_EMAIL for debugging
---
lms/envs/dev.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 44c2edf21a2b..10501448af1c 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -31,6 +31,8 @@
MITX_FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True
MITX_FEATURES['ENABLE_INSTRUCTOR_BETA_DASHBOARD'] = True
+FEEDBACK_SUBMISSION_EMAIL = "dummy@dummy.org"
+
WIKI_ENABLED = True
LOGGING = get_logger_config(ENV_ROOT / "log",