Merge branch 'master' of github.com:chamilo/chamilo-lms

src/CoreBundle/Resources/views/LearnPath/menubar.html.twig

@@ -13,10 +13,10 @@
         <div class="circle {{ show_toolbar_by_default == 1 ? 'open' : '' }}">
             {% if show_left_column == 1 %}
                 {% set label = "Collapse" | trans %}
-                {% set icon_expand = "arrow-expand-horizontal" %}
+                {% set icon_expand = "arrow-collapse-horizontal" %}
                 {% if lp_mode == 'embedframe' %}
                     {% set label = "Expand" | trans %}
-                    {% set icon_expand = "arrow-collapse-horizontal" %}
+                    {% set icon_expand = "arrow-expand-horizontal" %}
                 {% endif %}
                 <a href="#"
                    id="lp-view-expand-toggle"

src/CoreBundle/Resources/views/LearnPath/view.html.twig

@@ -244,7 +244,8 @@
                     $('.menu-button').css('color', '#000');
                 }
             });
-            if (/iPhone|iPod|iPad/.test(navigator.userAgent)) {
+            if (/iPhone|iPod|iPad|Safari/.test(navigator.userAgent)) {
+                if (!/Chrome/.test(navigator.userAgent)) {
                     // Fix an issue where you cannot scroll below first screen in
                     // learning paths on Apple devices
                     document.getElementById('wrapper-iframe').setAttribute(
@@ -257,6 +258,7 @@
                     // second screen in learning paths on Apple devices
                     document.getElementById('content_id').setAttribute('style', 'overflow: auto;');
                 }
+            }
             {% if lp_mode == 'embedframe' %}
             $('#lp-view-expand-button, #lp-view-expand-toggle').on('click', function (e) {
                 e.preventDefault();