MDL-43267 Javascript: Improve accessibility of keyboard move

Change the keyboard move descriptions to allow for more detailed
descriptions such as:
* "After 'X'"; or
* "To top of section 'Y'"

course/lib.php

@@ -3241,11 +3241,15 @@ function include_course_ajax($course, $usedmodules = array(), $enabledmodules =
             'clicktochangeinbrackets',
             'markthistopic',
             'markedthistopic',
-            'move',
             'movesection',
+            'movecoursemodule',
+            'movecoursesection',
             'movecontent',
             'tocontent',
-            'emptydragdropregion'
+            'emptydragdropregion',
+            'afterresource',
+            'aftersection',
+            'totopofsection',
         ), 'moodle');
 
     // Include section-specific strings for formats which support sections.

course/yui/dragdrop/dragdrop.js

@@ -278,7 +278,16 @@ YUI.add('moodle-course-dragdrop', function(Y) {
             this.groups = ['resource'];
             this.samenodeclass = CSS.ACTIVITY;
             this.parentnodeclass = CSS.SECTION;
-            this.resourcedraghandle = this.get_drag_handle(M.str.moodle.move, CSS.EDITINGMOVE, CSS.ICONCLASS, true);
+            this.resourcedraghandle = this.get_drag_handle(M.util.get_string('movecoursemodule', 'moodle'), CSS.EDITINGMOVE, CSS.ICONCLASS, true);
+
+            this.samenodelabel = {
+                identifier: 'afterresource',
+                component: 'moodle'
+            };
+            this.parentnodelabel = {
+                identifier: 'totopofsection',
+                component: 'moodle'
+            };
 
             // Go through all sections
             var sectionlistselector = M.course.format.get_section_selector(Y);

lang/en/moodle.php

@@ -115,6 +115,8 @@ $string['administratorsandteachers'] = 'Administrators and teachers';
 $string['advanced'] = 'Advanced';
 $string['advancedfilter'] = 'Advanced search';
 $string['advancedsettings'] = 'Advanced settings';
+$string['afterresource'] = 'After resource "{$a}"';
+$string['aftersection'] = 'After section "{$a}"';
 $string['again'] = 'again';
 $string['aimid'] = 'AIM ID';
 $string['ajaxuse'] = 'AJAX and Javascript';
@@ -1157,6 +1159,8 @@ $string['moreinformation'] = 'More information about this error';
 $string['moreprofileinfoneeded'] = 'Please tell us more about yourself';
 $string['mostrecently'] = 'most recently';
 $string['move'] = 'Move';
+$string['movecoursemodule'] = 'Move resource';
+$string['movecoursesection'] = 'Move section';
 $string['movecontent'] = 'Move {$a}';
 $string['movecategorycontentto'] = 'Move into';
 $string['movecategorysuccess'] = 'Successfully moved category \'{$a->moved}\' into category \'{$a->to}\'';
@@ -1813,6 +1817,7 @@ $string['topicoutline'] = 'Topic outline';
 $string['topicshow'] = 'Show this topic to {$a}';
 $string['topichide'] = 'Hide this topic from {$a}';
 $string['total'] = 'Total';
+$string['totopofsection'] = 'To the top of section "{$a}"';
 $string['trackforums'] = 'Forum tracking';
 $string['trackforumsno'] = 'No: don\'t keep track of posts I have seen';
 $string['trackforumsyes'] = 'Yes: highlight new posts for me';

lib/yui/dragdrop/dragdrop.js

@@ -19,6 +19,9 @@ YUI.add('moodle-core-dragdrop', function(Y) {
         absgoingup : null,
         samenodeclass : null,
         parentnodeclass : null,
+        samenodelabel : null,
+        parentnodelabel : null,
+
         groups : [],
         lastdroptarget : null,
         initializer : function() {
@@ -308,7 +311,13 @@ YUI.add('moodle-core-dragdrop', function(Y) {
                     listlink = Y.Node.create('<a></a>');
                     nodetitle = this.find_element_text(labelroot);
 
-                    listitemtext = M.util.get_string('tocontent', 'moodle', nodetitle);
+                    if (this.samenodelabel && node.hasClass(this.samenodeclass)) {
+                        listitemtext = M.util.get_string(this.samenodelabel.identifier, this.samenodelabel.component, nodetitle);
+                    } else if (this.parentnodelabel && node.hasClass(this.parentnodeclass)) {
+                        listitemtext = M.util.get_string(this.parentnodelabel.identifier, this.parentnodelabel.component, nodetitle);
+                    } else {
+                        listitemtext = M.util.get_string('tocontent', 'moodle', nodetitle);
+                    }
                     listlink.setContent(listitemtext);
 
                     // Add a data attribute so we can get the real drop target.