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

MDL-75337 core: Single button - core changes

Browse Source 
* Change all core calls toward single_button to use single_button::BUTTON_PRIMARY
    when needed
This commit is contained in:
Laurent David
2023-01-24 06:01:35 +01:00
parent 377c962f11
commit fc72a1d7b1
39 changed files with 95 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputrenderers.php
+14 -8
View File
@@ -2051,12 +2051,16 @@ class core_renderer extends renderer_base {
$displayoptions['cancelstr'] = $displayoptions['cancelstr'] ?? get_string('cancel');
if ($continue instanceof single_button) {
// ok
$continue->primary = true;
// Continue button should be primary if set to secondary type as it is the fefault.
if ($continue->type === single_button::BUTTON_SECONDARY) {
$continue->type = single_button::BUTTON_PRIMARY;
}
} else if (is_string($continue)) {
$continue = new single_button(new moodle_url($continue), $displayoptions['continuestr'], 'post', true);
$continue = new single_button(new moodle_url($continue), $displayoptions['continuestr'], 'post',
$displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
} else if ($continue instanceof moodle_url) {
$continue = new single_button($continue, $displayoptions['continuestr'], 'post', true);
$continue = new single_button($continue, $displayoptions['continuestr'], 'post',
$displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
} else {
throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a single_button instance.');
}
@@ -3120,7 +3124,7 @@ EOD;
if (!($url instanceof moodle_url)) {
$url = new moodle_url($url);
}
$button = new single_button($url, get_string('continue'), 'get', true);
$button = new single_button($url, get_string('continue'), 'get', single_button::BUTTON_PRIMARY);
$button->class = 'continuebutton';
return $this->render($button);
@@ -5567,11 +5571,13 @@ class core_renderer_maintenance extends core_renderer {
// We need plain styling of confirm boxes on upgrade because we don't know which stylesheet we have (it could be
// from any previous version of Moodle).
if ($continue instanceof single_button) {
$continue->primary = true;
$continue->type = single_button::BUTTON_PRIMARY;
} else if (is_string($continue)) {
$continue = new single_button(new moodle_url($continue), get_string('continue'), 'post', true);
$continue = new single_button(new moodle_url($continue), get_string('continue'), 'post',
$displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
} else if ($continue instanceof moodle_url) {
$continue = new single_button($continue, get_string('continue'), 'post', true);
$continue = new single_button($continue, get_string('continue'), 'post',
$displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
} else {
throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL' .
' (string/moodle_url) or a single_button instance.');