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

Merge branch 'MDL-56511-master' of git://github.com/andrewnicols/moodle

Browse source
This commit is contained in:
Andrew Nicols 2018-04-18 09:35:29 +08:00
commit 6979cf56e2
238 changed files with 7613 additions and 6572 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backup/util/ui/base_moodleform.class.php
View file

@ -127,12 +127,6 @@ abstract class base_moodleform extends moodleform {
*/
public function definition_after_data() {
$buttonarray = array();
$buttonarray[] = $this->_form->createElement(
'submit',
'submitbutton',
get_string($this->uistage->get_ui()->get_name().'stage'.$this->uistage->get_stage().'action', 'backup'),
array('class' => 'proceedbutton')
);
if (!$this->uistage->is_first_stage()) {
$buttonarray[] = $this->_form->createElement('submit', 'previous', get_string('previousstage', 'backup'));
} else if ($this->uistage instanceof backup_ui_stage) {
@ -141,6 +135,12 @@ abstract class base_moodleform extends moodleform {
array('class' => 'oneclickbackup'));
}
$buttonarray[] = $this->_form->createElement('cancel', 'cancel', get_string('cancel'), array('class' => 'confirmcancel'));
$buttonarray[] = $this->_form->createElement(
'submit',
'submitbutton',
get_string($this->uistage->get_ui()->get_name().'stage'.$this->uistage->get_stage().'action', 'backup'),
array('class' => 'proceedbutton')
);
$this->_form->addGroup($buttonarray, 'buttonar', '', array(' '), false);
$this->_form->closeHeaderBefore('buttonar');

4
backup/util/ui/renderer.php
View file

@ -395,7 +395,7 @@ class core_backup_renderer extends plugin_renderer_base {
$count ++;
$html = html_writer::start_tag('div', array('class' => 'detail-pair'));
$html .= html_writer::tag('label', $label, array('class' => 'detail-pair-label', 'for' => 'detail-pair-value-'.$count));
$html .= html_writer::tag('div', $value, array('class' => 'detail-pair-value', 'name' => 'detail-pair-value-'.$count));
$html .= html_writer::tag('div', $value, array('class' => 'detail-pair-value pl-2', 'name' => 'detail-pair-value-'.$count));
$html .= html_writer::end_tag('div');
return $html;
}
@ -792,7 +792,7 @@ class core_backup_renderer extends plugin_renderer_base {
$url = $component->get_url();
$output = html_writer::start_tag('div', array('class' => 'restore-course-search form-inline m-b-1'));
$output .= html_writer::start_tag('div', array('class' => 'rcs-results'));
$output .= html_writer::start_tag('div', array('class' => 'rcs-results w-100'));
$table = new html_table();
$table->head = array('', get_string('name'), get_string('description'));