Create new marketing_link function to abstract link generation

and use it for the new marketing site links.

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:

lms/templates/dashboard.html

@@ -326,11 +326,7 @@
     % else:
       <section class="empty-dashboard-message">
         <p>Looks like you haven't registered for any courses yet.</p>
-        % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('COURSES')}">
-        %else:
-            <a href="${reverse('courses')}">
-        %endif
+            <a href="${marketing_link('COURSES')}">
                 Find courses now!
             </a>
       </section>

lms/templates/footer.html

@@ -8,45 +8,25 @@
       <nav class="nav-colophon">
       <ol>
           <li class="nav-colophon-01">
-              % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-              <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('ABOUT')}">
-              %else:
-              <a href="${reverse('about_edx')}">
-              %endif
+              <a href="${marketing_link('ABOUT')}">
                   About
               </a>
           </li>
           <li class="nav-colophon-02">
-          % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-          <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('JOBS')}">
-          %else:
-          <a href="${reverse('jobs')}">
-          %endif
+          <a href="${marketing_link('JOBS')}">
               Jobs</a>
           </li>
           <li class="nav-colophon-03">
-          % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-          <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('PRESS')}">
-          %else:
-          <a href="${reverse('press')}">
-          %endif
+          <a href="${marketing_link('PRESS')}">
               Press</a>
           </li>
           <li class="nav-colophon-04">
-          % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-          <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">
-          %else:
-          <a href="${reverse('help_edx')}">
-          %endif
+          <a href="${marketing_link('FAQ')}">
               FAQ
           </a>
           </li>
           <li class="nav-colophon-05">
-          % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-          <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('CONTACT')}">
-          %else:
-          <a href="${reverse('contact')}">
-          %endif
+          <a href="${marketing_link('CONTACT')}">
               Contact
           </a>
           </li>

lms/templates/login.html

@@ -151,11 +151,7 @@
 
       <h3>Need Help?</h3>
       <p>Looking for help in logging in or with your edX account?
-      % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-      <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">
-      %else:
-      <a href="${reverse('help_edx')}">
-      %endif
+      <a href="${marketing_link('FAQ')}">
           View our help section for answers to commonly asked questions.
       </a></p>
 

lms/templates/navigation.html

@@ -56,11 +56,7 @@ site_status_msg = get_site_status_msg(course_id)
 
     <ol class="left nav-global authenticated">
       <li class="nav-global-01">
-        % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('COURSES')}">Find Courses</a>
-        % else:
-            <a href="${reverse('courses')}">Find Courses</a>
-        % endif
+      <a href="${marketing_link('COURSES')}">Find Courses</a>
       </li>
     </ol>
     <ol class="user">
@@ -74,11 +70,7 @@ site_status_msg = get_site_status_msg(course_id)
         <a href="#" class="dropdown">&#9662</a>
         <ul class="dropdown-menu">
             <li>
-        % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-          <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">
-        %else:
-          <a href="${reverse('help_edx')}">
-        %endif
+            <a href="${marketing_link('FAQ')}">
             Help
           </a></li>
           <li><a href="${reverse('logout')}">Log Out</a></li>
@@ -90,13 +82,13 @@ site_status_msg = get_site_status_msg(course_id)
     <ol class="left nav-global">
       % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
       <li class="nav-global-01">
-        <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('HOW_IT_WORKS')}">How it Works</a>
+        <a href="${marketing_link('HOW_IT_WORKS')}">How it Works</a>
       </li>
       <li class="nav-global-02">
-        <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('COURSES')}">Courses</a>
+        <a href="marketing_link('COURSES')}">Courses</a>
       </li>
       <li class="nav-global-03">
-        <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('SCHOOLS')}">Schools</a>
+        <a href="${marketing_link('SCHOOLS')}">Schools</a>
       </li>
       % endif
       % if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:

lms/templates/register.html

@@ -237,11 +237,7 @@
     <div class="cta cta-help">
       <h3>Need Help?</h3>
       <p>Need help in registering with edX? 
-        % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-        <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">
-        %else:
-        <a href="${reverse('help_edx')}">
-        %endif
+        <a href="${marketing_link('FAQ')}">
             View our FAQs for answers to commonly asked questions.
         </a>.  Once registered, most questions can be answered in the course specific discussion forums or through the FAQs.</p>
     </div>