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,18 +244,20 @@
                     $('.menu-button').css('color', '#000');
                 }
             });
-            if (/iPhone|iPod|iPad/.test(navigator.userAgent)) {
-                // Fix an issue where you cannot scroll below first screen in
-                // learning paths on Apple devices
-                document.getElementById('wrapper-iframe').setAttribute(
-                    'style',
-                    'width:100%; overflow:auto; position:auto; -webkit-overflow-scrolling:touch !important;'
-                );
-                $('#wrapper-iframe').before('<a style="position:fixed;right:5px;top:5px;z-index:1001;" target="_blank" href="{{ iframe_src }}" >Open PDF on Safari</a>');
+            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(
+                        'style',
+                        'width:100%; overflow:auto; position:auto; -webkit-overflow-scrolling:touch !important;'
+                    );
+                    $('#wrapper-iframe').before('<a style="position:fixed;right:5px;top:5px;z-index:1001;" target="_blank" href="{{ iframe_src }}" >Open PDF on Safari</a>');
 
-                // Fix another issue whereby buttons do not react to click below
-                // second screen in learning paths on Apple devices
-                document.getElementById('content_id').setAttribute('style', 'overflow: auto;');
+                    // Fix another issue whereby buttons do not react to click below
+                    // 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) {