Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-05-23 17:49:43 +00:00
commit 6891c62ce2

View File

@ -72,10 +72,16 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="{% url 'index' %}">{% trans 'Map' %}</a></li>
{% get_flatpages as flatpages %}
{% for page in flatpages %}
<li><a class="nav-link" href="{{page.url}}">{{page.title}}</a></li>
{% endfor %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About <span class="caret"></span></a>
<ul class="dropdown-menu">
{% get_flatpages '/about/' as about_pages %}
{% for page in about_pages %}
<li><a class="nav-link" href="{{page.url}}">{{page.title}}</a></li>
{% endfor %}
</ul>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="form-group">