Merge pull request #6484 from edx/sarina/move-branded-lms-assets

Remove edX branding from default Open edX LMS [OPEN-307]

common/test/test_microsites/test_microsite/templates/static_templates/about.html

@@ -16,7 +16,7 @@
   <section class="vision">
     ## <div class="our-mission">
     ##   <div class="logo">
-    ##     <img src="${static.url('images/edx-logo-large-bw.png')}">
+    ##     <img src="${static.url('images/edx-theme/edx-logo-bw.png')}">
     ##   </div>
     ##   <h2 class="mission-quote">&ldquo;The mission of <span class="edx">edX</span> 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.&rdquo;</h2>
     ## </div>

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
-    )

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

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';
 

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;
   }

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)
 %>
 

lms/templates/footer-edx-new.html

@@ -11,7 +11,7 @@
       <h2 class="sr footer-about-title">${_("About edX")}</h2>
 
       <div class="footer-about-logo">
-        <img alt="edX logo" src="${static.url('images/header-logo.png')}">
+        <img alt="edX logo" src="${static.url('images/edx-theme/edx-header-logo.png')}">
       </div>
 
       <div class="footer-about-copy">

lms/templates/footer.html

@@ -45,8 +45,8 @@
         <p>
           <a href="/">
             ## this is just a placeholder logo
-            ## feel free to change this logo to your own
-            <img alt="organization logo placeholder" src="/static/images/logo-placeholder.png">
+            ## feel free to change this logo to your own by replacing "logo.png" with your own logo
+            <img alt="organization logo placeholder" src="/static/images/default-theme/logo.png">
           </a>
         </p>
       </div>

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')