Skip to content

Commit

Permalink
Make sure the APP_ICON config is used in the template (#590)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremi Joslin authored and mistercrunch committed Jun 9, 2016
1 parent eb208b9 commit f4c92da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions caravel/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -181,4 +181,3 @@

if not CACHE_DEFAULT_TIMEOUT:
CACHE_DEFAULT_TIMEOUT = CACHE_CONFIG.get('CACHE_DEFAULT_TIMEOUT')

2 changes: 1 addition & 1 deletion caravel/templates/appbuilder/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit f4c92da

Please sign in to comment.