A cleaner right side of the navbar with a Github link (#666)

This commit is contained in:
Maxime Beauchemin 2016-06-23 15:28:07 -07:00 committed by GitHub
parent ab71ee4f93
commit f949b88ebd
2 changed files with 18 additions and 11 deletions

View File

@ -21,7 +21,12 @@
{% include 'appbuilder/navbar_menu.html' %} {% include 'appbuilder/navbar_menu.html' %}
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="http://airbnb.io/caravel"><i class="fa fa-book"></i> {{_("Documentation") }}</a></li> <li><a href="https://github.com/airbnb/caravel" title="Caravel's Github">
<i class="fa fa-github fa-lg"></i></a>
</li>
<li><a href="http://airbnb.io/caravel" title="Documentation">
<i class="fa fa-book fa-lg"></i> </a>
</li>
{% include 'appbuilder/navbar_right.html' %} {% include 'appbuilder/navbar_right.html' %}
</ul> </ul>
</div> </div>

View File

@ -10,16 +10,18 @@
</div> </div>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="dropdown"> <li class="dropdown">
{% for lang in languages %} {% for lang in languages %}
{% if lang != locale %} {% if lang != locale %}
<a tabindex="-1" href="{{appbuilder.get_url_for_locale(lang)}}"> <a tabindex="-1" href="{{appbuilder.get_url_for_locale(lang)}}">
<div class="f16"><i class="flag {{languages[lang].get('flag')}}"></i> - {{languages[lang].get('name')}} <div class="f16">
</div></a> <i class="flag {{languages[lang].get('flag')}}"></i> - {{languages[lang].get('name')}}
{% endif %} </div>
{% endfor %} </a>
</li> {% endif %}
</ul> {% endfor %}
</li>
</ul>
</li> </li>
{% endif %} {% endif %}
@ -27,9 +29,9 @@
{% if not current_user.is_anonymous() %} {% if not current_user.is_anonymous() %}
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> <a class="dropdown-toggle" data-toggle="dropdown" title="{{g.user.get_full_name()}}" href="#">
<span class="fa fa-user"></span> {{g.user.get_full_name()}}<b class="caret"></b> <span class="fa fa-user fa-lg" title=""></span><b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="{{appbuilder.get_url_for_userinfo}}"><span class="fa fa-fw fa-user"></span>{{_("Profile")}}</a></li> <li><a href="{{appbuilder.get_url_for_userinfo}}"><span class="fa fa-fw fa-user"></span>{{_("Profile")}}</a></li>
<li><a href="{{appbuilder.get_url_for_logout}}"><span class="fa fa-fw fa-sign-out"></span>{{_("Logout")}}</a></li> <li><a href="{{appbuilder.get_url_for_logout}}"><span class="fa fa-fw fa-sign-out"></span>{{_("Logout")}}</a></li>