Merge remote-tracking branch 'origin/1.10' into 1.10

This commit is contained in:
Matias Griese
2019-08-16 15:47:16 +03:00

View File

@@ -20,7 +20,7 @@
</li>
{% if authorize(['admin.configuration', 'admin.super']) %}
<li class="{{ (location == 'system' or location == 'site' or location == 'config') ? 'selected' : '' }}">
<a href="{{ base_url_relative }}/config/{{ authorize(['admin.configuration_system']) ? 'system' : 'site' }}"><i class="fa fa-fw fa-wrench"></i><em>{{ "PLUGIN_ADMIN.CONFIGURATION"|tu }}</em></a>
<a href="{{ base_url_relative }}/config/{{ authorize(['admin.configuration_system','admin.super']) ? 'system' : 'site' }}"><i class="fa fa-fw fa-wrench"></i><em>{{ "PLUGIN_ADMIN.CONFIGURATION"|tu }}</em></a>
</li>
{% endif %}
{% if authorize(['admin.pages', 'admin.super']) %}