From 96d86e4e17bb19d8c7b977fc4e4989a77c2692e1 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Mon, 15 Dec 2014 10:57:37 -0500
Subject: [PATCH] Placeholder image for Open edX Studio logo, when not running
 on edx.org

---
 cms/envs/common.py                                  |   5 +++++
 .../images/{ => edx-theme}/edx-studio-logo.png      | Bin
 cms/static/sass/elements/_header.scss               |   4 +---
 cms/templates/widgets/header.html                   |   8 +++++++-
 {lms => common}/static/images/logo-placeholder.png  | Bin
 5 files changed, 13 insertions(+), 4 deletions(-)
 rename cms/static/images/{ => edx-theme}/edx-studio-logo.png (100%)
 rename {lms => common}/static/images/logo-placeholder.png (100%)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 6b044d388d..9bfbf5179b 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -115,6 +115,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
 
diff --git a/cms/static/images/edx-studio-logo.png b/cms/static/images/edx-theme/edx-studio-logo.png
similarity index 100%
rename from cms/static/images/edx-studio-logo.png
rename to cms/static/images/edx-theme/edx-studio-logo.png
diff --git a/cms/static/sass/elements/_header.scss b/cms/static/sass/elements/_header.scss
index afc4eabaaa..61bd56b331 100644
--- a/cms/static/sass/elements/_header.scss
+++ b/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%);
     }
 
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index cd509abf6a..4dd97ea46a 100644
--- a/cms/templates/widgets/header.html
+++ b/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:
       <%
diff --git a/lms/static/images/logo-placeholder.png b/common/static/images/logo-placeholder.png
similarity index 100%
rename from lms/static/images/logo-placeholder.png
rename to common/static/images/logo-placeholder.png