chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix ckeditor elfinder - refs #2681

Browse Source
pull/2744/head
Alex Aragón 7 years ago
parent def85fcf92
commit ec4bdf9c8a
3 changed files with 10 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      src/ThemeBundle/Resources/views/Editor/elfinder.html.twig
  2. 4
      src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig
  3. 4
      src/ThemeBundle/Resources/views/Layout/head.html.twig

7
src/ThemeBundle/Resources/views/Editor/elfinder.html.twig
Unescape View File

@ -1,5 +1,6 @@
{% extends "@ChamiloTheme/Layout/no_layout.html.twig" %} <head>
{% include "@ChamiloTheme/Layout/head.html.twig" %}
</head>
{% block chamilo_wrap %} {% block chamilo_wrap %}
{% include '@ChamiloTheme/Editor/elfinder_standalone.html.twig' %} {% include '@ChamiloTheme/Editor/elfinder_standalone.html.twig' %}
{% endblock %} {% endblock %}

4
src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig
Unescape View File

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

4
src/ThemeBundle/Resources/views/Layout/head.html.twig
Unescape View File

@ -29,7 +29,9 @@
{# Files app.css is generated from "assets/css/app.scss" file using the file webpack.config.js #} {# 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/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' }}"/> <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 #} {# Add third party js libraries that can't be loaded using webpack #}
{% include "@ChamiloTheme/Layout/legacy_js.html.twig" %} {% include "@ChamiloTheme/Layout/legacy_js.html.twig" %}

Write Preview
Loading…
Cancel
Save