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] 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>