Merge pull request #12 from sherlockode/fix/menu

Fix menu translation (sync with offical sonata bundle)
sherlockode · Oct 23, 2017 · 4424d36 · 4424d36
2 parents 4e3a1bf + 706cd80
commit 4424d36
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Resources/views/Menu/sonata_menu.html.twig b/Resources/views/Menu/sonata_menu.html.twig
@@ -25,9 +25,9 @@
 
 {% block linkElement %}
     {% spaceless %}
+        {% set translation_domain = item.extra('label_catalogue', 'messages') %}
         {% if item.extra('on_top') is defined and not item.extra('on_top') %}
-            {% set translation_domain = item.extra('translation_domain', 'messages') %}
-            {% set icon = item.attribute('icon')|default('') %}
+            {% set icon = item.extra('icon')|default('') %}
         {% else %}
             {% set icon = item.extra('icon') %}
         {% endif %}
@@ -43,7 +43,9 @@
             {% set icon = item.extra('icon')|default('') %}
             {{ icon|raw }}
             {{ parent() }}
-            <span class="pull-right-container"><i class="fa pull-right fa-angle-left"></i></span>
+            {%- if item.extra('keep_open') is not defined or not item.extra('keep_open') -%}
+                <span class="pull-right-container"><i class="fa pull-right fa-angle-left"></i></span>
+            {%- endif -%}
         </a>
     {% endspaceless %}
 {% endblock %}