Permalink
Browse files

Merge branch 'MDL-35924_m24' of https://github.com/markn86/moodle int…

…o MOODLE_24_STABLE
  • Loading branch information...
2 parents ebe2f5a + 2d8e189 commit e081622b9b0d10aa138a71d91128a45d9c305aac @stronk7 stronk7 committed Jan 21, 2013
Showing with 5 additions and 1 deletion.
  1. +4 −1 files/renderer.php
  2. +1 −0 lib/form/filemanager.js
View
@@ -304,7 +304,10 @@ private function fm_js_template_listfilename() {
private function fm_js_template_mkdir() {
$rv = '
<div class="filemanager fp-mkdir-dlg">
- <div class="fp-mkdir-dlg-text">'.get_string('newfoldername','repository').'<br/><input type="text" /></div>
+ <div class="fp-mkdir-dlg-text">
+ <label>' . get_string('newfoldername', 'repository') . '</label><br/>
+ <input type="text" />
+ </div>
<button class="{!}fp-dlg-butcreate">'.get_string('makeafolder').'</button>
<button class="{!}fp-dlg-butcancel">'.get_string('cancel').'</button>
</div>';
View
@@ -319,6 +319,7 @@ M.form_filemanager.init = function(Y, options) {
on('keydown', function(e){
if (e.keyCode == 13) {Y.bind(perform_action, this)(e);}
}, this);
+ node.one('label').set('for', 'fm-newname-' + this.client_id);
node.all('.fp-dlg-butcancel').on('click', function(e){e.preventDefault();this.mkdir_dialog.hide();}, this);
node.all('.fp-dlg-curpath').set('id', 'fm-curpath-'+this.client_id);
}

0 comments on commit e081622

Please sign in to comment.