mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-mdl-55074-fix' of https://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
David Monllao 2016-10-26 10:31:09 +08:00
commit ee61e3ef83
10 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blocks/badges/tests/behat/block_badges_course.feature
View File

@ -17,7 +17,7 @@ Feature: Enable Block Badges in a course
And I log in as "teacher1"
And I follow "Course 1"
# Issue badge 1 of 2
And I navigate to "Add a new badge" node in "Badges"
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I set the following fields to these values:
| id_name | Badge 1 |
| id_description | Badge 1 |
@ -34,7 +34,7 @@ Feature: Enable Block Badges in a course
And I set the field "potentialrecipients[]" to "Teacher 1 (teacher1@example.com)"
And I press "Award badge"
# Issue Badge 2 of 2
And I navigate to "Add a new badge" node in "Badges"
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I set the following fields to these values:
| id_name | Badge 2 |
| id_description | Badge 2 |

2
blocks/badges/tests/behat/block_badges_dashboard.feature
View File

@ -17,7 +17,7 @@ Feature: Enable Block Badges on the dashboard and view awarded badges
And I log in as "teacher1"
And I follow "Course 1"
# Issue badge 1 of 2
And I navigate to "Add a new badge" node in "Badges"
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I set the following fields to these values:
| id_name | Badge 1 |
| id_description | Badge 1 |

2
blocks/badges/tests/behat/block_badges_frontpage.feature
View File

@ -22,7 +22,7 @@ Feature: Enable Block Badges on the frontpage and view awarded badges
And I log in as "teacher1"
And I follow "Course 1"
# Issue badge 1 of 2
And I navigate to "Add a new badge" node in "Badges"
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I set the following fields to these values:
| id_name | Badge 1 |
| id_description | Badge 1 |

6
blocks/completionstatus/tests/behat/block_completionstatus_manual_other.feature
View File

@ -37,7 +37,7 @@ Feature: Enable Block Completion in a course using manual completion by others
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I navigate to "Course completion" node in "Reports"
And I navigate to "Course completion" node in "Course administration > Reports"
And I follow "Click to mark user complete"
# Running completion task just after clicking sometimes fail, as record
# should be created before the task runs.
@ -74,7 +74,7 @@ Feature: Enable Block Completion in a course using manual completion by others
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I navigate to "Course completion" node in "Reports"
And I navigate to "Course completion" node in "Course administration > Reports"
And I follow "Click to mark user complete"
And I log out
And I log in as "student1"
@ -88,7 +88,7 @@ Feature: Enable Block Completion in a course using manual completion by others
And I log out
And I log in as "teacher2"
And I follow "Course 1"
And I navigate to "Course completion" node in "Reports"
And I navigate to "Course completion" node in "Course administration > Reports"
And I follow "Click to mark user complete"
# Running completion task just after clicking sometimes fail, as record
# should be created before the task runs.

2
blocks/course_overview/tests/behat/block_course_overview.feature
View File

@ -153,7 +153,7 @@ Feature: View the course overview block on the dashboard and test it's functiona
And I click on "Enable" "link" in the "Course meta link" "table_row"
And I am on site homepage
And I follow "Course 2"
And I navigate to "Enrolment methods" node in "Users"
And I navigate to "Enrolment methods" node in "Course administration > Users"
And I add "Course meta link" enrolment method with:
| Link course | C1 |
And I log out

5
grade/grading/form/rubric/tests/behat/behat_gradingform_rubric.php
View File

@ -309,9 +309,10 @@ class behat_gradingform_rubric extends behat_base {
$levelnode = $this->find('xpath', $selectedlevelxpath);
// Using in_array() as there are only a few elements.
if (!in_array('checked', explode(' ', $levelnode->getAttribute('class')))) {
if (!$levelnode->hasClass('checked')) {
$levelnodexpath = $selectedlevelxpath . "//div[contains(concat(' ', normalize-space(@class), ' '), ' score ')]";
$this->execute('behat_general::i_click_on_in_the',
array($selectedlevelxpath, "xpath_element", $this->escape($name), "table_row")
array($levelnodexpath, "xpath_element", $this->escape($name), "table_row")
);
}

2
mod/assign/amd/build/grading_panel.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
mod/assign/amd/src/grading_panel.js
View File

@ -218,7 +218,7 @@ define(['jquery', 'core/notification', 'core/templates', 'core/fragment',
templates.render('mod_assign/popout_button', {}).done(function(html) {
var parents = region.find('[data-fieldtype="filemanager"],[data-fieldtype="editor"],[data-fieldtype="grading"]')
.closest('.fitem');
parents.addClass('has-popout').find('.fitemtitle label').parent().append(html);
parents.addClass('has-popout').find('label').parent().append(html);
region.on('click', '[data-region="popout-button"]', this._togglePopout.bind(this));
}.bind(this)).fail(notification.exception);

4
mod/lesson/tests/behat/lesson_course_reset.feature
View File

@ -58,7 +58,7 @@ Feature: Lesson reset
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Test lesson name"
And I navigate to "Overview" node in "Reports"
And I navigate to "Overview" node in "Lesson administration > Reports"
And I should see "Sam1 Student1"
And I navigate to "Reset" node in "Course administration"
And I set the following fields to these values:
@ -67,7 +67,7 @@ Feature: Lesson reset
And I press "Continue"
And I follow "Course 1"
And I follow "Test lesson name"
And I navigate to "Overview" node in "Reports"
And I navigate to "Overview" node in "Lesson administration > Reports"
Then I should see "No attempts have been made on this lesson"
Scenario: Use course reset to remove user overrides.

6
theme/boost/scss/moodle/core.scss
View File

@ -1233,6 +1233,12 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
border: 1px solid #ccc;
}
// Show is a bootstrap 2 class - but we use it for modals. We don't want to enable it everywhere because they removed
// it for a reason (conflicts with jquery .show()).
.modal.show {
display: block;
}
.moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content {
@extend .modal-content;
}