mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 17:06:53 +02:00
Merge branch 'MDL-29523-master' of git://github.com/danpoltawski/moodle
This commit is contained in:
commit
ec1956655a
1 changed files with 2 additions and 1 deletions
|
@ -378,6 +378,7 @@ function form_filemanager_render($options) {
|
|||
|
||||
$maxsize = get_string('maxfilesize', 'moodle', display_size(get_max_upload_file_size($CFG->maxbytes, $course_maxbytes, $options->maxbytes)));
|
||||
$strdndenabled = get_string('dndenabled_insentence', 'moodle').$OUTPUT->help_icon('dndenabled');
|
||||
$loading = get_string('loading', 'repository');
|
||||
$html .= <<<FMHTML
|
||||
<div class="filemanager-loading mdl-align" id='filemanager-loading-{$client_id}'>
|
||||
$icon_progress
|
||||
|
@ -393,7 +394,7 @@ $icon_progress
|
|||
</div>
|
||||
<div class="filemanager-container" id="filemanager-{$client_id}" style="position: relative" >
|
||||
<ul id="draftfiles-{$client_id}" class="fm-filelist">
|
||||
<li>Loading...</li>
|
||||
<li>{$loading}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue