diff --git a/lms/djangoapps/courseware/features/homepage.feature b/lms/djangoapps/courseware/features/homepage.feature index ac9b91e8d123..49b3cf3e6597 100644 --- a/lms/djangoapps/courseware/features/homepage.feature +++ b/lms/djangoapps/courseware/features/homepage.feature @@ -20,4 +20,4 @@ Feature: LMS.Homepage for web users | jobs | Jobs | | faq | FAQ | | contact | Contact| - | press | News | + | news | News | diff --git a/lms/envs/common.py b/lms/envs/common.py index a8bffb8232f9..b0c3ae57265c 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -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 diff --git a/lms/envs/test.py b/lms/envs/test.py index 2f801e278b19..93087b5cb1fa 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -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" diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 83c8194b2499..5de045cf3775 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -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%); // ==================== diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index 161ea35cc663..3819ef379598 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -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: "-"; } } diff --git a/lms/templates/contact.html b/lms/templates/contact.html deleted file mode 100644 index 2391889fe35c..000000000000 --- a/lms/templates/contact.html +++ /dev/null @@ -1,70 +0,0 @@ -<%! from django.utils.translation import ugettext as _ %> - -<%namespace name='static' file='static_content.html'/> - -<%inherit file="main.html" /> - -
- - -
-
- -
-
-

${_("Class Feedback")}

-

${_("We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.")}

- -

${_("General Inquiries and Feedback")}

-

- ${_('If you have a general question about {platform_name} please email ' - '{contact_email}. To see if your question has already been answered, ' - 'visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the ' - 'discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may ' - 'not have a chance to respond to every email, we take all feedback into consideration.').format( - platform_name=settings.PLATFORM_NAME, - contact_email=u'{email}'.format(email=settings.CONTACT_EMAIL), - faq_link_start=u''.format(url=reverse('faq_edx')), - faq_link_end='', - fb_link_start=''.format(url=settings.PLATFORM_FACEBOOK_ACCOUNT), - fb_link_end='' - )} -

- -

${_("Technical Inquiries and Feedback")}

-

- ${_('If you have suggestions/feedback about the overall {platform_name} platform, ' - 'or are facing general technical issues with the platform (e.g., issues with email ' - 'addresses and passwords), you can reach us at {tech_email}. For technical questions, ' - 'please make sure you are using a current version of Firefox or Chrome, and include ' - 'browser and version in your e-mail, as well as screenshots or other pertinent details. ' - 'If you find a bug or other issues, you can reach us at the following: {bugs_email}.').format( - tech_email=u'{0}'.format(settings.TECH_SUPPORT_EMAIL), - bug_email=u'{0}'.format(settings.BUGS_EMAIL), - platform_name=settings.PLATFORM_NAME - )} -

- -

${_("Media")}

-

${_('Please visit our {link_start}media/press page{link_end} for more information. For any media or press inquiries, please email {email}.').format( - link_start=u''.format(url=reverse('faq_edx')), - link_end='', - email=u'{email}/a>'.format(email=settings.PRESS_EMAIL), - )}

- -

${_("Universities")}

-

- ${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.').format( - email=u'{url}'.format(url=settings.UNIVERSITY_EMAIL), - platform_name=settings.PLATFORM_NAME - )} -

-
-
-
- diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 9f5d2b1ef138..695ab9a5d375 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -1,39 +1,40 @@ -<%! 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")} -<%! from microsite_configuration import microsite %> - -
- <% - 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) %> +
+
- % if self.stanford_theme_enabled(): -

${_("Explore free courses from {university_name}.").format(university_name="Stanford University")}

- % else: -

${course_index_overlay_text}

- % endif +

${course_index_overlay_text}

@@ -41,7 +42,7 @@

${course_index_overlay_text}

    - %for course in courses: + %for course in courses:
  • <%include file="../course.html" args="course=course" />
    • @@ -49,4 +50,5 @@

    ${course_index_overlay_text}

+
diff --git a/lms/templates/footer-legacy.html b/lms/templates/footer-legacy.html deleted file mode 100644 index 717814387b5b..000000000000 --- a/lms/templates/footer-legacy.html +++ /dev/null @@ -1,97 +0,0 @@ -## mako -<%! from django.core.urlresolvers import reverse %> -<%! from django.utils.translation import ugettext as _ %> -<%namespace name='static' file='static_content.html'/> - -## WARNING: These files are specific to edx.org and are not used in installations outside of that domain. Open edX users will want to use the file "footer.html" for any changes or overrides. -
- -
diff --git a/lms/templates/footer.html b/lms/templates/footer.html index e87e70eb0166..578a08d11882 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -14,16 +14,20 @@ ${_("About")} -
  • - - ${_("Jobs")} - -
    • -
  • - - ${_("News")} - -
    • + %if marketing_link('JOBS') and marketing_link('JOBS') != '#': +
  • + + ${_("Jobs")} + +
    • + %endif + %if marketing_link('NEWS') and marketing_link('NEWS') != '#': +
  • + + ${_("News")} + +
    • + %endif
  • ${_("FAQ")} @@ -42,22 +46,40 @@ ## this is just a placeholder logo ## feel free to change this logo to your own - organiztion logo placeholder + organization logo placeholder

    ## Translators: '©' is an HTML character code for the copyright symbol. Please don't remove or change it.

    ${_("© {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 + )}