|
|
@@ -90,31 +90,12 @@ file that was distributed with this source code.
|
|
|
|
|
|
<div class="nav-collapse">
|
|
|
<ul class="nav">
|
|
|
-<<<<<<< HEAD
|
|
|
{% block top_bar_before_nav %} {% endblock %}
|
|
|
- {% if app.security.token and is_granted('ROLE_SONATA_ADMIN') %}
|
|
|
- {% for group in admin_pool.dashboardgroups %}
|
|
|
- <li class="dropdown">
|
|
|
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ group.label|trans({}, group.label_catalogue) }} <span class="caret"></span></a>
|
|
|
- <ul class="dropdown-menu">
|
|
|
- {% for admin in group.items %}
|
|
|
- {% if admin.hasroute('create') and admin.isGranted('CREATE') or admin.hasroute('list') and admin.isGranted('LIST') %}
|
|
|
- <li><a href="{{ admin.generateUrl('list')}}">{{ admin.label|trans({}, admin.translationdomain) }}</a></li>
|
|
|
- {% endif %}
|
|
|
- {% endfor %}
|
|
|
- </ul>
|
|
|
- </li>
|
|
|
- {% endfor %}
|
|
|
- {% endif %}
|
|
|
- {% block top_bar_after_nav %} {% endblock %}
|
|
|
-=======
|
|
|
-
|
|
|
{% block sonata_top_bar_nav %}
|
|
|
- {# There is no hasRole in a TokenInterface ... #}
|
|
|
{% if app.security.token and is_granted('ROLE_SONATA_ADMIN') %}
|
|
|
{% for group in admin_pool.dashboardgroups %}
|
|
|
<li class="dropdown">
|
|
|
- <a href="#" class="dropdown-toggle">{{ group.label|trans({}, group.label_catalogue) }}</a>
|
|
|
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ group.label|trans({}, group.label_catalogue) }} <span class="caret"></span></a>
|
|
|
<ul class="dropdown-menu">
|
|
|
{% for admin in group.items %}
|
|
|
{% if admin.hasroute('create') and admin.isGranted('CREATE') or admin.hasroute('list') and admin.isGranted('LIST') %}
|
|
|
@@ -126,7 +107,7 @@ file that was distributed with this source code.
|
|
|
{% endfor %}
|
|
|
{% endif %}
|
|
|
{% endblock %}
|
|
|
->>>>>>> origin/2.0
|
|
|
+ {% block top_bar_after_nav %} {% endblock %}
|
|
|
</ul>
|
|
|
</div>
|
|
|
{% endif %}
|
Thomas Rabaix