From e0ac6834da830a126a80f98ee99bd02dfa624b56 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Wed, 1 May 2013 13:57:24 -0400
Subject: [PATCH 01/10] Fix links between marketing site and courseware.

Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
---
 lms/templates/dashboard.html  |  6 +++++-
 lms/templates/footer.html     | 22 +++++++++++++++++++++-
 lms/templates/login.html      |  4 ++--
 lms/templates/navigation.html | 14 +++++++++++++-
 lms/templates/register.html   |  2 +-
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index d23609801f..25a437395c 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -326,7 +326,11 @@
     % else:
       <section class="empty-dashboard-message">
         <p>Looks like you haven't registered for any courses yet.</p>
-        <a href="${reverse('courses')}">Find courses now!</a>
+        % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
+            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('COURSES')}">Find courses now!</a>
+        %else:
+            <a href="${reverse('courses')}">Find courses now!</a>
+        %endif
       </section>
     % endif
 
diff --git a/lms/templates/footer.html b/lms/templates/footer.html
index 642f0cfe01..b7351a9c15 100644
--- a/lms/templates/footer.html
+++ b/lms/templates/footer.html
@@ -6,6 +6,25 @@
   <footer>
     <div class="colophon">
       <nav class="nav-colophon">
+      % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
+      <ol>
+          <li class="nav-colophon-01">
+              <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('ABOUT')}">About</a>
+          </li>
+          <li class="nav-colophon-02">
+            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('JOBS')}">Jobs</a>
+          </li>
+          <li class="nav-colophon-03">
+            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('PRESS')}">Press</a>
+          </li>
+          <li class="nav-colophon-04">
+            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">FAQ</a>
+          </li>
+          <li class="nav-colophon-05">
+            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('CONTACT')}">Contact</a>
+          </li>
+      </ol>
+      %else:
         <ol>
           <li class="nav-colophon-01">
             <a href="${reverse('about_edx')}">About</a>
@@ -28,6 +47,7 @@
           </li>
           % endif
         </ol>
+        %endif
       </nav>
 
       <div class="colophon-about">
@@ -82,4 +102,4 @@
       </nav>
     </div>
   </footer>
-</div>
\ No newline at end of file
+</div>
diff --git a/lms/templates/login.html b/lms/templates/login.html
index 2e0281f4f6..b869d356fe 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -147,10 +147,10 @@
 
     <div class="cta cta-help">
       <h3>Not Enrolled?</h3>
-      <p><a href="#">Sign up for edX today!</a></p>
+      <p><a href="${reverse('register_user')}">Sign up for edX today!</a></p>
 
       <h3>Need Help?</h3>
-      <p>Looking for help in logging in or with your edX account? <a href="#">View our help section for answers to commonly asked questions</a></p>
+      <p>Looking for help in logging in or with your edX account? <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">View our help section for answers to commonly asked questions</a></p>
     </div>
   </aside>
   </section>
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index ee51a5ff98..57d6b8e19f 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -38,7 +38,15 @@ site_status_msg = get_site_status_msg(course_id)
   <header class="global" aria-label="Global Navigation">
 % endif
   <nav>
-  <h1 class="logo"><a href="${reverse('root')}"><img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}"/></a></h1>
+
+  <h1 class="logo">
+% if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
+      <a href="${settings.MKTG_URLS.get('ROOT')}">
+% else:
+      <a href="${reverse('root')}">
+%endif
+        <img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}"/>
+      </a></h1>
 
     % if course:
       <h2><span class="provider">${course.org}:</span> ${course.number} ${course.display_name_with_default}</h2>
@@ -65,7 +73,11 @@ site_status_msg = get_site_status_msg(course_id)
       <li class="primary">
         <a href="#" class="dropdown">&#9662</a>
         <ul class="dropdown-menu">
+        % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
+          <li><a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">Help</a></li>
+        %else:
           <li><a href="${reverse('help_edx')}">Help</a></li>
+        %endif
           <li><a href="${reverse('logout')}">Log Out</a></li>
         </ul>
       </li>
diff --git a/lms/templates/register.html b/lms/templates/register.html
index ee06a3caa0..5c773afed3 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -236,7 +236,7 @@
 
     <div class="cta cta-help">
       <h3>Need Help?</h3>
-      <p>Need help in registering with edX? <a href="#">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>
+      <p>Need help in registering with edX? <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('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>
   </aside>
 </section>

From 1d42df8cb1b4332d8d626ab9ac006987406712d6 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 3 May 2013 09:31:25 -0400
Subject: [PATCH 02/10] Add MKTG_URLS to settings for new footer and header
 links.

---
 lms/envs/common.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 86f02c6578..493da852ea 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -36,7 +36,6 @@ DISCUSSION_SETTINGS = {
     'MAX_COMMENT_DEPTH': 2,
 }
 
-EDXMKTG_COOKIE_NAME = 'edxloggedin'
 
 # Features
 MITX_FEATURES = {
@@ -584,3 +583,13 @@ INSTALLED_APPS = (
     # Discussion forums
     'django_comment_client',
 )
+
+######################### MARKETING SITE ###############################
+EDXMKTG_COOKIE_NAME = 'edxloggedin'
+MKTG_URLS = {'ROOT': '',
+             'COURSES': '/courses/allschools/allsubjects/allcourses',
+             'ABOUT': '/about-us',
+             'JOBS': '/jobs',
+             'PRESS': '/in-the-news',
+             'FAQ': '/student-faq',
+             'CONTACT': '/contact'}

From d35283cf657157131b8a42dc524db800bd3cb39f Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 3 May 2013 10:17:40 -0400
Subject: [PATCH 03/10] Reduce the amount of repeated HTML and add checks for
 the correct settings.

---
 lms/templates/dashboard.html  |  6 ++--
 lms/templates/footer.html     | 63 ++++++++++++++++++-----------------
 lms/templates/login.html      | 10 +++++-
 lms/templates/navigation.html |  7 ++--
 lms/templates/register.html   |  9 ++++-
 5 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 25a437395c..54023cc77c 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -327,10 +327,12 @@
       <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')}">Find courses now!</a>
+            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('COURSES')}">
         %else:
-            <a href="${reverse('courses')}">Find courses now!</a>
+            <a href="${reverse('courses')}">
         %endif
+                Find courses now!
+            </a>
       </section>
     % endif
 
diff --git a/lms/templates/footer.html b/lms/templates/footer.html
index b7351a9c15..11f6ab9d40 100644
--- a/lms/templates/footer.html
+++ b/lms/templates/footer.html
@@ -6,48 +6,51 @@
   <footer>
     <div class="colophon">
       <nav class="nav-colophon">
-      % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
       <ol>
           <li class="nav-colophon-01">
-              <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('ABOUT')}">About</a>
+              % 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
+                  About
+              </a>
           </li>
           <li class="nav-colophon-02">
-            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('JOBS')}">Jobs</a>
+          % 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
+              Jobs</a>
           </li>
           <li class="nav-colophon-03">
-            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('PRESS')}">Press</a>
+          % 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
+              Press</a>
           </li>
           <li class="nav-colophon-04">
-            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">FAQ</a>
+          % 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
+              FAQ
+          </a>
           </li>
           <li class="nav-colophon-05">
-            <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('CONTACT')}">Contact</a>
+          % 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
+              Contact
+          </a>
           </li>
       </ol>
-      %else:
-        <ol>
-          <li class="nav-colophon-01">
-            <a href="${reverse('about_edx')}">About</a>
-          </li>
-          <li class="nav-colophon-02">
-            <a href="${reverse('jobs')}">Jobs</a>
-          </li>
-          <li class="nav-colophon-03">
-            <a href="#">Press</a>
-          </li>
-          <li class="nav-colophon-04">
-            <a href="#">FAQ</a>
-          </li>
-          <li class="nav-colophon-05">
-            <a href="${reverse('contact')}">Contact</a>
-          </li>
-          % if user.is_authenticated():
-          <li class="nav-colophon-06">
-            <a href="#">Help</a>
-          </li>
-          % endif
-        </ol>
-        %endif
       </nav>
 
       <div class="colophon-about">
diff --git a/lms/templates/login.html b/lms/templates/login.html
index b869d356fe..5db7dc28f6 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -150,7 +150,15 @@
       <p><a href="${reverse('register_user')}">Sign up for edX today!</a></p>
 
       <h3>Need Help?</h3>
-      <p>Looking for help in logging in or with your edX account? <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">View our help section for answers to commonly asked questions</a></p>
+      <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
+          View our help section for answers to commonly asked questions.
+      </a></p>
+
     </div>
   </aside>
   </section>
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index 57d6b8e19f..d8b9d83ccc 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -73,11 +73,14 @@ site_status_msg = get_site_status_msg(course_id)
       <li class="primary">
         <a href="#" class="dropdown">&#9662</a>
         <ul class="dropdown-menu">
+            <li>
         % if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-          <li><a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">Help</a></li>
+          <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('FAQ')}">
         %else:
-          <li><a href="${reverse('help_edx')}">Help</a></li>
+          <a href="${reverse('help_edx')}">
         %endif
+            Help
+          </a></li>
           <li><a href="${reverse('logout')}">Log Out</a></li>
         </ul>
       </li>
diff --git a/lms/templates/register.html b/lms/templates/register.html
index 5c773afed3..2ba08a06fd 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -236,7 +236,14 @@
 
     <div class="cta cta-help">
       <h3>Need Help?</h3>
-      <p>Need help in registering with edX? <a href="${settings.MKTG_URLS.get('ROOT')}${settings.MKTG_URLS.get('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>
+      <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
+            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>
   </aside>
 </section>

From 3e217c8f857f994e834d89d6bca49414df3ce797 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 3 May 2013 15:04:41 -0400
Subject: [PATCH 04/10] Use new login page for marketing site when student is
 trying to access login_required page.

---
 common/djangoapps/student/views.py |  2 +-
 lms/templates/accounts_login.html  | 35 ------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 lms/templates/accounts_login.html

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 645c1249e0..4cd9689092 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -372,7 +372,7 @@ def change_enrollment(request):
 @ensure_csrf_cookie
 def accounts_login(request, error=""):
 
-    return render_to_response('accounts_login.html', {'error': error})
+    return render_to_response('login.html', {'error': error})
 
 
 # Need different levels of logging
diff --git a/lms/templates/accounts_login.html b/lms/templates/accounts_login.html
deleted file mode 100644
index db9cca2b22..0000000000
--- a/lms/templates/accounts_login.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<%! from django.core.urlresolvers import reverse %>
-<%inherit file="main.html" />
-<%namespace name='static' file='static_content.html'/>
-
-<%block name="headextra">
-<style type="text/css">
-.login-box {
-    display: block;
-    position: relative;
-    left: 0;
-    margin: 100px auto;
-    top: 0;
-    height:500px;
-}
-
-.login-box input[type=submit] {
-    white-space: normal;
-    height: auto !important;
-}
-
-</style>
-</%block>
-
-<section class='login-box'></section>
-
-<script type="text/javascript">
-(function() {
- $(document).ready( 
-     function() {
-        // show dialog
-       $('#login').click();
-     }
- );
-})(this)
-</script>

From e4e6c0dd7b25e015727ff5eec8e7ef9eb4972398 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 3 May 2013 15:05:03 -0400
Subject: [PATCH 05/10] Add new URLS to MKTG_URLS.

---
 lms/envs/common.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 493da852ea..7710ca6993 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -592,4 +592,6 @@ MKTG_URLS = {'ROOT': '',
              'JOBS': '/jobs',
              'PRESS': '/in-the-news',
              'FAQ': '/student-faq',
-             'CONTACT': '/contact'}
+             'CONTACT': '/contact',
+             'HOW_IT_WORKS': '/how-it-works',
+             'SCHOOLS': '/schools'}

From c9a6fe18f010aca7cb3dd294461346632c521a51 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 3 May 2013 15:06:24 -0400
Subject: [PATCH 06/10] 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:
       <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>
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 @@
       <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>
diff --git a/lms/templates/login.html b/lms/templates/login.html
index 5db7dc28f6..aacb1e3109 100644
--- a/lms/templates/login.html
+++ b/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>
 
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index d8b9d83ccc..bafc948230 100644
--- a/lms/templates/navigation.html
+++ b/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']:
diff --git a/lms/templates/register.html b/lms/templates/register.html
index 2ba08a06fd..bc01627cc1 100644
--- a/lms/templates/register.html
+++ b/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>

From 5b3f5a47de384039420bfd2897f07853f66d3868 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 6 May 2013 09:59:43 -0400
Subject: [PATCH 07/10] Add marketing_link to the Template context dictionary.

Pep8 fixes
---
 common/djangoapps/mitxmako/shortcuts.py | 2 ++
 common/djangoapps/mitxmako/template.py  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/djangoapps/mitxmako/shortcuts.py b/common/djangoapps/mitxmako/shortcuts.py
index e47162dadd..5ce641e6ee 100644
--- a/common/djangoapps/mitxmako/shortcuts.py
+++ b/common/djangoapps/mitxmako/shortcuts.py
@@ -19,6 +19,7 @@ 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
@@ -39,6 +40,7 @@ def marketing_link(name):
     else:
         return ''
 
+
 def render_to_string(template_name, dictionary, context=None, namespace='main'):
     context_instance = Context(dictionary)
     # add dictionary to context_instance
diff --git a/common/djangoapps/mitxmako/template.py b/common/djangoapps/mitxmako/template.py
index 6ef8058c7c..5becfbf1df 100644
--- a/common/djangoapps/mitxmako/template.py
+++ b/common/djangoapps/mitxmako/template.py
@@ -14,6 +14,7 @@
 
 from django.conf import settings
 from mako.template import Template as MakoTemplate
+from mitxmako.shortcuts import marketing_link
 
 from mitxmako import middleware
 
@@ -37,7 +38,6 @@ class Template(MakoTemplate):
             kwargs.update(overrides)
         super(Template, self).__init__(*args, **kwargs)
 
-
     def render(self, context_instance):
         """
         This takes a render call with a context (from Django) and translates
@@ -55,5 +55,6 @@ class Template(MakoTemplate):
         context_dictionary['settings'] = settings
         context_dictionary['MITX_ROOT_URL'] = settings.MITX_ROOT_URL
         context_dictionary['django_context'] = context_instance
+        context_dictionary['marketing_link'] = marketing_link
 
         return super(Template, self).render_unicode(**context_dictionary)

From a8ea201b6a2857cec8fdfd42098acf2f222f0168 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 6 May 2013 12:55:42 -0400
Subject: [PATCH 08/10] Move the link map to the settings.

---
 common/djangoapps/mitxmako/shortcuts.py | 5 +----
 lms/envs/common.py                      | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/djangoapps/mitxmako/shortcuts.py b/common/djangoapps/mitxmako/shortcuts.py
index 5ce641e6ee..7e78d08843 100644
--- a/common/djangoapps/mitxmako/shortcuts.py
+++ b/common/djangoapps/mitxmako/shortcuts.py
@@ -28,11 +28,8 @@ def marketing_link(name):
     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'}
 
+    link_map = settings.MKTG_URLS.get('LINK_MAP')
     if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
         return settings.MKTG_URLS.get('ROOT') + settings.MKTG_URLS.get(name)
     elif name in link_map:
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 7710ca6993..568ad21cec 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -595,3 +595,7 @@ MKTG_URLS = {'ROOT': '',
              'CONTACT': '/contact',
              'HOW_IT_WORKS': '/how-it-works',
              'SCHOOLS': '/schools'}
+MKTG_URLS['LINK_MAP'] = {'ABOUT': 'about_edx',
+                         'CONTACT': 'contact',
+                         'FAQ': 'help_edx',
+                         'COURSES': 'courses'}

From 6110b54ca8848c7726519c08c889a3b449860516 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 6 May 2013 14:55:07 -0400
Subject: [PATCH 09/10] Address code review feedback

* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
---
 common/djangoapps/mitxmako/shortcuts.py |  9 +++++++--
 lms/envs/common.py                      |  9 +++++----
 lms/templates/dashboard.html            |  6 +++---
 lms/templates/footer.html               | 12 +++++++-----
 lms/templates/navigation.html           |  6 +-----
 lms/templates/register.html             |  3 ++-
 6 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/common/djangoapps/mitxmako/shortcuts.py b/common/djangoapps/mitxmako/shortcuts.py
index 7e78d08843..673efd09dc 100644
--- a/common/djangoapps/mitxmako/shortcuts.py
+++ b/common/djangoapps/mitxmako/shortcuts.py
@@ -29,13 +29,18 @@ def marketing_link(name):
     which URL should be provided.
     """
 
-    link_map = settings.MKTG_URLS.get('LINK_MAP')
+    # link_map maps URLs from the marketing site to the old equivalent on
+    # the Django site
+    link_map = settings.MKTG_URL_LINK_MAP
     if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
+        # special case for when we only want the root marketing URL
+        if name == 'ROOT':
+            return settings.MKTG_URLS.get('ROOT')
         return settings.MKTG_URLS.get('ROOT') + settings.MKTG_URLS.get(name)
     elif name in link_map:
         return reverse(link_map[name])
     else:
-        return ''
+        return '#'
 
 
 def render_to_string(template_name, dictionary, context=None, namespace='main'):
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 568ad21cec..768608945c 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -595,7 +595,8 @@ MKTG_URLS = {'ROOT': '',
              'CONTACT': '/contact',
              'HOW_IT_WORKS': '/how-it-works',
              'SCHOOLS': '/schools'}
-MKTG_URLS['LINK_MAP'] = {'ABOUT': 'about_edx',
-                         'CONTACT': 'contact',
-                         'FAQ': 'help_edx',
-                         'COURSES': 'courses'}
+MKTG_URL_LINK_MAP = {'ABOUT': 'about_edx',
+            'CONTACT': 'contact',
+            'FAQ': 'help_edx',
+            'COURSES': 'courses',
+            'ROOT': 'root'}
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 31298ee7cb..4d312862cf 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -326,9 +326,9 @@
     % else:
       <section class="empty-dashboard-message">
         <p>Looks like you haven't registered for any courses yet.</p>
-            <a href="${marketing_link('COURSES')}">
-                Find courses now!
-            </a>
+        <a href="${marketing_link('COURSES')}">
+            Find courses now!
+        </a>
       </section>
     % endif
 
diff --git a/lms/templates/footer.html b/lms/templates/footer.html
index 8cc8d41e5d..cb4a1defc4 100644
--- a/lms/templates/footer.html
+++ b/lms/templates/footer.html
@@ -8,17 +8,19 @@
       <nav class="nav-colophon">
       <ol>
           <li class="nav-colophon-01">
-              <a href="${marketing_link('ABOUT')}">
-                  About
-              </a>
+          <a href="${marketing_link('ABOUT')}">
+              About
+          </a>
           </li>
           <li class="nav-colophon-02">
           <a href="${marketing_link('JOBS')}">
-              Jobs</a>
+              Jobs
+          </a>
           </li>
           <li class="nav-colophon-03">
           <a href="${marketing_link('PRESS')}">
-              Press</a>
+              Press
+          </a>
           </li>
           <li class="nav-colophon-04">
           <a href="${marketing_link('FAQ')}">
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index bafc948230..67a916d490 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -40,11 +40,7 @@ site_status_msg = get_site_status_msg(course_id)
   <nav>
 
   <h1 class="logo">
-% if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
-      <a href="${settings.MKTG_URLS.get('ROOT')}">
-% else:
-      <a href="${reverse('root')}">
-%endif
+      <a href="${marketing_link('ROOT')}">
         <img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}"/>
       </a></h1>
 
diff --git a/lms/templates/register.html b/lms/templates/register.html
index bc01627cc1..fa9bd91688 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -239,7 +239,8 @@
       <p>Need help in registering with edX? 
         <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>
+        </a>  
+        Once registered, most questions can be answered in the course specific discussion forums or through the FAQs.</p>
     </div>
   </aside>
 </section>

From 13d29b8e72109e6eda544c456e047876df70fae5 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 6 May 2013 16:49:10 -0400
Subject: [PATCH 10/10] Fix indentation of settings dictionaries.

---
 lms/envs/common.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 768608945c..286ea51204 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -586,17 +586,21 @@ INSTALLED_APPS = (
 
 ######################### MARKETING SITE ###############################
 EDXMKTG_COOKIE_NAME = 'edxloggedin'
-MKTG_URLS = {'ROOT': '',
-             'COURSES': '/courses/allschools/allsubjects/allcourses',
-             'ABOUT': '/about-us',
-             'JOBS': '/jobs',
-             'PRESS': '/in-the-news',
-             'FAQ': '/student-faq',
-             'CONTACT': '/contact',
-             'HOW_IT_WORKS': '/how-it-works',
-             'SCHOOLS': '/schools'}
-MKTG_URL_LINK_MAP = {'ABOUT': 'about_edx',
-            'CONTACT': 'contact',
-            'FAQ': 'help_edx',
-            'COURSES': 'courses',
-            'ROOT': 'root'}
+MKTG_URLS = {
+    'ROOT': '',
+    'COURSES': '/courses/allschools/allsubjects/allcourses',
+    'ABOUT': '/about-us',
+    'JOBS': '/jobs',
+    'PRESS': '/in-the-news',
+    'FAQ': '/student-faq',
+    'CONTACT': '/contact',
+    'HOW_IT_WORKS': '/how-it-works',
+    'SCHOOLS': '/schools',
+}
+MKTG_URL_LINK_MAP = {
+    'ABOUT': 'about_edx',
+    'CONTACT': 'contact',
+    'FAQ': 'help_edx',
+    'COURSES': 'courses',
+    'ROOT': 'root',
+}