diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php index 3aaa3094464..e829a25cfc1 100644 --- a/blocks/site_main_menu/block_site_main_menu.php +++ b/blocks/site_main_menu/block_site_main_menu.php @@ -72,6 +72,8 @@ class block_site_main_menu extends block_list { $strmovefull = strip_tags(get_string('movefull', '', "'$USER->activitycopyname'")); $strcancel= get_string('cancel'); $stractivityclipboard = $USER->activitycopyname; + } else { + $strmove = get_string('move'); } $editbuttons = ''; @@ -90,18 +92,12 @@ class block_site_main_menu extends block_list { if (!$ismoving) { $actions = course_get_cm_edit_actions($mod, -1); - // Add the action move. - $modcontext = context_module::instance($mod->id); - $hasmanageactivities = has_capability('moodle/course:manageactivities', $modcontext); - if ($hasmanageactivities) { - $baseurl = new moodle_url('/course/mod.php', array('sesskey' => sesskey())); - $actions['move'] = new action_menu_link_primary( - new moodle_url($baseurl, array('copy' => $mod->id)), - new pix_icon('t/move', get_string('move'), 'moodle', array('class' => 'iconsmall', 'title' => '')), - null, - array('title' => get_string('move')) - ); - } + // Prepend list of actions with the 'move' action. + $actions = array('move' => new action_menu_link_primary( + new moodle_url('/course/mod.php', array('sesskey' => sesskey(), 'copy' => $mod->id)), + new pix_icon('t/move', $strmove, 'moodle', array('class' => 'iconsmall', 'title' => '')), + $strmove + )) + $actions; $editbuttons = html_writer::tag('div', $courserenderer->course_section_cm_edit_actions($actions, $mod, array('donotenhance' => true)), diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php index a23dc012ff8..e7fce57060a 100644 --- a/blocks/social_activities/block_social_activities.php +++ b/blocks/social_activities/block_social_activities.php @@ -74,6 +74,8 @@ class block_social_activities extends block_list { $strmovefull = strip_tags(get_string('movefull', '', "'$USER->activitycopyname'")); $strcancel= get_string('cancel'); $stractivityclipboard = $USER->activitycopyname; + } else { + $strmove = get_string('move'); } $editbuttons = ''; @@ -91,6 +93,14 @@ class block_social_activities extends block_list { } if (!$ismoving) { $actions = course_get_cm_edit_actions($mod, -1); + + // Prepend list of actions with the 'move' action. + $actions = array('move' => new action_menu_link_primary( + new moodle_url('/course/mod.php', array('sesskey' => sesskey(), 'copy' => $mod->id)), + new pix_icon('t/move', $strmove, 'moodle', array('class' => 'iconsmall', 'title' => '')), + $strmove + )) + $actions; + $editbuttons = html_writer::tag('div', $courserenderer->course_section_cm_edit_actions($actions, $mod, array('donotenhance' => true)), array('class' => 'buttons')