mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

MDL-46481 backup: removed collapsing and better lang string

Browse Source 
Thanks Rex for the peer-review!
This commit is contained in:
Sam Hemelryk 2014-08-01 17:28:55 +12:00
parent bae30ef320
commit 3973b67f61
6 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backup/util/ui/backup_moodleform.class.php
View File

@ -69,8 +69,6 @@ class backup_initial_form extends backup_moodleform {
$mform->addElement('submit', 'oneclickbackup', get_string('performoneclickbackup', 'backup'));
parent::definition();
$mform->setDisableShortforms(false);
}
}
/**

1
backup/util/ui/backup_ui_stage.class.php
View File

@ -175,7 +175,6 @@ class backup_ui_stage_initial extends backup_ui_stage {
// For the initial stage we are only interested in the root settings
if ($task instanceof backup_root_task) {
$form->add_heading('rootsettings', get_string('rootsettings', 'backup'));
$form->collapse_heading('rootsettings');
$settings = $task->get_settings();
// First add all settings except the filename setting
foreach ($settings as &$setting) {

9
backup/util/ui/base_moodleform.class.php
View File

@ -369,13 +369,4 @@ abstract class base_moodleform extends moodleform {
$this->definition_after_data();
}
}
/**
* Can be used to collapse a heading from outside of this form.
*
* @param string $heading
*/
public function collapse_heading($heading) {
$this->_form->setExpanded($heading, false);
}
}

4
backup/util/ui/tests/behat/backup_courses.feature
View File

@ -64,4 +64,6 @@ Feature: Backup Moodle courses
@javascript
Scenario: Backup a course using the one click backup button
When I perform a quick backup of course "Course 2"
Then I should see "Restore"
Then I should see "Restore course"
And I should see "Course backup area"
And I should see "backup-moodle2-course-"

3
backup/util/ui/tests/behat/behat_backup.php
View File

@ -77,9 +77,6 @@ class behat_backup extends behat_base {
$this->navigate_to_course_settings_link('backup');
$this->wait();
// Expand the backup settings section.
$this->find_link(get_string('backupsettings', 'backup'))->click();
// Initial settings.
$this->fill_backup_restore_form($this->get_step_options($options, "Initial"));
$this->find_button(get_string('backupstage1action', 'backup'))->press();

2
lang/en/backup.php
View File

@ -178,7 +178,7 @@ $string['nomatchingcourses'] = 'There are no courses to display';
$string['norestoreoptions'] = 'There are no categories or existing courses you can restore to.';
$string['originalwwwroot'] = 'URL of backup';
$string['performoneclickbackup'] = 'Perform quick backup';
$string['performoneclickbackup_desc'] = 'Clicking this will create a backup using the current settings. If you wish to proceed through each stage of the backup individually use the controls at the bottom of the form.';
$string['performoneclickbackup_desc'] = 'Performing a quick backup will create a backup using the currently selected settings below. If you wish to further make choices regarding what sections or activities that you want to include in your backup, please process onto the "Next" step.';
$string['previousstage'] = 'Previous';
$string['preparingui'] = 'Preparing to display page';
$string['preparingdata'] = 'Preparing data';