L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-35934' of git://github.com/rwijaya/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2013-08-13 08:33:12 +12:00
parent 88ce8a1cb0 1b25169215
commit 8e9709f8bf
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
files/renderer.php
+1 -1
View File
@@ -114,7 +114,7 @@ class core_files_renderer extends plugin_renderer_base {
array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'),
array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'),
array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'),
array('confirmrenamefile', 'repository'), array('newfolder', 'repository')
array('confirmrenamefile', 'repository'), array('newfolder', 'repository'), array('edit', 'moodle')
)
);
if (empty($filemanagertemplateloaded)) {
lib/form/filemanager.js
+15
View File
@@ -104,8 +104,13 @@ M.form_filemanager.init = function(Y, options) {
}
// initialize 'select file' panel
this.selectnode = Y.Node.createWithFilesSkin(M.form_filemanager.templates.fileselectlayout);
this.selectnode.setAttribute('aria-live', 'assertive');
this.selectnode.setAttribute('role', 'dialog');
this.selectnode.generateID();
var labelid = 'fm-dialog-label_'+ this.selectnode.get('id');
this.selectui = new Y.Panel({
headerContent: '<span id="' + labelid +'">' + M.str.moodle.edit + '</span>',
srcNode : this.selectnode,
zIndex : 7600,
centered : true,
@@ -114,6 +119,7 @@ M.form_filemanager.init = function(Y, options) {
render : true
});
this.selectui.plug(Y.Plugin.Drag,{handles:['#'+this.selectnode.get('id')+' .yui3-widget-hd']});
Y.one('#'+this.selectnode.get('id')).setAttribute('aria-labelledby', labelid);
this.selectui.hide();
this.setup_select_file();
// setup buttons onclick events
@@ -1011,8 +1017,17 @@ M.form_filemanager.init = function(Y, options) {
}
}, false);
}
// update dialog header
var nodename = node.fullname;
// Limit the string length so it fits nicely on mobile devices
var namelength = 50;
if (nodename.length > namelength) {
nodename = nodename.substring(0, namelength) + '...';
}
Y.one('#fm-dialog-label_'+selectnode.get('id')).setContent(Y.Escape.html(M.str.moodle.edit+' '+nodename));
// show panel
this.selectui.show();
Y.one('#'+selectnode.get('id')).focus();
},
render: function() {
this.print_path();
mod/data/field/file/field.class.php
+1 -1
View File
@@ -98,7 +98,7 @@ class data_field_file extends data_field_base {
array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'),
array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'),
array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'),
array('confirmrenamefile', 'repository')
array('confirmrenamefile', 'repository'), array('edit', 'moodle')
)
);
mod/data/field/picture/field.class.php
+1 -1
View File
@@ -112,7 +112,7 @@ class data_field_picture extends data_field_base {
array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'),
array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'),
array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'),
array('confirmrenamefile', 'repository')
array('confirmrenamefile', 'repository'), array('edit', 'moodle')
)
);