Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lms/djangoapps/courseware/features/homepage.feature
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Feature: LMS.Homepage for web users
| jobs | Jobs |
| faq | FAQ |
| contact | Contact|
| press | News |
| news | News |
12 changes: 5 additions & 7 deletions lms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1576,18 +1576,16 @@
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',
'HONOR': 'honor', # If your site does not have an honor code, simply delete this line.
'PRIVACY': 'privacy',
'PRESS': 'press',
'BLOG': 'edx-blog',
'BLOG': 'blog',
'DONATE': 'donate',

# Verified Certificates
Expand Down
22 changes: 22 additions & 0 deletions lms/envs/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,28 @@
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"
Expand Down
6 changes: 3 additions & 3 deletions lms/static/sass/base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,9 @@ $footer_margin: ($baseline/4) 0 ($baseline*1.5) 0;
// ====================

// VIEWS: homepage
$homepage__header--gradient__color--alpha: lighten($blue, 15%);
$homepage__header--gradient__color--bravo: saturate($blue, 30%);
$homepage__header--background: lighten($blue, 15%);
$homepage__header--gradient__color--alpha: lighten($gray, 15%);
$homepage__header--gradient__color--bravo: saturate($gray, 30%);
$homepage__header--background: lighten($gray, 15%);

// ====================

Expand Down
9 changes: 3 additions & 6 deletions lms/static/sass/shared/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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: "-";
}
}
Expand Down
70 changes: 0 additions & 70 deletions lms/templates/contact.html

This file was deleted.

50 changes: 26 additions & 24 deletions lms/templates/courseware/courses.html
Original file line number Diff line number Diff line change
@@ -1,52 +1,54 @@
<%! from django.utils.translation import ugettext as _ %>
<%!
from django.utils.translation import ugettext as _
from microsite_configuration import microsite
%>
<%inherit file="../main.html" />

<%namespace name='static' file='../static_content.html'/>

<%block name="pagetitle">${_("Courses")}</%block>
<%! from microsite_configuration import microsite %>

<section class="find-courses">

<%
course_index_overlay_text = microsite.get_value('course_index_overlay_text', _("Explore free courses from leading universities."))

# not sure why this is, but if I use static.url('images/edx-logo-bw.png') then the HTML rendering
# of this template goes wonky

logo_file = microsite.get_value(
'course_index_overlay_logo_file', settings.STATIC_URL + 'images/edx-logo-bw.png'
)
platform_name = microsite.get_value('platform_name', settings.PLATFORM_NAME)

if self.stanford_theme_enabled():
course_index_overlay_text = _("Explore free courses from {university_name}.").format(university_name="Stanford University")
logo_file = static.url('themes/stanford/images/seal.png')
logo_alt_text = "Stanford Seal Logo"

else:
course_index_overlay_text = microsite.get_value('course_index_overlay_text', _("Explore courses from {platform_name}.").format(platform_name=platform_name))
# not sure why this is, but if I use static.url('images/edx-logo-bw.png') then the HTML rendering
# of this template goes wonky

logo_file = microsite.get_value(
'course_index_overlay_logo_file', settings.STATIC_URL + 'images/edx-logo-bw.png'
)
logo_alt_text = _("{platform_name} Logo").format(platform_name=platform_name)
%>

<section class="find-courses">

<header class="search">
<div class="inner-wrapper main-search">
<hgroup>
<div class="logo">
% if self.stanford_theme_enabled():
<img src="${static.url('themes/stanford/images/seal.png')}" alt="Stanford Seal Logo" />
% else:
<img src='${logo_file}' alt="${microsite.get_value('platform_name', settings.PLATFORM_NAME)} Logo" />
% endif
<img src="${logo_file}" alt="${logo_alt_text}" />
</div>
% if self.stanford_theme_enabled():
<h2>${_("Explore free courses from {university_name}.").format(university_name="Stanford University")}</h2>
% else:
<h2>${course_index_overlay_text}</h2>
% endif
<h2>${course_index_overlay_text}</h2>
</hgroup>
</div>
</header>

<section class="container">
<section class="courses">
<ul class="courses-listing">
%for course in courses:
%for course in courses:
<li class="courses-listing-item">
<%include file="../course.html" args="course=course" />
</li>
%endfor
</ul>
</section>
</section>

</section>
97 changes: 0 additions & 97 deletions lms/templates/footer-legacy.html

This file was deleted.

Loading