fix ckeditor elfinder - refs #2681

7 years ago · ec4bdf9c8a
parent def85fcf92
commit ec4bdf9c8a
3 changed files with 10 additions and 5 deletions
--- a/src/ThemeBundle/Resources/views/Editor/elfinder.html.twig
+++ b/src/ThemeBundle/Resources/views/Editor/elfinder.html.twig
@ -1,5 +1,6 @@
-{% extends "@ChamiloTheme/Layout/no_layout.html.twig" %}
-
+<head>
+    {% include "@ChamiloTheme/Layout/head.html.twig" %}
+</head>
 {% block chamilo_wrap %}
-{% include '@ChamiloTheme/Editor/elfinder_standalone.html.twig' %}
+    {% include '@ChamiloTheme/Editor/elfinder_standalone.html.twig' %}
 {% endblock %}
--- a/src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig
+++ b/src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig
@ -21,6 +21,7 @@
    }

    $().ready(function() {
+        var winheight = document.documentElement.clientHeight;
        var funcNum = getUrlParam('CKEditorFuncNum');
        var elf = $('#elfinder').elfinder({
            url : '{{ url('editor_connector')  }}{{ course_condition }}',  // connector URL (REQUIRED)
@ -28,7 +29,8 @@
                window.opener.CKEDITOR.tools.callFunction(funcNum, file.url);
                window.close();
            },
-            resizable: false
+            resizable: false,
+            height : winheight
        }).elfinder('instance');
    });
 </script>
--- a/src/ThemeBundle/Resources/views/Layout/head.html.twig
+++ b/src/ThemeBundle/Resources/views/Layout/head.html.twig
@ -29,7 +29,9 @@

 {# Files app.css is generated from "assets/css/app.scss" file using the file webpack.config.js #}
 <link rel="stylesheet" href="{{ url('legacy_public') ~ 'build/css/app.css' }}"/>
-<link rel="stylesheet" href="{{ url('legacy_public') ~ 'build/css/themes/'~ theme ~'/default.css' }}"/>
+{% if theme %}
+<link rel="stylesheet" href="{{ url('legacy_public') ~ 'build/css/themes/'~ theme ~'default.css' }}"/>
+{% endif %}
 <link rel="stylesheet" media="print" href="{{ url('legacy_public') ~ 'build/css/print.css' }}"/>
 {# Add third party js libraries that can't be loaded using webpack #}
 {% include "@ChamiloTheme/Layout/legacy_js.html.twig" %}