From 9f8f80b5e951233d2842296c965a05e7a63c0e24 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 29 Jan 2014 15:24:23 -0500 Subject: [PATCH 1/3] LMS: removes unused and broken university partner images from old homepage UI LMS-2121 --- lms/templates/index.html | 113 +-------------------------------------- 1 file changed, 2 insertions(+), 111 deletions(-) diff --git a/lms/templates/index.html b/lms/templates/index.html index 205734d6cc..d8e6d75278 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -12,7 +12,7 @@ show_homepage_promo_video = MicrositeConfiguration.get_microsite_configuration_value('show_homepage_promo_video', True) homepage_promo_video_youtube_id = MicrositeConfiguration.get_microsite_configuration_value('homepage_promo_video_youtube_id', "XNaiOGxWeto") - + show_partners = MicrositeConfiguration.get_microsite_configuration_value('show_partners', True) %> @@ -70,116 +70,6 @@
- ## Disable university partner logos and sites for non-edX sites - % if not self.theme_enabled() and show_partners: -

${_('Explore free courses from {span_start}{platform_name}{span_end} universities').format(platform_name="edX", span_start='', span_end='')}

- -
-
    -
  1. - - -
    - MITx -
    -     -
    2. -
  2. - - -
    - HarvardX -
    -     -
    3. -
  3. - - -
    - BerkeleyX -
    -     -
    4. -
  4. - - -
    - UTx -
    -     -
    5. -
  5. - - -
    - McGillX -
    -     -
    6. -
  6. - - -
    - ANUx -
    -     -
    7. -
- -
- -
    -
  1. - - -
    - WellesleyX -
    -     -
    2. -
  2. - - -
    - GeorgetownX -
    -     -
    3. -
  3. - - -
    - University of TorontoX -
    -     -
    4. -
  4. - - -
    - EPFLx -
    -     -
    5. -
  5. - - -
    - DelftX -
    -     -
    6. -
  6. - - -
    - RiceX -
    -     -
    7. -
-
- % endif % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
@@ -192,6 +82,7 @@
% endif +
From 26eefc94c50372618495b44d64f51a1d9071d7be Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 29 Jan 2014 15:57:57 -0500 Subject: [PATCH 2/3] LMS: removes broken home header image and replaces with basic gradient background LMS-2121 --- lms/static/sass/base/_variables.scss | 7 +++++++ lms/static/sass/multicourse/_home.scss | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index c1bbcd5d6f..5dda2071b5 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -285,6 +285,13 @@ $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%); + +// ==================== + // IMAGES: backgrounds $homepage-bg-image: '../images/homepage-bg.jpg'; diff --git a/lms/static/sass/multicourse/_home.scss b/lms/static/sass/multicourse/_home.scss index 347a9a915c..9a2c4e6883 100644 --- a/lms/static/sass/multicourse/_home.scss +++ b/lms/static/sass/multicourse/_home.scss @@ -7,8 +7,7 @@ } > header { - background: $dashboard-profile-color; - @include background-image(url($homepage-bg-image)); + @include linear-gradient($homepage__header--gradient__color--alpha, $homepage__header--gradient__color--bravo); background-size: cover; border-bottom: 1px solid $border-color-3; box-shadow: 0 1px 0 0 $course-header-bg, inset 0 -1px 5px 0 rgba(0,0,0, 0.1); From 3554c52a200c0241ad1b5f87b7b1787181b4f3c6 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Thu, 30 Jan 2014 10:24:38 -0500 Subject: [PATCH 3/3] update test to reflect that the non-microsite homepage has been changed to remove all the partnership content --- lms/djangoapps/courseware/tests/test_microsites.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lms/djangoapps/courseware/tests/test_microsites.py b/lms/djangoapps/courseware/tests/test_microsites.py index e9cd776376..105b526b95 100644 --- a/lms/djangoapps/courseware/tests/test_microsites.py +++ b/lms/djangoapps/courseware/tests/test_microsites.py @@ -114,12 +114,6 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): # assert that footer template has been properly overriden on homepage self.assertNotContains(resp, 'This is a Test Microsite footer') - # assert that the edX partners section is not in the HTML - self.assertContains(resp, '
') - - # assert that the edX partners tag line is not in the HTML - self.assertContains(resp, 'Explore free courses from') - def test_microsite_course_enrollment(self): """