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

This commit is contained in:
Eloy Lafuente (stronk7) 2012-02-27 16:51:44 +01:00
commit ec1956655a

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)));
$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>