hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
This commit is contained in:
Romain Neutron
2013-12-02 18:17:38 +01:00
parent 845a53f545 7285717b80
commit 4f31cfeefc
14 changed files with 95 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/common/menubar.html.twig
View File

@@ -2,8 +2,8 @@
<div class="PNB" style="right:auto;overflow:hidden;">
<ol>
<li>
<span class="title {% if module is defined and module == "prod" %}selected{% endif %}">
Phraseanet
<span class="title {% if module == "prod" %}selected{% endif %}">
{% block menu_bar_title %}Phraseanet{% endblock %}
</span>
</li>
{% if module is defined and module != "lightbox" and app['authentication'].isAuthenticated() %}
@@ -75,7 +75,7 @@
</a>
</li>
{# MODULE #}
{# MODULE #}
{% if module is defined and module == "prod" %}
{% if app['acl'].get(app['authentication'].getUser()).has_access_to_module('upload') %}
<li>