moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-66999-master' of git://github.com/bmbrands/moodle

Browse source
This commit is contained in:
Adrian Greeve 2019-12-23 14:26:39 +08:00
commit f00542c485
69 changed files with 1487 additions and 2168 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grade/grading/form/rubric/renderer.php
View file

@ -403,7 +403,7 @@ class gradingform_rubric_renderer extends plugin_renderer_base {
'value' => $value
);
$input = html_writer::empty_tag('input', $criteriainputparams);
$rubrictemplate .= html_writer::tag('div', $input, array('class' => 'addcriterion'));
$rubrictemplate .= html_writer::tag('div', $input, array('class' => 'addcriterion btn btn-secondary'));
}
$rubrictemplate .= $this->rubric_edit_options($mode, $options);
$rubrictemplate .= html_writer::end_tag('div');

2
grade/grading/renderer.php
View file

@ -66,7 +66,7 @@ class core_grading_renderer extends plugin_renderer_base {
$img = $this->output->pix_icon($icon, '');
$txt = html_writer::tag('div', $text, array('class' => 'action-text'));
return html_writer::link($url, $img . $txt, array('class' => 'action'));
return html_writer::link($url, $img . $txt, array('class' => 'action btn btn-lg'));
}
/**

2
grade/grading/tests/behat/behat_grading.php
View file

@ -66,7 +66,7 @@ class behat_grading extends behat_base {
$editactionliteral = behat_context_helper::escape(get_string("manageactionedit", "grading"));
// Working both when adding and editing.
$definitionxpath = "//a[@class='action']" .
$definitionxpath = "//a[@class='action btn btn-lg']" .
"[./descendant::*[contains(., $newactionliteral) or contains(., $editactionliteral)]]";
$this->execute('behat_grading::i_go_to_advanced_grading_page', $this->escape($activityname));