moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-29523-master' of git://github.com/danpoltawski/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-02-27 16:51:44 +01:00
commit ec1956655a
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/form/filemanager.php
View file

@ -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))); $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'); $strdndenabled = get_string('dndenabled_insentence', 'moodle').$OUTPUT->help_icon('dndenabled');
$loading = get_string('loading', 'repository');
$html .= <<<FMHTML $html .= <<<FMHTML
<div class="filemanager-loading mdl-align" id='filemanager-loading-{$client_id}'> <div class="filemanager-loading mdl-align" id='filemanager-loading-{$client_id}'>
$icon_progress $icon_progress
@ -393,7 +394,7 @@ $icon_progress
</div> </div>
<div class="filemanager-container" id="filemanager-{$client_id}" style="position: relative" > <div class="filemanager-container" id="filemanager-{$client_id}" style="position: relative" >
<ul id="draftfiles-{$client_id}" class="fm-filelist"> <ul id="draftfiles-{$client_id}" class="fm-filelist">
<li>Loading...</li> <li>{$loading}</li>
</ul> </ul>
</div> </div>
</div> </div>