Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce the amount of repeated HTML and add checks for the correct settings.

Browse Source
This commit is contained in:
Diana Huang
2013-05-03 10:17:40 -04:00
parent 1d42df8cb1
commit d35283cf65
5 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/templates/dashboard.html
View File

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

63
lms/templates/footer.html
View File

@@ -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">

10
lms/templates/login.html
View File

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

7
lms/templates/navigation.html
View File

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

9
lms/templates/register.html
View File

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