From f4c92da4e67a66a8a6544801bf84cb402c4fc484 Mon Sep 17 00:00:00 2001
From: Jeremi Joslin <jeremi@collabspot.com>
Date: Thu, 9 Jun 2016 16:45:03 -0700
Subject: [PATCH] Make sure the APP_ICON config is used in the template (#590)

---
 caravel/config.py                        | 3 +--
 caravel/templates/appbuilder/navbar.html | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/caravel/config.py b/caravel/config.py
index 2c60161adc3fd..1c66411e99db2 100644
--- a/caravel/config.py
+++ b/caravel/config.py
@@ -53,7 +53,7 @@
 APP_NAME = "Caravel"
 
 # Uncomment to setup Setup an App icon
-# APP_ICON = "/static/img/something.png"
+APP_ICON = "/static/assets/images/caravel_logo.png"
 
 # Druid query timezone
 # tz.tzutc() : Using utc timezone
@@ -181,4 +181,3 @@
 
 if not CACHE_DEFAULT_TIMEOUT:
     CACHE_DEFAULT_TIMEOUT = CACHE_CONFIG.get('CACHE_DEFAULT_TIMEOUT')
-
diff --git a/caravel/templates/appbuilder/navbar.html b/caravel/templates/appbuilder/navbar.html
index a495c50b52edf..9e5a872b75414 100644
--- a/caravel/templates/appbuilder/navbar.html
+++ b/caravel/templates/appbuilder/navbar.html
@@ -10,7 +10,7 @@
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" style="padding:7px;opacity:0.9;" href="{{appbuilder.get_url_for_index}}">
-        <img width="50" src="/static/assets/images/caravel_logo.png">
+        <img width="50" src="{{ appbuilder.app_icon }}">
       </a>
       <span class="navbar-brand">
           {{ appbuilder.app_name }}