Merge branch 'master' into PHRAS-2614_This-query-not-fired_4.1

composer.json

@@ -47,7 +47,7 @@
     "php": ">=5.5.9",
     "ext-intl": "*",
     "alchemy-fr/tcpdf-clone": "~6.0",
-    "alchemy/embed-bundle": "^2.0.3",
+    "alchemy/embed-bundle": "^2.0.4",
     "alchemy/geonames-api-consumer": "~0.1.0",
     "alchemy/mediavorus": "^0.4.4",
     "alchemy/oauth2php": "1.1.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "de1d9335418b121d0ede26765b0a9e7d",
+    "content-hash": "a40bfa0aa6310530dc0c92b141b21305",
     "packages": [
         {
             "name": "alchemy-fr/tcpdf-clone",
@@ -131,16 +131,16 @@
         },
         {
             "name": "alchemy/embed-bundle",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/alchemy-fr/embed-bundle.git",
-                "reference": "e02e25a04911210eaedff0adb9cf7589010c473b"
+                "reference": "b510748686c05c0c1d59b7ad15e2c1098abafc5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/e02e25a04911210eaedff0adb9cf7589010c473b",
-                "reference": "e02e25a04911210eaedff0adb9cf7589010c473b",
+                "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/b510748686c05c0c1d59b7ad15e2c1098abafc5a",
+                "reference": "b510748686c05c0c1d59b7ad15e2c1098abafc5a",
                 "shasum": ""
             },
             "require-dev": {
@@ -178,10 +178,10 @@
             ],
             "description": "Embed resources bundle",
             "support": {
-                "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.3",
+                "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.4",
                 "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
             },
-            "time": "2019-05-23T15:23:14+00:00"
+            "time": "2019-06-03T13:35:50+00:00"
         },
         {
             "name": "alchemy/geonames-api-consumer",

templates/web/common/menubar.html.twig

@@ -18,13 +18,13 @@
                 {% endif %}
             </span>
             </li>
+            {% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %}
                 <li class="show-menu" id="toggle-menu-main">
                     <img src="/assets/common/images/icons/menu-burger.png"/>
 
                     <div id="nav_menu_container" class="desktopmenu">
                         <div class="arrow-up"></div>
                         <ol class="nav_menu">
-                        {% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %}
                                 <li class="menu-bar-item">
                                     <a target="_blank" href="{{ path('prod') }}">
                                         <img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
@@ -123,10 +123,10 @@
                                     </li>
                                 {% endif %}
 
-                        {% endif %}
                         </ol>
                     </div>
                 </li>
+            {% endif %}
             <li class="show-menu" id="toggle-menu-link">
                 <img src="/assets/common/images/icons/menu-web-site.png"/>
                 <div id="nav_customlink_container" class="mobile-link">
@@ -142,36 +142,27 @@
                     <div class="arrow-up"></div>
                     <div class="nav-wrapper-box">
                         <ol class="nav_menu">
-
-                            <li class="menu-bar-item">
                             {% if app.getAuthenticator().isAuthenticated() %}
+                                <li class="menu-bar-item">
                                     {% if app.getAuthenticatedUser().isGuest %}
                                         <img src="/assets/common/images/icons/menu-name-user.png"/>
-                                        <span>
-                {{ 'Guest' | trans }}
-              </span>
+                                        <span>{{ 'Guest' | trans }}</span>
                                     {% else %}
                                         <a target="_blank" href="{{ path('account') }}"
                                            title="{{ 'login:: Mon compte' | trans }}">
                                             <img src="/assets/common/images/icons/menu-name-user.png"/>
-                                            <span>
-                  {{ app.getAuthenticatedUser().getDisplayName() }}
-                </span>
+                                            <span>{{ app.getAuthenticatedUser().getDisplayName() }}</span>
                                         </a>
                                     {% endif %}
-                                {% endif %}
                                 </li>
                                 <li class="menu-bar-item">
-                                {% if app.getAuthenticator().isAuthenticated() %}
                                     <a href="{{ path('logout', { 'redirect' : '..' ~ app['request'].getPathInfo() }) }}"
                                        target="_self">
                                         <img src="/assets/common/images/icons/menu-logout.png"/>
-                                        <span>
-                  {{ 'phraseanet:: deconnection' | trans }}
-                </span>
+                                        <span>{{ 'phraseanet:: deconnection' | trans }}</span>
                                     </a>
-                                {% endif %}
                                 </li>
+                            {% endif %}
                             <li class="menu-bar-item">
                                 <a target="_blank" href="https://docs.phraseanet.com/4.0/">
                                     <img src="/assets/common/images/icons/menu-help.png"/>