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

Clean up default pages for Open edX instances

Browse Source 
Remove Jobs, News
Change "Vision" to "About"
This commit is contained in:
Sarina Canelake
2014-12-13 19:24:31 -08:00
parent aa8b895aea
commit d6741c7700
6 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/courseware/features/homepage.feature
View File

@@ -20,4 +20,4 @@ Feature: LMS.Homepage for web users
| jobs | Jobs |
| faq | FAQ |
| contact | Contact|
| press | News |
| news | News |

10
lms/envs/common.py
View File

@@ -1576,18 +1576,16 @@ INSTALLED_APPS = (
EDXMKTG_COOKIE_NAME = 'edxloggedin'
MKTG_URLS = {}
MKTG_URL_LINK_MAP = {
'ABOUT': 'about_edx',
'ABOUT': 'about',
'CONTACT': 'contact',
'FAQ': 'help_edx',
'FAQ': 'help',
'COURSES': 'courses',
'ROOT': 'root',
'TOS': 'tos',
'HONOR': 'honor',
'PRIVACY': 'privacy_edx',
'JOBS': 'jobs',
'NEWS': 'news',
'PRIVACY': 'privacy',
'PRESS': 'press',
'BLOG': 'edx-blog',
'BLOG': 'blog',
'DONATE': 'donate',
# Verified Certificates

22
lms/envs/test.py
View File

@@ -281,6 +281,28 @@ CELERY_ALWAYS_EAGER = True
CELERY_RESULT_BACKEND = 'cache'
BROKER_TRANSPORT = 'memory'
######################### MARKETING SITE ###############################
MKTG_URL_LINK_MAP = {
'ABOUT': 'about',
'CONTACT': 'contact',
'FAQ': 'help',
'COURSES': 'courses',
'ROOT': 'root',
'TOS': 'tos',
'HONOR': 'honor',
'PRIVACY': 'privacy',
'JOBS': 'jobs',
'NEWS': 'news',
'PRESS': 'press',
'BLOG': 'blog',
'DONATE': 'donate',
# Verified Certificates
'WHAT_IS_VERIFIED_CERT': 'verified-certificate',
}
############################ STATIC FILES #############################
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
MEDIA_ROOT = TEST_ROOT / "uploads"

9
lms/static/sass/shared/_footer.scss
View File

@@ -118,15 +118,12 @@
display: inline-block;
font-size: em(11);
a {
display: block;
}
}
.nav-legal-01 a {
.nav-legal-02 a {
&:after {
margin-left: ($baseline/4);
&:before {
margin-right: ($baseline/4);
content: "-";
}
}

50
lms/templates/footer.html
View File

@@ -14,16 +14,20 @@
${_("About")}
</a>
</li>
<li class="nav-colophon-02">
<a id="jobs" href="${marketing_link('JOBS')}">
${_("Jobs")}
</a>
</li>
<li class="nav-colophon-03">
<a id="press" href="${marketing_link('NEWS')}">
${_("News")}
</a>
</li>
%if marketing_link('JOBS') and marketing_link('JOBS') != '#':
<li class="nav-colophon-02">
<a id="jobs" href="${marketing_link('JOBS')}">
${_("Jobs")}
</a>
</li>
%endif
%if marketing_link('NEWS') and marketing_link('NEWS') != '#':
<li class="nav-colophon-03">
<a id="news" href="${marketing_link('NEWS')}">
${_("News")}
</a>
</li>
%endif
<li class="nav-colophon-04">
<a id="faq" href="${marketing_link('FAQ')}">
${_("FAQ")}
@@ -49,15 +53,33 @@
## Translators: '&copy;' is an HTML character code for the copyright symbol. Please don't remove or change it.
<p class="copyright">${_("&copy; {copyright_year} {platform_name}, some rights reserved").format(
platform_name=settings.PLATFORM_NAME,
copyright_year=settings.COPYRIGHT_YEAR
)}
platform_name=settings.PLATFORM_NAME,
copyright_year=settings.COPYRIGHT_YEAR
)}
</p>
<nav class="nav-legal">
<ul>
%if marketing_link('HONOR') and marketing_link('HONOR') != '#':
<li class="nav-legal-01">
<a href="${marketing_link('TOS')}">${_("Terms of Service and Honor Code")}</a>
<%
tos_link = u"<a href='{}'>".format(marketing_link('TOS'))
honor_link = u"<a href='{}'>".format(marketing_link('HONOR'))
%>
${
_("{tos_link_start}Terms of Service{tos_link_end} and {honor_link_start}Honor Code{honor_link_end}").format(
tos_link_start=tos_link,
tos_link_end="</a>",
honor_link_start=honor_link,
honor_link_end="</a>",
)
}
</a>
</li>
%else:
<li class="nav-legal-01">
<a href="${marketing_link('TOS')}">${_("Terms of Service")}</a>
</li>
%endif
<li class="nav-legal-02">
<a href="${marketing_link('PRIVACY')}">${_("Privacy Policy")}</a>
</li>

4
lms/templates/static_templates/about.html
View File

@@ -1,9 +1,9 @@
<%! from django.utils.translation import ugettext as _ %>
<%inherit file="../main.html" />
<%block name="pagetitle">${_("Vision")}</%block>
<%block name="pagetitle">${_("About")}</%block>
<section class="container about">
<h1>${_("Vision")}</h1>
<h1>${_("About")}</h1>
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>