diff --git a/common/test/test_microsites/test_microsite/templates/static_templates/about.html b/common/test/test_microsites/test_microsite/templates/static_templates/about.html index f5106775ba..b23ad14f38 100644 --- a/common/test/test_microsites/test_microsite/templates/static_templates/about.html +++ b/common/test/test_microsites/test_microsite/templates/static_templates/about.html @@ -16,7 +16,7 @@
##
## ##

“The mission of edX is to enhance human fulfillment worldwide through online ## learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based ## students and the worldwide community of online learners.”

##
diff --git a/lms/djangoapps/branding/__init__.py b/lms/djangoapps/branding/__init__.py index afa590552d..6e723c2ee6 100644 --- a/lms/djangoapps/branding/__init__.py +++ b/lms/djangoapps/branding/__init__.py @@ -63,11 +63,15 @@ def get_logo_url(): # otherwise, use the legacy means to configure this university = microsite.get_value('university') - if university is None: - return '{static_url}images/logo-edX-77x36.png'.format( + if university is None and settings.FEATURES.get('IS_EDX_DOMAIN', False): + return '{static_url}images/edx-theme/edx-logo-77x36.png'.format( + static_url=settings.STATIC_URL + ) + elif university: + return '{static_url}images/{uni}-on-edx-logo.png'.format( + static_url=settings.STATIC_URL, uni=university + ) + else: + return '{static_url}images/default-theme/logo.png'.format( static_url=settings.STATIC_URL ) - - return '{static_url}images/{uni}-on-edx-logo.png'.format( - static_url=settings.STATIC_URL, uni=university - ) diff --git a/lms/envs/common.py b/lms/envs/common.py index e8da3006f8..e785c78f8b 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -186,7 +186,8 @@ FEATURES = { # Enable legacy instructor dashboard 'ENABLE_INSTRUCTOR_LEGACY_DASHBOARD': True, - # Is this an edX-owned domain? (used on instructor dashboard) + + # Is this an edX-owned domain? (used for edX specific messaging and images) 'IS_EDX_DOMAIN': False, # Toggle to enable certificates of courses on dashboard diff --git a/lms/static/images/default-theme/logo-large.png b/lms/static/images/default-theme/logo-large.png new file mode 100644 index 0000000000..f762f3bc9e Binary files /dev/null and b/lms/static/images/default-theme/logo-large.png differ diff --git a/lms/static/images/default-theme/logo.png b/lms/static/images/default-theme/logo.png new file mode 100644 index 0000000000..94099e3650 Binary files /dev/null and b/lms/static/images/default-theme/logo.png differ diff --git a/lms/static/images/edx-logo-large-bw.png b/lms/static/images/edx-logo-large-bw.png deleted file mode 100644 index d888e1f4bb..0000000000 Binary files a/lms/static/images/edx-logo-large-bw.png and /dev/null differ diff --git a/lms/static/images/edx-background-banner-account.png b/lms/static/images/edx-theme/edx-background-banner-account.png similarity index 100% rename from lms/static/images/edx-background-banner-account.png rename to lms/static/images/edx-theme/edx-background-banner-account.png diff --git a/lms/static/images/edx-edge-logo-large.png b/lms/static/images/edx-theme/edx-edge-logo-large.png similarity index 100% rename from lms/static/images/edx-edge-logo-large.png rename to lms/static/images/edx-theme/edx-edge-logo-large.png diff --git a/lms/static/images/header-logo.png b/lms/static/images/edx-theme/edx-header-logo.png similarity index 100% rename from lms/static/images/header-logo.png rename to lms/static/images/edx-theme/edx-header-logo.png diff --git a/lms/static/images/logo-edX-77x36.png b/lms/static/images/edx-theme/edx-logo-77x36.png similarity index 100% rename from lms/static/images/logo-edX-77x36.png rename to lms/static/images/edx-theme/edx-logo-77x36.png diff --git a/lms/static/images/edx-logo-bw.png b/lms/static/images/edx-theme/edx-logo-bw.png similarity index 100% rename from lms/static/images/edx-logo-bw.png rename to lms/static/images/edx-theme/edx-logo-bw.png diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 5de045cf37..025591b4e6 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -411,9 +411,9 @@ $homepage__header--background: lighten($gray, 15%); // IMAGES: backgrounds $homepage-bg-image: none; -$login-banner-image: url(../images/edx-background-banner-account.png); -$register-banner-image: url(../images/edx-background-banner-account.png); -$passwordreset-banner-image: url(../images/edx-background-banner-account.png); +$login-banner-image: url(../images/edx-theme/edx-background-banner-account.png); +$register-banner-image: url(../images/edx-theme/edx-background-banner-account.png); +$passwordreset-banner-image: url(../images/edx-theme/edx-background-banner-account.png); $video-thumb-url: '../images/homepage-hero-video-thumb.jpg'; diff --git a/lms/static/sass/multicourse/_edge.scss b/lms/static/sass/multicourse/_edge.scss index 150a2738f3..996825c7fd 100644 --- a/lms/static/sass/multicourse/_edge.scss +++ b/lms/static/sass/multicourse/_edge.scss @@ -175,7 +175,7 @@ $paleYellow: #fffcf1; width: 263px; height: 72px; margin: 150px auto 50px; - background: url(../images/edx-edge-logo-large.png) no-repeat; + background: url(../images/edx-theme/edx-edge-logo-large.png) no-repeat; text-indent: -9999px; overflow: hidden; } diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 695ab9a5d3..3c65a86585 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -17,12 +17,17 @@ 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 + + if settings.FEATURES.get('IS_EDX_DOMAIN', False): + # For some reason, `static.url('images/edx-theme/edx-logo-bw.png')` breaks template rendering. + default_image_url = settings.STATIC_URL + 'images/edx-theme/edx-logo-bw.png' + else: + default_image_url = settings.STATIC_URL + 'images/default-theme/logo-large.png' logo_file = microsite.get_value( - 'course_index_overlay_logo_file', settings.STATIC_URL + 'images/edx-logo-bw.png' + 'course_index_overlay_logo_file', default_image_url ) + logo_alt_text = _("{platform_name} Logo").format(platform_name=platform_name) %> diff --git a/lms/templates/footer-edx-new.html b/lms/templates/footer-edx-new.html index ee2189542f..40ca1b8055 100644 --- a/lms/templates/footer-edx-new.html +++ b/lms/templates/footer-edx-new.html @@ -11,7 +11,7 @@

${_("About edX")}

diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 578a08d118..c7a1a34795 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -45,8 +45,8 @@

## this is just a placeholder logo - ## feel free to change this logo to your own - organization logo placeholder + ## feel free to change this logo to your own by replacing "logo.png" with your own logo + organization logo placeholder

diff --git a/lms/templates/main.html b/lms/templates/main.html index b39a2494b7..eb355d33c4 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -153,7 +153,7 @@ <% if theme_enabled() and not is_microsite(): footer_file = 'theme-footer.html' - elif settings.FEATURES['IS_EDX_DOMAIN'] and not is_microsite(): + elif settings.FEATURES.get('IS_EDX_DOMAIN', False) and not is_microsite(): footer_file = microsite.get_template_path('footer-edx-new.html') else: footer_file = microsite.get_template_path('footer.html')