Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add section move controls (Moodle 4.0) #129

Merged
merged 2 commits into from
Jan 20, 2023
Merged

Add section move controls (Moodle 4.0) #129

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d28db3
Add section move controls
james-cnz Oct 26, 2022
677e308
Add section move controls (fix code indenting)
james-cnz Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
82 changes: 65 additions & 17 deletions classes/output/courseformat/content/section/controlmenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,17 @@ class controlmenu extends controlmenu_base {
* @return array of edit control items
*/
public function section_control_items() {
global $USER;

$format = $this->format;
$section = $this->section;
$course = $format->get_course();
$sectionreturn = $format->get_section_number();
$user = $USER;

$coursecontext = context_course::instance($course->id);
$numsections = $format->get_last_section_number();
$isstealth = $section->section > $numsections;

if ($sectionreturn) {
$url = course_get_url($course, $section->section);
Expand All @@ -65,12 +69,12 @@ public function section_control_items() {
}
$url->param('sesskey', sesskey());

$controls = [];
$markercontrols = [];
if ($section->section && has_capability('moodle/course:setcurrentsection', $coursecontext)) {
if ($course->marker == $section->section) { // Show the "light globe" on/off.
$url->param('marker', 0);
$highlightoff = get_string('highlightoff');
$controls['highlight'] = [
$markercontrols['highlight'] = [
'url' => $url,
'icon' => 'i/marked',
'name' => $highlightoff,
Expand All @@ -83,7 +87,7 @@ public function section_control_items() {
} else {
$url->param('marker', $section->section);
$highlight = get_string('highlight');
$controls['highlight'] = [
$markercontrols['highlight'] = [
'url' => $url,
'icon' => 'i/marker',
'name' => $highlight,
Expand All @@ -96,24 +100,68 @@ public function section_control_items() {
}
}

$movecontrols = [];
if ($section->section && !$isstealth && has_capability('moodle/course:movesections', $coursecontext, $user)) {
$baseurl = course_get_url($course);
$baseurl->param('sesskey', sesskey());
$horizontal = !$course->hidetabsbar && $course->tabsview != \format_onetopic::TABSVIEW_VERTICAL;
$rtl = right_to_left();

// Legacy move up and down links.
$url = clone($baseurl);
if ($section->section > 1) { // Add a arrow to move section up.
$url->param('section', $section->section);
$url->param('move', -1);
$strmoveup = $horizontal ? get_string('moveleft') : get_string('moveup');
$movecontrols['moveup'] = [
'url' => $url,
'icon' => $horizontal ? ($rtl ? 't/right' : 't/left') : 'i/up',
'name' => $strmoveup,
'pixattr' => ['class' => ''],
'attr' => ['class' => 'icon' . ($horizontal ? '' : ' moveup')],
];
}

$url = clone($baseurl);
if ($section->section < $numsections) { // Add a arrow to move section down.
$url->param('section', $section->section);
$url->param('move', 1);
$strmovedown = $horizontal ? get_string('moveright') : get_string('movedown');
$movecontrols['movedown'] = [
'url' => $url,
'icon' => $horizontal ? ($rtl ? 't/left' : 't/right') : 'i/down',
'name' => $strmovedown,
'pixattr' => ['class' => ''],
'attr' => ['class' => 'icon' . ($horizontal ? '' : ' movedown')],
];
}
}

$parentcontrols = parent::section_control_items();

// If the edit key exists, we are going to insert our controls after it.
if (array_key_exists("edit", $parentcontrols)) {
$merged = [];
// We can't use splice because we are using associative arrays.
// Step through the array and merge the arrays.
foreach ($parentcontrols as $key => $action) {
$merged[$key] = $action;
if ($key == "edit") {
// If we have come to the edit key, merge these controls here.
$merged = array_merge($merged, $controls);
}
$merged = [];
$editcontrolexists = array_key_exists("edit", $parentcontrols);
$visibilitycontrolexists = array_key_exists("visibility", $parentcontrols);
if (!$editcontrolexists) {
$merged = array_merge($merged, $markercontrols);
}
if (!$editcontrolexists && !$visibilitycontrolexists) {
$merged = array_merge($merged, $movecontrols);
}
// We can't use splice because we are using associative arrays.
// Step through the array and merge the arrays.
foreach ($parentcontrols as $key => $action) {
$merged[$key] = $action;
if ($key == "edit") {
// If we have come to the edit key, merge these controls here.
$merged = array_merge($merged, $markercontrols);
}
if ($key == "edit" && !$visibilitycontrolexists || $key == "visibility") {
$merged = array_merge($merged, $movecontrols);
}

return $merged;
} else {
return array_merge($controls, $parentcontrols);
}

return $merged;
}
}