Merge pull request #6252 from edx/studio-move-branded

Placeholder image for Open edX Studio logo, when not running on edx.org

cms/envs/common.py

@@ -111,6 +111,11 @@ FEATURES = {
 
     # Turn off Video Upload Pipeline through Studio, by default
     'ENABLE_VIDEO_UPLOAD_PIPELINE': False,
+
+    # Is this an edX-owned domain? (edx.org)
+    # for consistency in user-experience, keep the value of this feature flag
+    # in sync with the one in lms/envs/common.py
+    'IS_EDX_DOMAIN': False,
 }
 ENABLE_JASMINE = False
 

cms/static/sass/elements/_header.scss

@@ -118,7 +118,7 @@
       display: block;
 
       img {
-        width: 100%;
+        max-height: ($baseline*2);
         display: block;
       }
     }
@@ -237,7 +237,6 @@
   }
 
   .branding {
-    width: 20%;
     @include margin-right(2%);
   }
 
@@ -262,7 +261,6 @@
     }
 
     .branding {
-      width: 20%;
       @include margin-right(2%);
     }
 

cms/templates/widgets/header.html

@@ -11,7 +11,13 @@
   <header class="primary" role="banner">
 
     <div class="wrapper wrapper-l">
-      <h1 class="branding"><a href="/"><img src="${static.url("images/edx-studio-logo.png")}" alt="${settings.STUDIO_NAME}" /></a></h1>
+      <h1 class="branding"><a href="/">
+      % if settings.FEATURES.get('IS_EDX_DOMAIN', False):
+        <img src="${static.url("images/edx-theme/edx-studio-logo.png")}" alt="${settings.STUDIO_NAME}" />
+      % else:
+        <img src="${static.url("images/logo-placeholder.png")}" alt="${settings.STUDIO_NAME}" />
+      % endif
+      </a></h1>
 
       % if context_course:
       <%