diff --git a/admin/renderer.php b/admin/renderer.php index 0c66010ed73..89a35af70de 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -213,7 +213,7 @@ class core_admin_renderer extends plugin_renderer_base { $output .= $this->container_end(); } - $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', true); + $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', single_button::BUTTON_PRIMARY); $button->class = 'continuebutton'; $output .= $this->render($button); $output .= $this->footer(); diff --git a/admin/searchareas.php b/admin/searchareas.php index d053ef99076..d5c9b5d83bf 100644 --- a/admin/searchareas.php +++ b/admin/searchareas.php @@ -77,7 +77,7 @@ if ($action) { $cancelurl = new moodle_url('/admin/searchareas.php'); echo $OUTPUT->header(); echo $OUTPUT->confirm(get_string('confirm_' . $action, 'search', $a), - new single_button($actionurl, get_string('continue'), 'post', true), + new single_button($actionurl, get_string('continue'), 'post', single_button::BUTTON_PRIMARY), new single_button($cancelurl, get_string('cancel'), 'get')); echo $OUTPUT->footer(); exit; diff --git a/admin/searchreindex.php b/admin/searchreindex.php index b149e75f3a0..d6abf48c8a2 100644 --- a/admin/searchreindex.php +++ b/admin/searchreindex.php @@ -83,7 +83,7 @@ if (optional_param('sesskey', '', PARAM_ALPHANUM)) { // Display confirmation prompt. echo $OUTPUT->confirm(get_string('gradualreindex_confirm', 'search', html_writer::tag('strong', $areaname)), new single_button(new moodle_url('/admin/searchreindex.php', ['areaid' => $areaid, - 'sesskey' => sesskey()]), get_string('continue'), 'post', true), + 'sesskey' => sesskey()]), get_string('continue'), 'post', single_button::BUTTON_PRIMARY), new single_button(new moodle_url('/admin/searchareas.php'), get_string('cancel'), 'get')); } diff --git a/admin/tool/brickfield/classes/output/renderer.php b/admin/tool/brickfield/classes/output/renderer.php index 83fc3982ec2..09ec97a6d3f 100644 --- a/admin/tool/brickfield/classes/output/renderer.php +++ b/admin/tool/brickfield/classes/output/renderer.php @@ -170,7 +170,7 @@ class renderer extends plugin_renderer_base { $link, get_string('schedule:requestanalysis', manager::PLUGINNAME), 'post', - true, + \single_button::BUTTON_PRIMARY, ['class' => $classname] ); diff --git a/admin/webservice/tokens.php b/admin/webservice/tokens.php index 32628d8d37e..5f4e0875df2 100644 --- a/admin/webservice/tokens.php +++ b/admin/webservice/tokens.php @@ -148,7 +148,7 @@ echo $OUTPUT->header(); echo $OUTPUT->heading(get_string('managetokens', 'core_webservice')); echo html_writer::div($OUTPUT->render(new single_button(new moodle_url($PAGE->url, ['action' => 'create']), - get_string('createtoken', 'core_webservice'), 'get', true)), 'my-3'); + get_string('createtoken', 'core_webservice'), 'get', single_button::BUTTON_PRIMARY)), 'my-3'); $filter->display(); diff --git a/analytics/classes/bulk_action.php b/analytics/classes/bulk_action.php index e615816ab64..0ea1819ec80 100644 --- a/analytics/classes/bulk_action.php +++ b/analytics/classes/bulk_action.php @@ -60,6 +60,9 @@ class bulk_action extends action { $this->url = new \moodle_url('/report/insights/action.php', $params); $label = $OUTPUT->render($icon) . $this->text; - $this->actionlink = new \single_button($this->url, $label, 'get', $primary, $attributes); + $this->actionlink = new \single_button($this->url, $label, + 'get', + $primary ? \single_button::BUTTON_PRIMARY : \single_button::BUTTON_SECONDARY, + $attributes); } } diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php index eb6ae4abf13..e780bac10b6 100644 --- a/backup/util/ui/renderer.php +++ b/backup/util/ui/renderer.php @@ -567,7 +567,7 @@ class core_backup_renderer extends plugin_renderer_base { if ($method != 'post') { $method = 'get'; } - $button = new single_button($url, get_string('continue'), $method, true); + $button = new single_button($url, get_string('continue'), $method, single_button::BUTTON_PRIMARY); $button->class = 'continuebutton'; return $this->render($button); } diff --git a/badges/classes/output/recipients_action_bar.php b/badges/classes/output/recipients_action_bar.php index cae5ba7ce91..e4e7a86423e 100644 --- a/badges/classes/output/recipients_action_bar.php +++ b/badges/classes/output/recipients_action_bar.php @@ -50,7 +50,7 @@ class recipients_action_bar extends manage_badge_action_bar { if ($this->badge->has_manual_award_criteria() && has_capability('moodle/badges:awardbadge', $this->page->context) && $this->badge->is_active()) { $url = new moodle_url('/badges/award.php', ['id' => $this->badge->id]); - $button = new single_button($url, get_string('award', 'badges'), 'post', true); + $button = new single_button($url, get_string('award', 'badges'), 'post', single_button::BUTTON_PRIMARY); $elements['awardbutton'] = $button->export_for_template($output); } $thirdpartynav = $this->get_third_party_nav_action($output); diff --git a/badges/classes/output/standard_action_bar.php b/badges/classes/output/standard_action_bar.php index 93026a087b2..01609e2a992 100644 --- a/badges/classes/output/standard_action_bar.php +++ b/badges/classes/output/standard_action_bar.php @@ -89,7 +89,7 @@ class standard_action_bar extends base_action_bar { if ($this->showaddbadge && has_capability('moodle/badges:createbadge', $this->page->context)) { $buttons[] = new single_button(new moodle_url('/badges/newbadge.php', $params), - get_string('newbadge', 'core_badges'), 'post', true); + get_string('newbadge', 'core_badges'), 'post', single_button::BUTTON_PRIMARY); } foreach ($buttons as $key => $button) { diff --git a/blocks/accessreview/block_accessreview.php b/blocks/accessreview/block_accessreview.php index 1743b06b336..8ec3cafc50e 100644 --- a/blocks/accessreview/block_accessreview.php +++ b/blocks/accessreview/block_accessreview.php @@ -155,7 +155,7 @@ class block_accessreview extends block_base { $button = new single_button( new moodle_url(accessibility::get_plugin_url(), ['action' => 'requestanalysis', 'courseid' => $COURSE->id]), - get_string('schedule:requestanalysis', manager::PLUGINNAME), 'post', true, + get_string('schedule:requestanalysis', manager::PLUGINNAME), 'post', single_button::BUTTON_PRIMARY, ['class' => 'block_accessreview_analysisbutton']); $this->content->text .= html_writer::tag('div', $OUTPUT->render($button), ['class' => 'block_accessreview_analysisbutton']); diff --git a/blocks/myoverview/classes/output/main.php b/blocks/myoverview/classes/output/main.php index 91c6512f2e7..3bc8ed73b02 100644 --- a/blocks/myoverview/classes/output/main.php +++ b/blocks/myoverview/classes/output/main.php @@ -502,7 +502,7 @@ class main implements renderable, templatable { new \moodle_url('/course/request.php', ['category' => $category->id]), get_string('requestcourse'), 'post', - true + \single_button::BUTTON_PRIMARY ); return $this->generate_zero_state_data($nocoursesimg, [$button], 'request'); } @@ -523,7 +523,7 @@ class main implements renderable, templatable { new \moodle_url('/course/edit.php', ['category' => $category->id]), get_string('createcourse', 'block_myoverview'), 'post', - true + \single_button::BUTTON_PRIMARY ); $buttons[] = $createbutton->export_for_template($output); return $this->generate_zero_state_data($nocoursesimg, $buttons, 'nocourses'); @@ -534,7 +534,7 @@ class main implements renderable, templatable { new \moodle_url('/course/edit.php', ['category' => $categorytocreate->id]), get_string('createcourse', 'block_myoverview'), 'post', - true + \single_button::BUTTON_PRIMARY ); $buttons = [$createbutton->export_for_template($output)]; if ($categorytomanage = \core_course_category::get_nearest_editable_subcategory($coursecat, ['manage'])) { diff --git a/calendar/renderer.php b/calendar/renderer.php index 069e132716e..b6c86783557 100644 --- a/calendar/renderer.php +++ b/calendar/renderer.php @@ -325,10 +325,10 @@ class core_calendar_renderer extends plugin_renderer_base { */ public function render_subscriptions_header(): string { $importcalendarbutton = new single_button(new moodle_url('/calendar/import.php', calendar_get_export_import_link_params()), - get_string('importcalendar', 'calendar'), 'get', true); + get_string('importcalendar', 'calendar'), 'get', single_button::BUTTON_PRIMARY); $importcalendarbutton->class .= ' float-sm-right float-right'; $exportcalendarbutton = new single_button(new moodle_url('/calendar/export.php', calendar_get_export_import_link_params()), - get_string('exportcalendar', 'calendar'), 'get', true); + get_string('exportcalendar', 'calendar'), 'get', single_button::BUTTON_PRIMARY); $exportcalendarbutton->class .= ' float-sm-right float-right'; $output = $this->output->heading(get_string('managesubscriptions', 'calendar')); $output .= html_writer::start_div('header d-flex flex-wrap mt-5'); diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php index b4221d005f9..b66c6ced955 100644 --- a/enrol/manual/lib.php +++ b/enrol/manual/lib.php @@ -218,7 +218,7 @@ class enrol_manual_plugin extends enrol_plugin { $button = new enrol_user_button($link, get_string('enrolusers', 'enrol_manual'), 'get'); $button->class .= ' enrol_manual_plugin'; - $button->primary = true; + $button->type = single_button::BUTTON_PRIMARY; $context = context_course::instance($instance->courseid); $arguments = array('contextid' => $context->id); diff --git a/enrol/otherusers.php b/enrol/otherusers.php index d14a5737b32..75b3a677ee6 100644 --- a/enrol/otherusers.php +++ b/enrol/otherusers.php @@ -98,7 +98,7 @@ echo $OUTPUT->header(); // Check we have a search button to render. $searchbuttonrender = null; if ($searchbutton = $table->get_user_search_button()) { - $searchbutton->primary = true; + $searchbutton->type = single_button::BUTTON_PRIMARY; $searchbuttonrender = $OUTPUT->render($searchbutton); } diff --git a/enrol/renderer.php b/enrol/renderer.php index c2458edec22..8b24daca2c9 100644 --- a/enrol/renderer.php +++ b/enrol/renderer.php @@ -37,12 +37,15 @@ class core_enrol_renderer extends plugin_renderer_base { * @return string XHTML */ protected function render_enrol_user_button(enrol_user_button $button) { - $attributes = array('type' => 'submit', - 'value' => $button->label, - 'disabled' => $button->disabled ? 'disabled' : null, - 'title' => $button->tooltip, - 'class' => 'btn ' . ($button->primary ? 'btn-primary' : 'btn-secondary')); + $buttoninfo = $button->export_for_template($this->output); + $attributes = [ + 'type' => 'submit', + 'value' => $buttoninfo->label, + 'disabled' => $buttoninfo->disabled ? 'disabled' : null, + 'title' => $buttoninfo->tooltip, + 'class' => 'btn ' . "btn-{$buttoninfo->type}", + ]; if ($button->actions) { $id = html_writer::random_id('single_button'); $attributes['id'] = $id; diff --git a/grade/classes/output/course_outcomes_action_bar.php b/grade/classes/output/course_outcomes_action_bar.php index 8c90ff2e6c2..6e266d0b3ba 100644 --- a/grade/classes/output/course_outcomes_action_bar.php +++ b/grade/classes/output/course_outcomes_action_bar.php @@ -56,7 +56,7 @@ class course_outcomes_action_bar extends action_bar { // Add a button to the action bar with a link to the 'manage outcomes' page. $manageoutcomeslink = new moodle_url('/grade/edit/outcome/index.php', ['id' => $courseid]); $manageoutcomesbutton = new \single_button($manageoutcomeslink, get_string('manageoutcomes', 'grades'), - 'get', true); + 'get', \single_button::BUTTON_PRIMARY); $data['manageoutcomesbutton'] = $manageoutcomesbutton->export_for_template($output); } diff --git a/grade/classes/output/export_key_manager_action_bar.php b/grade/classes/output/export_key_manager_action_bar.php index 0b1268c990d..588b5526a14 100644 --- a/grade/classes/output/export_key_manager_action_bar.php +++ b/grade/classes/output/export_key_manager_action_bar.php @@ -54,7 +54,7 @@ class export_key_manager_action_bar extends action_bar { // Add a button to the action bar with a link to the 'add user key' page. $adduserkeylink = new moodle_url('/grade/export/key.php', ['courseid' => $courseid]); $adduserkeybutton = new \single_button($adduserkeylink, get_string('adduserkey', 'userkey'), - 'get', true); + 'get', \single_button::BUTTON_PRIMARY); $data['adduserkeybutton'] = $adduserkeybutton->export_for_template($output); return $data; diff --git a/grade/classes/output/grade_letters_action_bar.php b/grade/classes/output/grade_letters_action_bar.php index 8aab52122ed..7b65878dd9d 100644 --- a/grade/classes/output/grade_letters_action_bar.php +++ b/grade/classes/output/grade_letters_action_bar.php @@ -53,7 +53,7 @@ class grade_letters_action_bar extends action_bar { } // Add a button to the action bar with a link to the 'edit grade letters' page. $editbuttonlink = new moodle_url('/grade/edit/letter/index.php', ['id' => $this->context->id, 'edit' => 1]); - $editbutton = new \single_button($editbuttonlink, get_string('edit'), 'get', true); + $editbutton = new \single_button($editbuttonlink, get_string('edit'), 'get', \single_button::BUTTON_PRIMARY); $data['editbutton'] = $editbutton->export_for_template($output); return $data; diff --git a/grade/classes/output/import_key_manager_action_bar.php b/grade/classes/output/import_key_manager_action_bar.php index de421c113d1..8ec1db43144 100644 --- a/grade/classes/output/import_key_manager_action_bar.php +++ b/grade/classes/output/import_key_manager_action_bar.php @@ -54,7 +54,7 @@ class import_key_manager_action_bar extends action_bar { // Add a button to the action bar with a link to the 'add user key' page. $adduserkeylink = new moodle_url('/grade/import/key.php', ['courseid' => $courseid]); $adduserkeybutton = new \single_button($adduserkeylink, get_string('adduserkey', 'userkey'), - 'get', true); + 'get', \single_button::BUTTON_PRIMARY); $data['adduserkeybutton'] = $adduserkeybutton->export_for_template($output); return $data; diff --git a/grade/classes/output/manage_outcomes_action_bar.php b/grade/classes/output/manage_outcomes_action_bar.php index e279285f4c0..59b481e4fe4 100644 --- a/grade/classes/output/manage_outcomes_action_bar.php +++ b/grade/classes/output/manage_outcomes_action_bar.php @@ -78,7 +78,7 @@ class manage_outcomes_action_bar extends action_bar { // Add a button to the action bar with a link to the 'add new outcome' page. $addoutcomelink = new moodle_url('/grade/edit/outcome/edit.php', ['courseid' => $courseid]); $addoutcomebutton = new \single_button($addoutcomelink, get_string('outcomecreate', 'grades'), - 'get', true); + 'get', \single_button::BUTTON_PRIMARY); $data['addoutcomebutton'] = $addoutcomebutton->export_for_template($output); if ($this->hasoutcomes) { diff --git a/grade/classes/output/scales_action_bar.php b/grade/classes/output/scales_action_bar.php index 9a0f1459036..9f8e94e6457 100644 --- a/grade/classes/output/scales_action_bar.php +++ b/grade/classes/output/scales_action_bar.php @@ -56,7 +56,7 @@ class scales_action_bar extends action_bar { // Add a button to the action bar with a link to the 'add new scale' page. $addnewscalelink = new moodle_url('/grade/edit/scale/edit.php', ['courseid' => $courseid]); $addnewscalebutton = new \single_button($addnewscalelink, get_string('scalescustomcreate'), - 'get', true); + 'get', \single_button::BUTTON_PRIMARY); $data['addnewscalebutton'] = $addnewscalebutton->export_for_template($output); return $data; diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 32dfde75834..deaa670c728 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -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.'); diff --git a/mod/assign/classes/output/override_actionmenu.php b/mod/assign/classes/output/override_actionmenu.php index ef09dead877..a00faa1e01c 100644 --- a/mod/assign/classes/output/override_actionmenu.php +++ b/mod/assign/classes/output/override_actionmenu.php @@ -150,7 +150,7 @@ class override_actionmenu implements templatable, renderable { } else if ($action === 'adduser' && !$this->show_useroverride()) { $options = ['disabled' => 'true']; } - $overridebutton = new single_button($url, $text, 'post', true, $options); + $overridebutton = new single_button($url, $text, 'post', single_button::BUTTON_PRIMARY, $options); $urlselect = $this->get_select_menu(); return [ diff --git a/mod/assign/classes/output/user_submission_actionmenu.php b/mod/assign/classes/output/user_submission_actionmenu.php index e42fb6ac2b5..4c8b1211023 100644 --- a/mod/assign/classes/output/user_submission_actionmenu.php +++ b/mod/assign/classes/output/user_submission_actionmenu.php @@ -119,7 +119,12 @@ class user_submission_actionmenu implements templatable, renderable { 'help' => $help->export_for_template($output) ]; $url = new moodle_url('/mod/assign/view.php', ['id' => $this->cmid, 'action' => 'editsubmission']); - $newattemptbutton = new single_button($url, get_string('addnewattempt', 'mod_assign'), 'get', true); + $newattemptbutton = new single_button( + $url, + get_string('addnewattempt', 'mod_assign'), + 'get', + single_button::BUTTON_PRIMARY + ); $newattempthelp = new help_icon('addnewattempt', 'mod_assign'); $data['edit']['button'] = $newattemptbutton->export_for_template($output); $data['edit']['help'] = $newattempthelp->export_for_template($output); @@ -143,7 +148,12 @@ class user_submission_actionmenu implements templatable, renderable { $data['edit']['begin'] = true; $data['edit']['help'] = ''; } else { - $newattemptbutton = new single_button($url, get_string('addsubmission', 'mod_assign'), 'get', true); + $newattemptbutton = new single_button( + $url, + get_string('addsubmission', 'mod_assign'), + 'get', + single_button::BUTTON_PRIMARY + ); $data['edit']['button'] = $newattemptbutton->export_for_template($output); $data['edit']['help'] = ''; } @@ -151,7 +161,7 @@ class user_submission_actionmenu implements templatable, renderable { } if ($this->showsubmit) { $url = new moodle_url('/mod/assign/view.php', ['id' => $this->cmid, 'action' => 'submit']); - $button = new single_button($url, get_string('submitassignment', 'mod_assign'), 'get', true); + $button = new single_button($url, get_string('submitassignment', 'mod_assign'), 'get', single_button::BUTTON_PRIMARY); $help = new help_icon('submitassignment', 'mod_assign'); $data['submit'] = [ 'button' => $button->export_for_template($output), diff --git a/mod/bigbluebuttonbn/mod_form.php b/mod/bigbluebuttonbn/mod_form.php index 01c86e5c9de..31bd487d752 100644 --- a/mod/bigbluebuttonbn/mod_form.php +++ b/mod/bigbluebuttonbn/mod_form.php @@ -587,7 +587,7 @@ class mod_bigbluebuttonbn_mod_form extends moodleform_mod { $action = new single_button(new moodle_url(qualified_me()), get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn'), 'post', - false, + single_button::BUTTON_SECONDARY, ['name' => 'bigbluebuttonbn_participant_selection_add'] ); $pformcontext = [ diff --git a/mod/data/classes/output/add_entries_action.php b/mod/data/classes/output/add_entries_action.php index 4c1699c6846..32352fdcb9a 100644 --- a/mod/data/classes/output/add_entries_action.php +++ b/mod/data/classes/output/add_entries_action.php @@ -58,7 +58,7 @@ class add_entries_action implements templatable, renderable { if (data_user_can_add_entry($database, $currentgroup, $groupmode, $PAGE->context)) { $addentrylink = new moodle_url('/mod/data/edit.php', ['d' => $this->id, 'backto' => $PAGE->url->out(false)]); - $button = new \single_button($addentrylink, get_string('add', 'mod_data'), 'get', true); + $button = new \single_button($addentrylink, get_string('add', 'mod_data'), 'get', \single_button::BUTTON_PRIMARY); return $button->export_for_template($output); } diff --git a/mod/data/classes/output/empty_database_action_bar.php b/mod/data/classes/output/empty_database_action_bar.php index 8653e0f6c0f..adf38c073d6 100644 --- a/mod/data/classes/output/empty_database_action_bar.php +++ b/mod/data/classes/output/empty_database_action_bar.php @@ -60,7 +60,7 @@ class empty_database_action_bar implements templatable, renderable { $importentrieslink = new moodle_url('/mod/data/import.php', $params); $importentriesbutton = new \single_button($importentrieslink, - get_string('importentries', 'mod_data'), 'get', false); + get_string('importentries', 'mod_data'), 'get'); $data['importentriesbutton'] = $importentriesbutton->export_for_template($output); } diff --git a/mod/data/classes/output/zero_state_action_bar.php b/mod/data/classes/output/zero_state_action_bar.php index 7125aec9189..cd1b67dd6bf 100644 --- a/mod/data/classes/output/zero_state_action_bar.php +++ b/mod/data/classes/output/zero_state_action_bar.php @@ -59,7 +59,7 @@ class zero_state_action_bar implements templatable, renderable { $usepresetlink = new moodle_url('/mod/data/preset.php', $params); $usepresetbutton = new \single_button($usepresetlink, - get_string('usestandard', 'mod_data'), 'get', true); + get_string('usestandard', 'mod_data'), 'get', \single_button::BUTTON_PRIMARY); $data['usepresetbutton'] = $usepresetbutton->export_for_template($output); $actionbar = new \mod_data\output\action_bar($instance->id, $PAGE->url); @@ -68,7 +68,7 @@ class zero_state_action_bar implements templatable, renderable { $importpresetlink = new moodle_url('/mod/data/preset.php', $params); $importpresetbutton = new \single_button($importpresetlink, - get_string('importapreset', 'mod_data'), 'get', false, [ + get_string('importapreset', 'mod_data'), 'get', \single_button::BUTTON_SECONDARY, [ 'data-action' => 'importpresets', 'data-dataid' => $cm->id, ]); diff --git a/mod/folder/renderer.php b/mod/folder/renderer.php index 07c21f3c3a2..d9a2bc5fd52 100644 --- a/mod/folder/renderer.php +++ b/mod/folder/renderer.php @@ -60,7 +60,7 @@ class mod_folder_renderer extends plugin_renderer_base { $canmanagecourseactivities = has_capability('moodle/course:manageactivities', $context); if ($canmanagefolderfiles && ($folder->display != FOLDER_DISPLAY_INLINE || !$canmanagecourseactivities)) { $editbutton = new single_button(new moodle_url('/mod/folder/edit.php', ['id' => $cm->id]), - get_string('edit'), 'post', true); + get_string('edit'), 'post', single_button::BUTTON_PRIMARY); $editbutton->class = 'navitem'; $buttons .= $this->render($editbutton); } diff --git a/mod/glossary/classes/output/standard_action_bar.php b/mod/glossary/classes/output/standard_action_bar.php index 8d8307ff100..d6edaa3f032 100644 --- a/mod/glossary/classes/output/standard_action_bar.php +++ b/mod/glossary/classes/output/standard_action_bar.php @@ -160,7 +160,7 @@ class standard_action_bar implements renderable, templatable { return null; } $btn = new single_button(new moodle_url('/mod/glossary/edit.php', ['cmid' => $this->cm->id]), - get_string('addsingleentry', 'glossary'), 'post', true); + get_string('addsingleentry', 'glossary'), 'post', single_button::BUTTON_PRIMARY); return $btn->export_for_template($output); } diff --git a/mod/lesson/classes/output/edit_action_buttons.php b/mod/lesson/classes/output/edit_action_buttons.php index 98002f6d203..efc671a4f04 100644 --- a/mod/lesson/classes/output/edit_action_buttons.php +++ b/mod/lesson/classes/output/edit_action_buttons.php @@ -90,7 +90,7 @@ class edit_action_buttons implements templatable, renderable { if ($this->lesson->can_manage()) { $url = new moodle_url('/mod/lesson/edit.php', ['id' => $this->lesson->get_cm()->id]); - $editbutton = new single_button($url, get_string('editlesson', 'mod_lesson'), 'get', true); + $editbutton = new single_button($url, get_string('editlesson', 'mod_lesson'), 'get', single_button::BUTTON_PRIMARY); $url = new moodle_url('/mod/lesson/essay.php', ['id' => $this->lesson->get_cm()->id]); $essaybutton = new single_button($url, get_string('manualgrading', 'mod_lesson'), 'get'); $data += [ diff --git a/mod/quiz/classes/output/overrides_actions.php b/mod/quiz/classes/output/overrides_actions.php index 33ec37d7130..d182503df5a 100644 --- a/mod/quiz/classes/output/overrides_actions.php +++ b/mod/quiz/classes/output/overrides_actions.php @@ -77,7 +77,7 @@ class overrides_actions implements renderable, templatable { $label = get_string('addnewuseroverride', 'quiz'); } - $addoverridebutton = new \single_button($addoverrideurl, $label, 'get', true); + $addoverridebutton = new \single_button($addoverrideurl, $label, 'get', \single_button::BUTTON_PRIMARY); if (!$this->addenabled) { $addoverridebutton->disabled = true; } diff --git a/mod/quiz/classes/output/renderer.php b/mod/quiz/classes/output/renderer.php index d5a06c8187d..5f12b2a9800 100644 --- a/mod/quiz/classes/output/renderer.php +++ b/mod/quiz/classes/output/renderer.php @@ -823,7 +823,7 @@ class renderer extends plugin_renderer_base { } $this->page->requires->js_call_amd('mod_quiz/submission_confirmation', 'init', [$totalunanswered]); } - $button->primary = true; + $button->type = \single_button::BUTTON_PRIMARY; $duedate = $attemptobj->get_due_date(); $message = ''; @@ -935,7 +935,7 @@ class renderer extends plugin_renderer_base { preflight_check_form $preflightcheckform = null, $popuprequired = false, $popupoptions = null) { - $button = new single_button($url, $buttontext, 'post', true); + $button = new single_button($url, $buttontext, 'post', single_button::BUTTON_PRIMARY); $button->class .= ' quizstartbuttondiv'; if ($popuprequired) { $button->class .= ' quizsecuremoderequired'; diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php index bb9f230b6e0..33beda4731e 100644 --- a/mod/workshop/renderer.php +++ b/mod/workshop/renderer.php @@ -1225,7 +1225,7 @@ class mod_workshop_renderer extends plugin_renderer_base { if (!$workshop->get_submission_by_author($USER->id)) { $btnurl = new moodle_url($workshop->submission_url(), ['edit' => 'on']); $btntxt = get_string('createsubmission', 'workshop'); - $output .= $this->single_button($btnurl, $btntxt, 'get', ['primary' => true]); + $output .= $this->single_button($btnurl, $btntxt, 'get', ['type' => single_button::BUTTON_PRIMARY]); } } break; @@ -1236,7 +1236,7 @@ class mod_workshop_renderer extends plugin_renderer_base { if ($workshop->creating_submission_allowed($USER->id)) { $btnurl = new moodle_url($workshop->submission_url(), ['edit' => 'on']); $btntxt = get_string('createsubmission', 'workshop'); - $output .= $this->single_button($btnurl, $btntxt, 'get', ['primary' => true]); + $output .= $this->single_button($btnurl, $btntxt, 'get', ['type' => single_button::BUTTON_PRIMARY]); } } } diff --git a/mod/workshop/switchphase.php b/mod/workshop/switchphase.php index 2d0432c7411..74e36074ab3 100644 --- a/mod/workshop/switchphase.php +++ b/mod/workshop/switchphase.php @@ -65,7 +65,11 @@ $PAGE->set_secondary_active_tab("modulepage"); // echo $OUTPUT->header(); $continuebtn = new single_button( - new moodle_url($PAGE->url, array('confirm' => 1)), get_string('continue'), 'post', true); + new moodle_url($PAGE->url, array('confirm' => 1)), + get_string('continue'), + 'post', + single_button::BUTTON_PRIMARY +); $continuebtn->class .= ' mr-3'; echo $OUTPUT->confirm(get_string('switchphase' . $phase . 'info', 'workshop'), $continuebtn, $workshop->view_url()); diff --git a/report/infectedfiles/classes/table/infectedfiles_table.php b/report/infectedfiles/classes/table/infectedfiles_table.php index 79e5f7a1cd7..358e9d8c45f 100644 --- a/report/infectedfiles/classes/table/infectedfiles_table.php +++ b/report/infectedfiles/classes/table/infectedfiles_table.php @@ -243,7 +243,7 @@ class infectedfiles_table extends \table_sql implements \renderable { // Delete All. $deleteallparams = ['action' => 'deleteall', 'sesskey' => sesskey()]; $deleteallurl = new \moodle_url($managefilepage, $deleteallparams); - $deletebutton = new \single_button($deleteallurl, get_string('deleteall'), 'post', true); + $deletebutton = new \single_button($deleteallurl, get_string('deleteall'), 'post', \single_button::BUTTON_PRIMARY); $deletebutton->add_confirm_action(get_string('confirmdeleteall', 'report_infectedfiles')); echo $OUTPUT->render($deletebutton); @@ -252,7 +252,7 @@ class infectedfiles_table extends \table_sql implements \renderable { // Download All. $downloadallparams = ['action' => 'downloadall', 'sesskey' => sesskey()]; $downloadallurl = new \moodle_url($managefilepage, $downloadallparams); - $downloadbutton = new \single_button($downloadallurl, get_string('downloadall'), 'post', true); + $downloadbutton = new \single_button($downloadallurl, get_string('downloadall'), 'post', \single_button::BUTTON_PRIMARY); $downloadbutton->add_confirm_action(get_string('confirmdownloadall', 'report_infectedfiles')); echo $OUTPUT->render($downloadbutton); } diff --git a/repository/googledocs/lib.php b/repository/googledocs/lib.php index 3c2435877d3..da5f612424c 100644 --- a/repository/googledocs/lib.php +++ b/repository/googledocs/lib.php @@ -164,7 +164,12 @@ class repository_googledocs extends repository { $repositoryname = get_string('pluginname', 'repository_googledocs'); - $button = new single_button($url, get_string('logintoaccount', 'repository', $repositoryname), 'post', true); + $button = new single_button( + $url, + get_string('logintoaccount', 'repository', $repositoryname), + 'post', + single_button::BUTTON_PRIMARY + ); $button->add_action(new popup_action('click', $url, 'Login')); $button->class = 'mdl-align'; $button = $OUTPUT->render($button); diff --git a/repository/nextcloud/lib.php b/repository/nextcloud/lib.php index 5e4dce0418d..fcc59ac99cb 100644 --- a/repository/nextcloud/lib.php +++ b/repository/nextcloud/lib.php @@ -857,7 +857,7 @@ class repository_nextcloud extends repository { echo $OUTPUT->header(); $button = new single_button($url, get_string('logintoaccount', 'repository', $this->get_name()), - 'post', true); + 'post', single_button::BUTTON_PRIMARY); $button->add_action(new popup_action('click', $url, 'Login')); $button->class = 'mdl-align'; $button = $OUTPUT->render($button); diff --git a/repository/onedrive/lib.php b/repository/onedrive/lib.php index abe558add97..bdbc46b43b5 100644 --- a/repository/onedrive/lib.php +++ b/repository/onedrive/lib.php @@ -145,7 +145,12 @@ class repository_onedrive extends repository { $repositoryname = get_string('pluginname', 'repository_onedrive'); - $button = new single_button($url, get_string('logintoaccount', 'repository', $repositoryname), 'post', true); + $button = new single_button( + $url, + get_string('logintoaccount', 'repository', $repositoryname), + 'post', + single_button::BUTTON_PRIMARY + ); $button->add_action(new popup_action('click', $url, 'Login')); $button->class = 'mdl-align'; $button = $OUTPUT->render($button);