From c9a6fe18f010aca7cb3dd294461346632c521a51 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 3 May 2013 15:06:24 -0400 Subject: [PATCH] Create new marketing_link function to abstract link generation and use it for the new marketing site links. --- common/djangoapps/mitxmako/shortcuts.py | 21 +++++++++++++++++ lms/templates/dashboard.html | 6 +---- lms/templates/footer.html | 30 +++++-------------------- lms/templates/login.html | 6 +---- lms/templates/navigation.html | 18 +++++---------- lms/templates/register.html | 6 +---- 6 files changed, 34 insertions(+), 53 deletions(-) diff --git a/common/djangoapps/mitxmako/shortcuts.py b/common/djangoapps/mitxmako/shortcuts.py index ebeb0fc180..e47162dadd 100644 --- a/common/djangoapps/mitxmako/shortcuts.py +++ b/common/djangoapps/mitxmako/shortcuts.py @@ -17,7 +17,27 @@ from django.http import HttpResponse from . import middleware from django.conf import settings +from django.core.urlresolvers import reverse +def marketing_link(name): + """Returns the correct URL for a link to the marketing site + depending on if the marketing site is enabled + + Since the marketing site is enabled by a setting, we have two + possible URLs for certain links. This function is to decides + which URL should be provided. + """ + link_map = {'ABOUT': 'about_edx', + 'CONTACT': 'contact', + 'FAQ': 'help_edx', + 'COURSES': 'courses'} + + if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'): + return settings.MKTG_URLS.get('ROOT') + settings.MKTG_URLS.get(name) + elif name in link_map: + return reverse(link_map[name]) + else: + return '' def render_to_string(template_name, dictionary, context=None, namespace='main'): context_instance = Context(dictionary) @@ -27,6 +47,7 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'): context_dictionary = {} context_instance['settings'] = settings context_instance['MITX_ROOT_URL'] = settings.MITX_ROOT_URL + context_instance['marketing_link'] = marketing_link # In various testing contexts, there might not be a current request context. if middleware.requestcontext is not None: diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 54023cc77c..31298ee7cb 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -326,11 +326,7 @@ % else:

Looks like you haven't registered for any courses yet.

- % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'): - - %else: - - %endif + Find courses now!
diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 11f6ab9d40..8cc8d41e5d 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -8,45 +8,25 @@