QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-13 03:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving the warning message to the navbar (#2640)

Browse Source 
At Airbnb we use these WARNING_MSG configuration element to make it
clear that we're in the staging environment.

Before this PR it would render under the navbar and mess up some of the
heights configurations, where you wouldn't be able to scroll all the way
to the bottom of the page. This fixes it.
This commit is contained in:
Maxime Beauchemin
2017-04-18 16:03:32 -07:00
committed by GitHub
parent 0089762955
commit 46486f82d9
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
superset/templates/appbuilder/navbar.html
View File

@@ -1,5 +1,6 @@
{% set menu = appbuilder.menu %}
{% set languages = appbuilder.languages %}
{% set WARNING_MSG = appbuilder.app.config.get('WARNING_MSG') %}
<div class="navbar navbar-static-top {{menu.extra_classes}}" role="navigation">
<div class="container{{ '-fluid' if not navbar_container else '' }}">
@@ -18,9 +19,15 @@
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
{% if WARNING_MSG %}
<li class="alert alert-danger">
{{ WARNING_MSG | safe }}
</li>
{% endif %}
{% include 'appbuilder/navbar_menu.html' %}
</ul>
<ul class="nav navbar-nav navbar-right">
{% include 'appbuilder/navbar_right.html' %}
<li>
<a href="/static/assets/version_info.json" title="Version info">
<i class="fa fa-code-fork"></i> &nbsp;
@@ -36,17 +43,8 @@
<i class="fa fa-book"></i> &nbsp;
</a>
</li>
{% include 'appbuilder/navbar_right.html' %}
</ul>
</div>
</div>
</div>
{% set WARNING_MSG = appbuilder.app.config.get('WARNING_MSG') %}
{% if WARNING_MSG %}
<div class="container">
<div id="navbar-warning" class="alert alert-danger">
{{ WARNING_MSG | safe }}
</div>
</div>
{% endif %}