Permalink
Browse files

Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/mo…

…odle
  • Loading branch information...
2 parents 1c8c3a6 + 8659df9 commit 52b7e8aa58d9a794c64a3c8aa2dddf3e773bf5b8 Sam Hemelryk committed Feb 10, 2014
View
@@ -3238,11 +3238,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.
@@ -303,7 +303,16 @@ Y.extend(DRAGRESOURCE, M.core.dragdrop, {
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);
Oops, something went wrong.
@@ -299,7 +299,16 @@ Y.extend(DRAGRESOURCE, M.core.dragdrop, {
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);
@@ -14,7 +14,16 @@ Y.extend(DRAGRESOURCE, M.core.dragdrop, {
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);
View
@@ -115,6 +115,8 @@
$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';
@@ -1165,6 +1167,8 @@
$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}\'';
@@ -1820,6 +1824,7 @@
$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';
Oops, something went wrong.

0 comments on commit 52b7e8a

Please sign in to comment.