L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-49983-master' of git://github.com/xow/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2015-05-04 12:39:48 +08:00
parent 23c4c76ff9 4887d15228
commit 6e9abef568
100 changed files with 307 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/settings/appearance.php
+2 -2
View File
@@ -27,9 +27,9 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
'customusermenuitems',
new lang_string('customusermenuitems', 'admin'),
new lang_string('configcustomusermenuitems', 'admin'),
'mygrades,grades|/grade/report/mygrades.php|grades
'grades,grades|/grade/report/mygrades.php|grades
messages,message|/message/index.php|message
mypreferences,moodle|/user/preferences.php|preferences',
preferences,moodle|/user/preferences.php|preferences',
PARAM_TEXT,
'50',
'10'
admin/tool/behat/tests/behat/data_generators.feature
+3 -3
View File
@@ -349,7 +349,7 @@ Feature: Set up contextual data for tests
When I log in as "admin"
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I expand "Setup" node
And I follow "Categories and items"
Then I should see "Test Grade Item 1"
@@ -380,7 +380,7 @@ Feature: Set up contextual data for tests
When I log in as "admin"
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I follow "Scales"
Then I should see "Test Scale 1"
And I should see "Disappointing, Good, Very good, Excellent"
@@ -432,7 +432,7 @@ Feature: Set up contextual data for tests
When I log in as "admin"
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I expand "Setup" node
And I follow "Categories and items"
Then I should see "Test Outcome Grade Item 1"
admin/tool/behat/tests/behat/manipulate_forms.feature
+1 -1
View File
@@ -7,7 +7,7 @@ Feature: Forms manipulation
@javascript
Scenario: Basic forms manipulation
Given I log in as "admin"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Edit profile"
When I set the field "First name" to "Field value"
And I set the field "Select a country" to "Japan"
admin/tool/behat/tests/behat/nasty_strings.feature
+1 -1
View File
@@ -10,7 +10,7 @@ Feature: Transform steps arguments
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And I log in as "admin"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Edit profile"
@javascript
admin/tool/monitor/tests/behat/subscription.feature
+13 -13
View File
@@ -55,7 +55,7 @@ Feature: tool_monitor_subscriptions
Scenario: Subscribe to a rule on course level
Given I log in as "teacher1"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Course 1"
When I follow "Subscribe to rule \"New rule course level\""
@@ -64,7 +64,7 @@ Feature: tool_monitor_subscriptions
Scenario: Delete a subscription on course level
Given I log in as "teacher1"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Course 1"
And I follow "Subscribe to rule \"New rule course level\""
@@ -77,7 +77,7 @@ Feature: tool_monitor_subscriptions
Scenario: Subscribe to a rule on site level
Given I log in as "admin"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Acceptance test site"
When I follow "Subscribe to rule \"New rule site level\""
@@ -86,7 +86,7 @@ Feature: tool_monitor_subscriptions
Scenario: Delete a subscription on site level
Given I log in as "admin"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Acceptance test site"
And I follow "Subscribe to rule \"New rule site level\""
@@ -100,11 +100,11 @@ Feature: tool_monitor_subscriptions
Scenario: Receiving notification on site level
Given I log in as "admin"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Messaging"
And I click on "input[name^=tool_monitor_notification_loggedin]" "css_element"
And I press "Save changes"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Acceptance test site"
And I follow "Subscribe to rule \"New rule site level\""
@@ -119,11 +119,11 @@ Feature: tool_monitor_subscriptions
Scenario: Receiving notification on course level
Given I log in as "teacher1"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Messaging"
And I click on "input[name^=tool_monitor_notification_loggedin]" "css_element"
And I press "Save changes"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Course 1"
And I follow "Subscribe to rule \"New rule course level\""
@@ -139,7 +139,7 @@ Feature: tool_monitor_subscriptions
Scenario: Navigating via quick link to rules
Given I log in as "admin"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
When I follow "Event monitoring"
And I set the field "Select a course" to "Course 1"
Then I should see "You can manage rules from the Event monitoring rules page."
@@ -147,7 +147,7 @@ Feature: tool_monitor_subscriptions
And I should see "You can subscribe to rules from the Event monitoring page."
And I log out
And I log in as "teacher1"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Course 1"
And I should see "You can manage rules from the Event monitoring rules page."
@@ -159,7 +159,7 @@ Feature: tool_monitor_subscriptions
And I should not see "You can manage rules from the Event monitoring rules page."
And I log out
And I log in as "teacher2"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Course 1"
And I should not see "You can manage rules the from the Event monitoring rules page."
@@ -170,7 +170,7 @@ Feature: tool_monitor_subscriptions
| tool/monitor:managerules | Prohibit |
And I log out
And I log in as "teacher1"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
When I set the field "Select a course" to "Course 1"
Then I should see "You can manage rules from the Event monitoring rules page."
@@ -178,7 +178,7 @@ Feature: tool_monitor_subscriptions
And I should not see "You can manage rules from the Event monitoring rules page."
And I log out
And I log in as "teacher2"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Event monitoring"
And I set the field "Select a course" to "Course 1"
And I should not see "You can manage rules from the Event monitoring rules page."
badges/mybackpack.php
+1 -1
View File
@@ -47,7 +47,7 @@ if (empty($CFG->badges_allowexternalbackpack)) {
$PAGE->set_url(new moodle_url('/badges/mybackpack.php'));
$PAGE->set_context($context);
$title = get_string('mybackpack', 'badges');
$title = get_string('backpackdetails', 'badges');
$PAGE->set_title($title);
$PAGE->set_heading(fullname($USER));
$PAGE->set_pagelayout('mydashboard');
badges/mybadges.php
+1 -1
View File
@@ -86,7 +86,7 @@ require_capability('moodle/badges:manageownbadges', $context);
$PAGE->set_context($context);
$title = get_string('mybadges', 'badges');
$title = get_string('badges', 'badges');
$PAGE->set_title($title);
$PAGE->set_heading(fullname($USER));
$PAGE->set_pagelayout('mydashboard');
badges/newbadge.php
+1 -1
View File
@@ -91,7 +91,7 @@ if ($form->is_cancelled()) {
$fordb->courseid = ($type == BADGE_TYPE_COURSE) ? $courseid : null;
$fordb->messagesubject = get_string('messagesubject', 'badges');
$fordb->message = get_string('messagebody', 'badges',
html_writer::link($CFG->wwwroot . '/badges/mybadges.php', get_string('mybadges', 'badges')));
html_writer::link($CFG->wwwroot . '/badges/mybadges.php', get_string('managebadges', 'badges')));
$fordb->attachment = 1;
$fordb->notification = BADGE_MESSAGE_NEVER;
$fordb->status = BADGE_STATUS_INACTIVE;
badges/tests/behat/award_badge.feature
+8 -8
View File
@@ -31,12 +31,12 @@ Feature: Award badges
And I press "Enable access"
And I press "Continue"
And I click on "Admin User" "link"
And I follow "My profile" in the open menu
And I follow "Profile" in the open menu
And I follow "Edit profile"
And I expand all fieldsets
And I set the field "Phone" to "123456789"
And I press "Update profile"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
Then I should see "Profile Badge"
And I should not see "There are no badges available."
@@ -69,7 +69,7 @@ Feature: Award badges
Then I should see "Recipients (2)"
And I log out
And I log in as "student"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
Then I should see "Site Badge"
@javascript
@@ -112,7 +112,7 @@ Feature: Award badges
Then I should see "Recipients (2)"
And I log out
And I log in as "student1"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Course 1"
And I should see "Course Badge"
@@ -157,13 +157,13 @@ Feature: Award badges
When I press "Continue"
And I log out
And I log in as "student1"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Course 1"
Then I should not see "badges"
And I am on homepage
And I follow "Course 1"
And I press "Mark as complete: Test assignment name"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Course 1"
Then I should see "Course Badge"
@@ -214,7 +214,7 @@ Feature: Award badges
When I press "Continue"
And I log out
And I log in as "student1"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Course 1"
Then I should not see "badges"
And I am on homepage
@@ -232,5 +232,5 @@ Feature: Award badges
And I am on site homepage
And I log out
And I log in as "student1"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
Then I should see "Course Badge"
blocks/activity_results/tests/behat/addblockinactivity.feature
+1 -1
View File
@@ -32,7 +32,7 @@ Feature: The activity results block displays student scores
| Description | Offline text |
| assignsubmission_file_enabled | 0 |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment"
blocks/activity_results/tests/behat/highscoreswithoutgroups.feature
+1 -1
View File
@@ -32,7 +32,7 @@ Feature: The activity results block displays student scores
| Description | Offline text |
| assignsubmission_file_enabled | 0 |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment"
blocks/activity_results/tests/behat/highscoreswithseperategroups.feature
+8 -8
View File
@@ -54,7 +54,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -97,7 +97,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -144,7 +144,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -191,7 +191,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -245,7 +245,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -298,7 +298,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -351,7 +351,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -402,7 +402,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature
+8 -8
View File
@@ -54,7 +54,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -97,7 +97,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -142,7 +142,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -187,7 +187,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -237,7 +237,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -286,7 +286,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -335,7 +335,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -382,7 +382,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature
+1 -1
View File
@@ -32,7 +32,7 @@ Feature: The activity results block displays student scores
| Description | Offline text |
| assignsubmission_file_enabled | 0 |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment"
blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature
+8 -8
View File
@@ -54,7 +54,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -97,7 +97,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -144,7 +144,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -191,7 +191,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -243,7 +243,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -294,7 +294,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -345,7 +345,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -395,7 +395,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Separate groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature
+8 -8
View File
@@ -54,7 +54,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -97,7 +97,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -142,7 +142,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -187,7 +187,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -239,7 +239,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -286,7 +286,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -333,7 +333,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
@@ -379,7 +379,7 @@ Feature: The activity results block displays student scores
| assignsubmission_file_enabled | 0 |
| Group mode | Visible groups |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment"
And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment"
blocks/badges/db/access.php
+1 -1
View File
@@ -15,7 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* My latest badges block capabilities.
* Latest badges block capabilities.
*
* @package block_badges
* @copyright 2012 onwards Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
blocks/badges/lang/en/block_badges.php
+1 -1
View File
@@ -23,7 +23,7 @@
* @author Yuliya Bozhko <[email protected]>
*/
$string['pluginname'] = 'My latest badges';
$string['pluginname'] = 'Latest badges';
$string['numbadgestodisplay'] = 'Number of latest badges to display';
$string['nothingtodisplay'] = 'You have no badges to display';
$string['badges:addinstance'] = 'Add a new My latest badges block';
blocks/private_files/block_private_files.php
+1 -1
View File
@@ -63,7 +63,7 @@ class block_private_files extends block_base {
if (has_capability('moodle/user:manageownfiles', $this->context)) {
$this->content->footer = html_writer::link(
new moodle_url('/user/files.php', array('returnurl' => $PAGE->url->out())),
get_string('myfilesmanage') . '...');
get_string('privatefilesmanage') . '...');
}
}
blocks/private_files/lang/en/block_private_files.php
+2 -2
View File
@@ -22,8 +22,8 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'My private files';
$string['pluginname'] = 'Private files';
$string['privatefiles'] = 'Private files';
$string['private_files:addinstance'] = 'Add a new private files block';
$string['private_files:myaddinstance'] = 'Add a new my private files block to Dashboard';
$string['private_files:myaddinstance'] = 'Add a new private files block to Dashboard';
blog/lib.php
+2 -2
View File
@@ -420,7 +420,7 @@ function blog_get_options_for_user(stdClass $user=null) {
if ($canview) {
// We can view our own blogs .... BIG surprise.
$options['view'] = array(
'string' => get_string('viewallmyentries', 'blog'),
'string' => get_string('blogentries', 'blog'),
'link' => new moodle_url('/blog/index.php', array('userid'=>$USER->id))
);
}
@@ -1036,7 +1036,7 @@ function core_blog_myprofile_navigation(core_user\output\myprofile\tree $tree, $
$url->param('courseid', $course->id);
}
if ($iscurrentuser) {
$title = get_string('myprofilemyblogs', 'core_blog');
$title = get_string('blogentries', 'core_blog');
} else {
$title = get_string('myprofileuserblogs', 'core_blog');
}
course/tests/behat/navigate_course_list.feature
+1 -1
View File
@@ -34,7 +34,7 @@ Feature: Browse course list and return back from enrolment page
@javascript
Scenario: A user can return to the previous page from enrolment page by clicking navigation links
When I log in as "user2"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Edit profile"
And I expand "Courses" node
And I expand "Sample category" node
course/user.php
+2 -2
View File
@@ -134,9 +134,9 @@ switch ($mode) {
require_once($CFG->dirroot . '/user/lib.php');
// Make the dashboard active so that it shows up in the navbar correctly.
$gradenode = $PAGE->settingsnav->find('dashboard', null)->make_active();
// Get the correct 'My grades' url to point to.
// Get the correct 'Grades' url to point to.
$activeurl = user_mygrades_url();
$navbar = $PAGE->navbar->add(get_string('mygrades', 'grades'), $activeurl, navigation_node::TYPE_SETTING);
$navbar = $PAGE->navbar->add(get_string('grades', 'grades'), $activeurl, navigation_node::TYPE_SETTING);
$activenode = $navbar->add($course->shortname);
$activenode->make_active();
// Find the course node and collapse it.
grade/export/txt/tests/behat/export.feature
+1 -1
View File
@@ -21,7 +21,7 @@ Feature: I need to export grades as text
| assign | C1 | a1 | Test assignment name | Submit your online text | 1 |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "80.00" to the user "Student 1" for the grade item "Test assignment name"
And I press "Save changes"
grade/export/xml/tests/behat/export.feature
+1 -1
View File
@@ -21,7 +21,7 @@ Feature: I need to export grades as xml
| assign | C1 | a1 | Test assignment name | Submit something! |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "80.00" to the user "Student 1" for the grade item "Test assignment name"
And I press "Save changes"
grade/lib.php
+1 -2
View File
@@ -2637,7 +2637,6 @@ abstract class grade_helper {
* letter => get_string('letters', 'grades'),
* export => get_string('export', 'grades'),
* import => get_string('import'),
* preferences => get_string('mypreferences', 'grades'),
* settings => get_string('settings')
*
* @return array
@@ -2741,7 +2740,7 @@ abstract class grade_helper {
if (file_exists($plugindir.'/preferences.php')) {
$url = new moodle_url('/grade/report/'.$plugin.'/preferences.php', array('id'=>$courseid));
$gradepreferences[$plugin] = new grade_plugin_info($plugin, $url,
get_string('mypreferences', 'grades') . ': ' . $pluginstr);
get_string('preferences', 'grades') . ': ' . $pluginstr);
}
}
if (count($gradereports) == 0) {
grade/report/history/tests/behat/basic_functionality.feature
+2 -2
View File
@@ -30,7 +30,7 @@ Feature: A teacher checks the grade history report in a course
And I add a "Assignment" to section "1" and I fill the form with:
| Assignment name | Rewarding assignment |
| Description | After writing your behat test go grab a beer! |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "50.00" to the user "Student 1" for the grade item "The greatest assignment ever"
And I give the grade "60.00" to the user "Student 1" for the grade item "Rewarding assignment"
@@ -40,7 +40,7 @@ Feature: A teacher checks the grade history report in a course
And I log out
And I log in as "teacher2"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "70.00" to the user "Student 1" for the grade item "The greatest assignment ever"
And I give the grade "80.00" to the user "Student 1" for the grade item "Rewarding assignment"
grade/report/lib.php
+1 -1
View File
@@ -354,7 +354,7 @@ abstract class grade_report {
}
/**
* Shows support for being used as a 'My grades' report.
* Shows support for being used as a 'Grades' report.
*/
public static function supports_mygrades() {
return false;
grade/report/overview/index.php
+2 -2
View File
@@ -169,7 +169,7 @@ if (has_capability('moodle/grade:viewall', $context) && $courseid != SITEID) {
// Display a standard page.
if ($courseid == SITEID) {
$PAGE->set_pagelayout('standard');
$header = get_string('mygrades', 'grades') . ' - ' . fullname($report->user);
$header = get_string('grades', 'grades') . ' - ' . fullname($report->user);
$PAGE->set_title($header);
$PAGE->set_heading(fullname($report->user));
@@ -196,7 +196,7 @@ if (has_capability('moodle/grade:viewall', $context) && $courseid != SITEID) {
}
} else {
$PAGE->set_pagelayout('standard');
$header = get_string('mygrades', 'grades') . ' - ' . fullname($report->user);
$header = get_string('grades', 'grades') . ' - ' . fullname($report->user);
$PAGE->set_title($header);
$PAGE->set_heading(fullname($report->user));
echo $OUTPUT->header();
grade/report/overview/lib.php
+1 -1
View File
@@ -320,7 +320,7 @@ class grade_report_overview extends grade_report {
}
/**
* This report supports being set as the 'my grades' report.
* This report supports being set as the 'grades' report.
*/
public static function supports_mygrades() {
return true;
grade/report/singleview/tests/behat/singleview.feature
+1 -1
View File
@@ -46,7 +46,7 @@ Feature: We can use Single view
| Test grade item | C1 | Scale |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
@javascript
Scenario: I can update grades, add feedback and exclude grades.
grade/tests/behat/grade_UI_settings.feature
+4 -4
View File
@@ -20,7 +20,7 @@ Feature: Site settings can be used to hide parts of the gradebook UI
And I log in as "admin"
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
@javascript
@@ -32,7 +32,7 @@ Feature: Site settings can be used to hide parts of the gradebook UI
And I press "Save changes"
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I click on "Edit assign Assignment1" "link"
And I should not see "Minimum grade"
@@ -44,7 +44,7 @@ Feature: Site settings can be used to hide parts of the gradebook UI
And I press "Save changes"
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
Then "Edit calculation for Course total" "link" should not exist
@javascript
@@ -55,5 +55,5 @@ Feature: Site settings can be used to hide parts of the gradebook UI
And I press "Save changes"
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And "tr .course input[type='text']" "css_element" should not exist
grade/tests/behat/grade_aggregation.feature
+19 -20
View File
@@ -42,7 +42,7 @@ Feature: We can use calculated grade totals
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "60.00" to the user "Student 1" for the grade item "Test assignment one"
And I give the grade "20.00" to the user "Student 1" for the grade item "Test assignment two"
@@ -78,7 +78,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "30.42 (30.42 %)" in the "overview-grade" "table"
@javascript
@@ -101,7 +101,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "26.94 (26.94 %)" in the "overview-grade" "table"
@javascript
@@ -122,7 +122,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "48.57 (48.57 %)" in the "overview-grade" "table"
@javascript
@@ -143,7 +143,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "47.22 (47.22 %)" in the "overview-grade" "table"
@javascript
@@ -162,7 +162,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "25.83 (25.83 %)" in the "overview-grade" "table"
@javascript
@@ -185,7 +185,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "0.00 (0.00 %)" in the "overview-grade" "table"
@javascript
@@ -206,7 +206,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "50.00 (50.00 %)" in the "overview-grade" "table"
@javascript
@@ -227,7 +227,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "50.00 (50.00 %)" in the "overview-grade" "table"
@javascript
@@ -243,7 +243,6 @@ Feature: We can use calculated grade totals
And the following "grade items" exist:
| itemname | course | outcome | gradetype | scale |
| Test outcome item one | C1 | OT1 | Scale | Test Scale |
Then I follow "Grades"
And I expand "Setup" node
And I follow "Categories and items"
And I set the following settings for grade item "Course 1":
@@ -259,28 +258,28 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
Then I should see "114.82 (18.27 %)" in the "overview-grade" "table"
And I follow "Course 1"
And "Test outcome item one" row "Grade" column of "user-grade" table should contain "Excellent (100.00 %)"
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I expand "Setup" node
And I follow "Categories and items"
And I set the following settings for grade item "Test outcome item one":
| Extra credit | 1 |
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
Then I should see "114.00 (18.39 %)" in the "overview-grade" "table"
And I follow "Course 1"
And "Test outcome item one" row "Grade" column of "user-grade" table should contain "Excellent (100.00 %)"
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I expand "Setup" node
And I follow "Categories and items"
And I set the following settings for grade item "Course 1":
@@ -288,7 +287,7 @@ Feature: We can use calculated grade totals
| Include outcomes in aggregation | 0 |
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
Then I should see "110.00 (17.74 %)" in the "overview-grade" "table"
And I follow "Course 1"
And "Test outcome item one" row "Grade" column of "user-grade" table should contain "Excellent (100.00 %)"
@@ -306,7 +305,7 @@ Feature: We can use calculated grade totals
And the following "grade items" exist:
| itemname | course | outcome | gradetype | scale |
| Test outcome item one | C1 | OT1 | Scale | Test Scale |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I expand "Setup" node
And I follow "Categories and items"
And I set the following settings for grade item "Course 1":
@@ -325,7 +324,7 @@ Feature: We can use calculated grade totals
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
Then I should see "4.00 (100.00 %)" in the "overview-grade" "table"
And I follow "Course 1"
And "Test outcome item one" row "Grade" column of "user-grade" table should contain "Excellent (100.00 %)"
@@ -370,7 +369,7 @@ Feature: We can use calculated grade totals
| Test assignment four | 24.00 % | - | 0–150 | 0.00 % |
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "113.75 (23.45 %)" in the "overview-grade" "table"
And I follow "Course 1"
And the following should exist in the "user-grade" table:
@@ -389,7 +388,7 @@ Feature: We can use calculated grade totals
And I log in as "admin"
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I set the following settings for grade item "Sub category 1":
| Aggregation | Natural |
@@ -559,7 +558,7 @@ Feature: We can use calculated grade totals
| Test assignment four | 33.71 % | - | 0.00 |
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I should see "45.00 (13.85 %)" in the "overview-grade" "table"
And I follow "Course 1"
And the following should exist in the "user-grade" table:
grade/tests/behat/grade_calculated_weights.feature
+1 -1
View File
@@ -30,7 +30,7 @@ Feature: We can understand the gradebook user report
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "60.00" to the user "Student 1" for the grade item "Test assignment one"
And I give the grade "20.00" to the user "Student 1" for the grade item "Test assignment two"
grade/tests/behat/grade_contribution_with_extra_credit.feature
+2 -2
View File
@@ -21,7 +21,7 @@ Feature: Extra credit contributions are normalised when going out of bounds
| grade_aggregations_visible | Simple weighted mean of grades,Mean of grades (with extra credits),Natural |
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I navigate to "Categories and items" node in "Grade administration > Setup"
And I press "Add grade item"
And I set the following fields to these values:
@@ -47,7 +47,7 @@ Feature: Extra credit contributions are normalised when going out of bounds
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "80.00" to the user "Student 1" for the grade item "Manual item 1"
And I give the grade "10.00" to the user "Student 1" for the grade item "Manual item 2"
grade/tests/behat/grade_mingrade.feature
+2 -2
View File
@@ -27,7 +27,7 @@ Feature: We can use a minimum grade different than zero
| grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural |
And I am on site homepage
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I navigate to "Categories and items" node in "Grade administration > Setup"
And I press "Add grade item"
And I set the following fields to these values:
@@ -86,7 +86,7 @@ Feature: We can use a minimum grade different than zero
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
When I give the grade "-25.00" to the user "Student 1" for the grade item "Manual item 1"
And I give the grade "50.00" to the user "Student 1" for the grade item "Manual item 2"
grade/tests/behat/grade_natural_normalisation.feature
+1 -1
View File
@@ -32,7 +32,7 @@ Feature: We can use natural aggregation and weights will be normalised to a tota
| assign | C1 | a7 | Test assignment seven | Submit nothing! | Sub category 1 | 15 |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I set the field "Grade report" to "Categories and items"
@javascript
grade/tests/behat/grade_override_letter.feature
+1 -1
View File
@@ -16,7 +16,7 @@ Feature: Grade letters can be overridden
| teacher1 | C1 | editingteacher |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I follow "Letters"
And I follow "Edit grade letters"
grade/tests/behat/grade_scales.feature
+3 -3
View File
@@ -62,7 +62,7 @@ Feature: View gradebook when scales are used
And I set the field "Grade" to "F"
And I press "Save changes"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I navigate to "Course grade settings" node in "Grade administration > Setup"
And I set the field "Show weightings" to "Show"
And I set the field "Show contribution to course total" to "Show"
@@ -100,7 +100,7 @@ Feature: View gradebook when scales are used
| Course total | 5.00 |
And I log out
And I log in as "student2"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And the following should exist in the "user-grade" table:
| Grade item | Grade | Range | Percentage | Contribution to course total |
@@ -148,7 +148,7 @@ Feature: View gradebook when scales are used
| Course total<aggregation>. | |
And I log out
And I log in as "student2"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And the following should exist in the "user-grade" table:
| Grade item | Grade | Range | Percentage | Contribution to course total |
grade/tests/behat/grade_scales_aggregation.feature
+4 -4
View File
@@ -40,7 +40,7 @@ Feature: Control the aggregation of the scales
Scenario Outline: Scales can be exluded from aggregation
Given I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
When I give the grade "10" to the user "Student 1" for the grade item "Grade me"
And I give the grade "B" to the user "Student 1" for the grade item "Scale me"
@@ -61,7 +61,7 @@ Feature: Control the aggregation of the scales
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I follow "User report"
And I set the field "Select all or one user" to "Student 1"
And the following should exist in the "user-grade" table:
@@ -86,7 +86,7 @@ Feature: Control the aggregation of the scales
Scenario: Weights of scales cannot be edited when they are not aggregated
Given I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
When I set the following settings for grade item "Course 1":
| Aggregation | Natural |
@@ -101,7 +101,7 @@ Feature: Control the aggregation of the scales
And the following config values are set as admin:
| grade_includescalesinaggregation | 1 |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I navigate to "Categories and items" node in "Grade administration > Setup"
And I set the field "Override weight of Grade me" to "1"
And the field "Override weight of Grade me" matches value "95.238"
grade/tests/behat/grade_single_item_scales.feature
+1 -1
View File
@@ -48,7 +48,7 @@ Feature: View gradebook when single item scales are used
And I set the field "Grade" to "A"
And I press "Save changes"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I navigate to "Course grade settings" node in "Grade administration > Setup"
And I set the field "Show weightings" to "Show"
And I set the field "Show contribution to course total" to "Show"
grade/tests/behat/grade_to_pass.feature
+9 -9
View File
@@ -55,7 +55,7 @@ Feature: We can set the grade to pass value
| grade[modgrade_type] | Point |
| grade[modgrade_point] | 50 |
| Grade to pass | 25 |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I click on "Edit assign Test Assignment 1" "link"
Then the field "Grade to pass" matches value "25"
@@ -65,7 +65,7 @@ Feature: We can set the grade to pass value
And I expand all fieldsets
And I set the field "Grade to pass" to "30"
And I press "Save and return to course"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I click on "Edit assign Test Assignment 1" "link"
And the field "Grade to pass" matches value "30"
@@ -78,7 +78,7 @@ Feature: We can set the grade to pass value
| grade[modgrade_type] | Scale |
| grade[modgrade_scale] | Test Scale 1 |
| Grade to pass | 3 |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I click on "Edit assign Test Assignment 1" "link"
And I follow "Show more..."
@@ -111,7 +111,7 @@ Feature: We can set the grade to pass value
| Submission grade to pass | 40 |
| gradinggrade | 20 |
| Assessment grade to pass | 10 |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I click on "Edit workshop Test Workshop 1 (submission)" "link"
And I follow "Show more..."
@@ -148,7 +148,7 @@ Feature: We can set the grade to pass value
And I add a "Quiz" to section "1" and I fill the form with:
| Name | Test Quiz 1 |
| Grade to pass | 9.5 |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I click on "Edit quiz Test Quiz 1" "link"
And I follow "Show more..."
@@ -167,7 +167,7 @@ Feature: We can set the grade to pass value
| Name | Test Lesson 1 |
| Description | Test |
| Grade to pass | 90 |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I click on "Edit lesson Test Lesson 1" "link"
And I follow "Show more..."
@@ -187,7 +187,7 @@ Feature: We can set the grade to pass value
| Description | Test |
| Grade to pass | 90 |
| Aggregate type | Average of ratings |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I click on "Edit data Test Database 1" "link"
And I follow "Show more..."
@@ -218,7 +218,7 @@ Feature: We can set the grade to pass value
| Description | Test |
| Grade to pass | 90 |
| Aggregate type | Average of ratings |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I click on "Edit forum Test Forum 1" "link"
And I follow "Show more..."
@@ -238,7 +238,7 @@ Feature: We can set the grade to pass value
| Description | Test |
| Grade to pass | 90 |
| Aggregate type | Average of ratings |
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I click on "Edit glossary Test Glossary 1" "link"
And I follow "Show more..."
grade/tests/behat/grade_view.feature
+4 -4
View File
@@ -51,7 +51,7 @@ Feature: We can enter in grades and view reports from the gradebook
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "80.00" to the user "Student 1" for the grade item "Test assignment name 1"
And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment name 2"
@@ -66,7 +66,7 @@ Feature: We can enter in grades and view reports from the gradebook
And the "Select all or one user" select box should contain "All users (1)"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
Then the following should exist in the "user-grade" table:
| Grade item | Grade | Range | Percentage |
@@ -76,7 +76,7 @@ Feature: We can enter in grades and view reports from the gradebook
And the following should not exist in the "user-grade" table:
| Grade item | Grade | Range | Percentage |
| Course total | 90.00 | 0–100 | 90.00 % |
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And "Course 1" row "Grade" column of "overview-grade" table should contain "170.00"
And "Course 1" row "Grade" column of "overview-grade" table should not contain "90.00"
@@ -94,7 +94,7 @@ Feature: We can enter in grades and view reports from the gradebook
And I press "Save changes"
And I log out
And I log in as "student1"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
Then the following should exist in the "user-grade" table:
| Grade item | Calculated weight | Grade | Range | Percentage |
lang/en/admin.php
+1 -1
View File
@@ -1084,7 +1084,7 @@ $string['updateavailableinstall'] = 'Install this update';
$string['updateavailablenot'] = 'Your Moodle code is up-to-date!';
$string['updateavailablerecommendation'] = 'It is strongly recommended that you update your site to the latest version to obtain all recent security and bug fixes.';
$string['updatenotifications'] = 'Update notifications';
$string['updatenotificationfooter'] = 'Your Moodle site {$a->siteurl} is configured to automatically check for available updates. You are receiving this message as the administrator of the site. You can disable automatic checks for available updates in the Site administration section of the Administration block. You can customise the delivery of this message via your personal Messaging setting in My preferences.';
$string['updatenotificationfooter'] = 'Your Moodle site {$a->siteurl} is configured to automatically check for available updates. You are receiving this message as the administrator of the site. You can disable automatic checks for available updates in the Site administration section of the Administration block. You can customise the delivery of this message via your preferences page.';
$string['updatenotificationsubject'] = 'Moodle updates are available ({$a->siteurl})';
$string['updateautocheck'] = 'Automatically check for available updates';
$string['updateautocheck_desc'] = 'If enabled, your site will automatically check for available updates for both Moodle code and all additional plugins. If there is a new update available, a notification will be sent to site admins.';
lang/en/badges.php
+4 -4
View File
@@ -91,7 +91,7 @@ $string['personaconnection_help'] = 'Persona is a system for identifying yoursel
For more information about Persona visit <a href="https://login.persona.org/about">https://login.persona.org/about</a>.';
$string['backpackimport'] = 'Badge import settings';
$string['backpackimport_help'] = 'After backpack connection is successfully established, badges from your backpack can be displayed on your "My Badges" page and your profile page.
$string['backpackimport_help'] = 'After the backpack connection is successfully established, badges from your backpack can be displayed on your badges page and your profile page.
In this area, you can select collections of badges from your backpack that you would like to display in your profile.';
$string['badges'] = 'Badges';
@@ -104,7 +104,7 @@ To add a new image, browse and select an image (in JPG or PNG format) then click
$string['badgeprivacysetting'] = 'Badge privacy settings';
$string['badgeprivacysetting_help'] = 'Badges you earn can be displayed on your account profile page. This setting allows you to automatically set the visibility of the newly earned badges.
You can still control individual badge privacy settings on your "My badges" page.';
You can still control individual badge privacy settings on your badges page.';
$string['badgeprivacysetting_str'] = 'Automatically show badges I earn on my profile page';
$string['badgesalt'] = 'Salt for hashing the recepient\'s email address';
$string['badgesalt_desc'] = 'Using a hash allows backpack services to confirm the badge earner without having to expose their email address. This setting should only use numbers and letters.
@@ -287,8 +287,8 @@ $string['managebadges'] = 'Manage badges';
$string['managemybadges'] = 'Manage my badges';
$string['message'] = 'Message body';
$string['messagebody'] = '<p>You have been awarded the badge "%badgename%"!</p>
<p>More information about this badge can be found at %badgelink%.</p>
<p>You can manage and download the badge from {$a}.</p>';
<p>More information about this badge can be found on the %badgelink% badge information page.</p>
<p>You can manage and download the badge from your {$a} page.</p>';
$string['messagesubject'] = 'Congratulations! You just earned a badge!';
$string['method'] = 'This criterion is complete when...';
$string['mingrade'] = 'Minimum grade required';
lang/en/deprecated.txt
+11
View File
@@ -12,3 +12,14 @@ lockmethod,core_cache
lockmethod_help,core_cache
personalrepositories,core_repository
siteblog,core_blog
managemybadges,core_badges
mybackpack,core_badges
mybadges,core_badges
myfiles,core
myfilesmanage,core
mygrades,core
mypreferences,core
mypreferences,core_grades
myprofile,core
myprofilemyblogs,core_blog
viewallmyentries,core_blog
lang/en/grades.php
+2 -2
View File
@@ -209,7 +209,7 @@ $string['exportonlyactive'] = 'Exclude suspended users';
$string['exportonlyactive_help'] = 'Only include students in the export whose enrolment is active and has not been suspended';
$string['exportto'] = 'Export to';
$string['externalurl'] = 'External URL';
$string['externalurl_desc'] = 'Specify an external url to use for the my grade page. My grades must be set to External URL.';
$string['externalurl_desc'] = 'If an external gradebook is used, the URL should be specified here.';
$string['extracreditvalue'] = 'Extra credit value for {$a}';
$string['extracreditwarning'] = 'Note: Setting all items for a category to extra credit will effectively remove them from the grade calculation. Since there will be no point total';
$string['feedback'] = 'Feedback';
@@ -460,7 +460,7 @@ $string['multfactor'] = 'Multiplicator';
$string['multfactorvalue'] = 'Multiplicator value for {$a}';
$string['multfactor_help'] = 'The multiplicator is the factor by which all grades for this grade item will be multiplied, with a maximum value of the maximum grade. For example, if the multiplicator is 2 and the maximum grade is 100, then all grades less than 50 are multiplied by 2, and all grades 50 and above are changed to 100.';
$string['mygrades'] = 'My grades';
$string['mygrades_desc'] = 'This sets the "My grades" page in the user menu.';
$string['mygrades_desc'] = 'This setting determines the grades link in the user menu. If an external gradebook is used, \'External URL\' should be selected and the URL specified below.';
$string['mypreferences'] = 'My preferences';
$string['myreportpreferences'] = 'My report preferences';
$string['navmethod'] = 'Navigation method';
lang/en/moodle.php
+2
View File
@@ -1217,6 +1217,7 @@ $string['mustchangepassword'] = 'The new password must be different than the cur
$string['mycourses'] = 'My courses';
$string['myfiles'] = 'My private files';
$string['myfilesmanage'] = 'Manage my private files';
$string['privatefilesmanage'] = 'Manage private files';
$string['myhome'] = 'Dashboard';
$string['mymoodledashboard'] = 'My Moodle dashboard';
$string['myprofile'] = 'My profile';
@@ -1462,6 +1463,7 @@ $string['previous'] = 'Previous';
$string['previouslyselectedusers'] = 'Previously selected users not matching \'{$a}\'';
$string['previoussection'] = 'Previous section';
$string['primaryadminsetup'] = 'Setup administrator account';
$string['privatefiles'] = 'Private files';
$string['private_files_handler'] = 'Store attachments to an e-mail in the user\'s private files storage space.';
$string['private_files_handler_name'] = 'Email to Private files';
$string['profile'] = 'Profile';
lang/en/webservice.php
+2 -2
View File
@@ -182,7 +182,7 @@ $string['shortnametaken'] = 'Short name is already used for another service ({$a
$string['simpleauthlog'] = 'Simple authentication login';
$string['step'] = 'Step';
$string['supplyinfo'] = 'More details';
$string['testauserwithtestclientdescription'] = 'Simulate external access to the service using the web service test client. Before doing so, login as a user with the moodle/webservice:createtoken capability and obtain the security key (token) via My preferences settings. You will use this token in the test client. In the test client, also choose an enabled protocol with the token authentication. <strong>WARNING: The functions that you test WILL BE EXECUTED for this user, so be careful what you choose to test!</strong>';
$string['testauserwithtestclientdescription'] = 'Simulate external access to the service using the web service test client. Before doing so, log in as a user with the moodle/webservice:createtoken capability and obtain the security key (token) via the user\'s preferences page. You will use this token in the test client. In the test client, also choose an enabled protocol with the token authentication. <strong>WARNING: The functions that you test WILL BE EXECUTED for this user, so be careful what you choose to test!</strong>';
$string['testclient'] = 'Web service test client';
$string['testclientdescription'] = '* The web service test client <strong>executes</strong> the functions for <strong>REAL</strong>. Do not test functions that you don\'t know. <br/>* All existing web service functions are not yet implemented into the test client. <br/>* In order to check that a user cannot access some functions, you can test some functions that you didn\'t allow.<br/>* To see clearer error messages set the debugging to <strong>{$a->mode}</strong> into {$a->atag}<br/>* Access the {$a->amfatag}.';
$string['testwithtestclient'] = 'Test the service';
@@ -197,7 +197,7 @@ $string['updateusersettings'] = 'Update';
$string['uploadfiles'] = 'Can upload files';
$string['uploadfiles_help'] = 'If enabled, any user can upload files with their security keys to their own private files area or a draft file area. Any user file quotas apply.';
$string['userasclients'] = 'Users as clients with token';
$string['userasclientsdescription'] = 'The following steps help you to set up the Moodle web service for users as clients. These steps also help to set up the recommended token (security keys) authentication method. In this use case, the user will generate his token from the security keys page via My preferences settings.';
$string['userasclientsdescription'] = 'The following steps help you to set up the Moodle web service for users as clients. These steps also help to set up the recommended token (security keys) authentication method. In this use case, the user will generate their token from the security keys page via their preferences page.';
$string['usermissingcaps'] = 'Missing capabilities: {$a}';
$string['usernameorid'] = 'Username / User id';
$string['usernameorid_help'] = 'Enter a username or a user id.';
lib/adminlib.php
+2 -2
View File
@@ -5201,7 +5201,7 @@ class admin_setting_grade_profilereport extends admin_setting_configselect {
}
/**
* Provides a selection of grade reports to be used for "my grades".
* Provides a selection of grade reports to be used for "grades".
*
* @copyright 2015 Adrian Greeve <adrian@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -5212,7 +5212,7 @@ class admin_setting_my_grades_report extends admin_setting_configselect {
* Calls parent::__construct with specific arguments.
*/
public function __construct() {
parent::__construct('grade_mygrades_report', new lang_string('mygrades', 'grades'),
parent::__construct('grade_mygrades_report', new lang_string('grades', 'grades'),
new lang_string('mygrades_desc', 'grades'), 'overview', null);
}
lib/db/upgrade.php
+16
View File
@@ -4337,5 +4337,21 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2015040900.02);
}
if ($oldversion < 2015050400.00) {
$config = get_config('core', 'customusermenuitems');
// Change "My preferences" in the user menu to "Preferences".
$config = str_replace("mypreferences,moodle|/user/preferences.php|preferences",
"preferences,moodle|/user/preferences.php|preferences", $config);
// Change "My grades" in the user menu to "Grades".
$config = str_replace("mygrades,grades|/grade/report/mygrades.php|grades",
"grades,grades|/grade/report/mygrades.php|grades", $config);
set_config('customusermenuitems', $config);
upgrade_main_savepoint(true, 2015050400.00);
}
return true;
}
lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature
+6 -6
View File
@@ -5,7 +5,7 @@ Feature: Atto accessibility checker
@javascript
Scenario: Images with no alt
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>Some plain text</p><img src='/broken-image' width='1' height='1'/><p>Some more text</p>"
When I click on "Show more buttons" "button"
@@ -31,7 +31,7 @@ Feature: Atto accessibility checker
@javascript
Scenario: Low contrast
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p style='color: #7c7cff; background-color: #ffffff;'>Hard to read</p>"
When I click on "Show more buttons" "button"
@@ -41,7 +41,7 @@ Feature: Atto accessibility checker
@javascript
Scenario: No headings
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>Sweet roll oat cake jelly-o macaroon donut oat cake. Caramels macaroon cookie sweet roll croissant cheesecake candy jelly-o. Gummies sugar plum sugar plum gingerbread dessert. Tiramisu bonbon jujubes danish marshmallow cookie chocolate cake cupcake tiramisu. Bear claw oat cake chocolate bar croissant. Lollipop cookie topping liquorice croissant. Brownie cookie cupcake lollipop cupcake cupcake. Fruitcake dessert sweet biscuit dragée caramels marzipan brownie. Chupa chups gingerbread apple pie cookie liquorice caramels carrot cake cookie gingerbread. Croissant candy jelly beans. Tiramisu apple pie dessert apple pie macaroon soufflé. Brownie powder carrot cake chocolate. Tart applicake croissant dragée macaroon chocolate donut.</p><p>Jelly beans gingerbread tootsie roll. Sugar plum tiramisu cotton candy toffee pie cotton candy tiramisu. Carrot cake chocolate bar sesame snaps cupcake cake dessert sweet fruitcake wafer. Marshmallow cupcake gingerbread pie sweet candy canes powder gummi bears. Jujubes cake muffin marshmallow candy jelly beans tootsie roll pie. Gummi bears applicake chocolate cake sweet jelly sesame snaps lollipop lollipop carrot cake. Marshmallow cake jelly beans. Jelly beans sesame snaps muffin halvah cookie ice cream candy canes carrot cake. Halvah donut marshmallow tiramisu. Cookie dessert gummi bears. Sugar plum apple pie jelly beans gummi bears tart chupa chups. Liquorice macaroon gummi bears gummies macaroon marshmallow sweet roll cake topping. Lemon drops caramels pie icing danish. Chocolate cake oat cake dessert halvah danish carrot cake apple pie.</p>"
When I click on "Show more buttons" "button"
@@ -51,7 +51,7 @@ Feature: Atto accessibility checker
@javascript
Scenario: Merged cells
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<table><caption>Dogs that look good in pants</caption><tr><th>Breed</th><th>Coolness</th></tr><tr><td>Poodle</td><td rowspan='2'>NOT COOL</td></tr><tr><td>Doberman</td></tr></table>"
When I click on "Show more buttons" "button"
@@ -61,7 +61,7 @@ Feature: Atto accessibility checker
@javascript
Scenario: Table missing row/column headers
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<table><caption>Dogs that look good in pants</caption><tr><th>Breed</th><td>Coolness</td></tr><tr><td>Poodle</td><td>NOT COOL</td></tr><tr><td>Doberman</td><td>COOL</td></tr></table>"
When I click on "Show more buttons" "button"
@@ -71,7 +71,7 @@ Feature: Atto accessibility checker
@javascript
Scenario: Table missing caption
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<table><tr><th>Breed</th><th>Coolness</th></tr><tr><td>Poodle</td><td>NOT COOL</td></tr><tr><td>Doberman</td><td>COOL</td></tr></table>"
When I click on "Show more buttons" "button"
lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature
+2 -2
View File
@@ -5,7 +5,7 @@ Feature: Atto accessibility helper
@javascript
Scenario: Images and links
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>Some plain text</p><img src='/broken-image' alt='Image 1'/><p><a href='#fsd'>Some link text</a></p>"
And I select the text in the "Description" Atto editor
@@ -21,7 +21,7 @@ Feature: Atto accessibility helper
@javascript
Scenario: Styles
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>Some plain text</p>"
When I click on "Show more buttons" "button"
lib/editor/atto/plugins/align/tests/behat/align.feature
+6 -6
View File
@@ -5,14 +5,14 @@ Feature: Atto align text
@javascript
Scenario: Right align some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>Fascism</p>"
And I click on "Show more buttons" "button"
And I select the text in the "Description" Atto editor
When I click on "Right align" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
@@ -22,7 +22,7 @@ Feature: Atto align text
@javascript
Scenario: Left align some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>Communism</p>"
And I click on "Show more buttons" "button"
@@ -30,7 +30,7 @@ Feature: Atto align text
When I click on "Right align" "button"
And I click on "Left align" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
@@ -40,14 +40,14 @@ Feature: Atto align text
@javascript
Scenario: Center align some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>United Future</p>"
And I click on "Show more buttons" "button"
And I select the text in the "Description" Atto editor
When I click on "Center" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/bold/tests/behat/bold.feature
+4 -4
View File
@@ -5,13 +5,13 @@ Feature: Atto bold button
@javascript
Scenario: Bold some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Badger"
And I select the text in the "Description" Atto editor
When I click on "Bold" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
@@ -21,14 +21,14 @@ Feature: Atto bold button
@javascript
Scenario: Unbold some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Mouse"
And I select the text in the "Description" Atto editor
When I click on "Bold" "button"
And I click on "Bold" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/charmap/tests/behat/charmap.feature
+2 -2
View File
@@ -5,7 +5,7 @@ Feature: Atto charmap button
@javascript
Scenario: Insert symbols
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>1980 Mullet</p>"
And I select the text in the "Description" Atto editor
@@ -13,7 +13,7 @@ Feature: Atto charmap button
And I click on "Insert character" "button"
And I click on "a - macron" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/clear/tests/behat/clear.feature
+2 -2
View File
@@ -5,7 +5,7 @@ Feature: Atto clear button
@javascript
Scenario: Clear formatting
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Pisa"
And I select the text in the "Description" Atto editor
@@ -14,7 +14,7 @@ Feature: Atto clear button
And I select the text in the "Description" Atto editor
When I click on "Clear formatting" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/collapse/tests/behat/collapse.feature
+1 -1
View File
@@ -5,7 +5,7 @@ Feature: Atto collapse button
@javascript
Scenario: Toggle toolbar
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
When I click on "Show more buttons" "button"
Then "Equation editor" "button" should be visible
lib/editor/atto/plugins/equation/tests/behat/equation.feature
+3 -3
View File
@@ -5,7 +5,7 @@ Feature: Atto equation editor
@javascript
Scenario: Create an equation
Given I log in as "admin"
When I follow "My profile" in the user menu
When I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>Equation test</p>"
# Set field on the bottom of page, so equation editor dialogue is visible.
@@ -18,13 +18,13 @@ Feature: Atto equation editor
And I click on "\infty" "button"
And I click on "Save equation" "button"
And I click on "Update profile" "button"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
Then "\infty" "text" should exist
@javascript
Scenario: Edit an equation
Given I log in as "admin"
When I follow "My profile" in the user menu
When I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>\( \pi \)</p>"
# Set field on the bottom of page, so equation editor dialogue is visible.
lib/editor/atto/plugins/html/tests/behat/html.feature
+1 -1
View File
@@ -5,7 +5,7 @@ Feature: Atto edit HTML
@javascript
Scenario: Edit the html source
Given I log in as "admin"
When I follow "My profile" in the user menu
When I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p style=\"color: blue;\">Smurf</p>"
And I click on "Show more buttons" "button"
lib/editor/atto/plugins/image/tests/behat/image.feature
+3 -3
View File
@@ -5,10 +5,10 @@ Feature: Add images to Atto
@javascript
Scenario: Insert an image
Given I log in as "admin"
And I follow "Manage my private files..."
And I follow "Manage private files..."
And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager
And I click on "Save changes" "button"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
When I set the field "Description" to "<p>Image test</p>"
And I select the text in the "Description" Atto editor
@@ -50,7 +50,7 @@ Feature: Add images to Atto
@javascript
Scenario: Manually inserting an image
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "<p>Image: <img src='/nothing/here'>.</p>"
And I select the text in the "Description" Atto editor
lib/editor/atto/plugins/indent/tests/behat/indent.feature
+4 -4
View File
@@ -5,14 +5,14 @@ Feature: Indent text in Atto
@javascript
Scenario: Indent
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
When I follow "Edit profile"
And I set the field "Description" to "<p>I need some space.</p>"
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
And I click on "Indent" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
@@ -22,7 +22,7 @@ Feature: Indent text in Atto
@javascript
Scenario: Indent and outdent
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
When I follow "Edit profile"
And I set the field "Description" to "<p>I need some space.</p>"
And I select the text in the "Description" Atto editor
@@ -30,7 +30,7 @@ Feature: Indent text in Atto
And I click on "Indent" "button"
And I click on "Outdent" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/italic/tests/behat/italic.feature
+4 -4
View File
@@ -5,13 +5,13 @@ Feature: Atto italic button
@javascript
Scenario: Italicise some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Tower of Pisa"
And I select the text in the "Description" Atto editor
When I click on "Italic" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
@@ -21,14 +21,14 @@ Feature: Atto italic button
@javascript
Scenario: Toggle italics in some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "GHD - for hair"
And I select the text in the "Description" Atto editor
When I click on "Italic" "button"
And I click on "Italic" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/link/tests/behat/link.feature
+3 -3
View File
@@ -5,10 +5,10 @@ Feature: Add links to Atto
@javascript
Scenario: Insert a links
Given I log in as "admin"
And I follow "Manage my private files..."
And I follow "Manage private files..."
And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager
And I click on "Save changes" "button"
When I follow "My profile" in the user menu
When I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Super cool"
And I select the text in the "Description" Atto editor
@@ -18,7 +18,7 @@ Feature: Add links to Atto
And I click on "moodle-logo.png" "link"
And I click on "Select this file" "button"
And I click on "Update profile" "button"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/media/tests/behat/media.feature
+3 -3
View File
@@ -5,11 +5,11 @@ Feature: Add media to Atto
@javascript
Scenario: Insert some media
Given I log in as "admin"
And I follow "Manage my private files..."
And I follow "Manage private files..."
And I upload "lib/editor/atto/tests/fixtures/moodle-logo.webm" file to "Files" filemanager
And I click on "Save changes" "button"
When I follow "My profile" in the user menu
And I follow "My blog entries"
When I follow "Profile" in the user menu
And I follow "Blog entries"
And I follow "Add a new entry"
And I set the field "Blog entry body" to "<p>Media test</p>"
And I select the text in the "Blog entry body" Atto editor
lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature
+2 -2
View File
@@ -5,13 +5,13 @@ Feature: Atto ordered list button
@javascript
Scenario: Make a list from some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Have you heard the news everyone's talking<br/> Life is good 'cause everything's awesome<br/>"
And I select the text in the "Description" Atto editor
When I click on "Ordered list" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/strike/tests/behat/strike.feature
+2 -2
View File
@@ -5,14 +5,14 @@ Feature: Atto strike button
@javascript
Scenario: Strike some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "MUA"
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
When I click on "Strike through" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/subscript/tests/behat/subscript.feature
+2 -2
View File
@@ -5,14 +5,14 @@ Feature: Atto subscript button
@javascript
Scenario: Subscript some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Submarine"
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
When I click on "Subscript" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/superscript/tests/behat/superscript.feature
+2 -2
View File
@@ -5,14 +5,14 @@ Feature: Atto superscript button
@javascript
Scenario: Subscript some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Helicopter"
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
When I click on "Superscript" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/table/tests/behat/table.feature
+4 -4
View File
@@ -5,8 +5,8 @@ Feature: Atto tables
@javascript
Scenario: Create a table
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "My blog entries"
And I follow "Profile" in the user menu
And I follow "Blog entries"
And I follow "Add a new entry"
And I set the field "Entry title" to "How to make a table"
And I set the field "Blog entry body" to "Table test"
@@ -21,8 +21,8 @@ Feature: Atto tables
@javascript
Scenario: Edit a table
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "My blog entries"
And I follow "Profile" in the user menu
And I follow "Blog entries"
And I follow "Add a new entry"
And I set the field "Entry title" to "How to make a table"
And I set the field "Blog entry body" to "<table><tr><td>Cell</td></tr></table>"
lib/editor/atto/plugins/title/tests/behat/title.feature
+2 -2
View File
@@ -5,14 +5,14 @@ Feature: Atto title
@javascript
Scenario: Create a heading
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "How The Rock Has Made the WWE World Heavyweight Title More Important Than Ever"
And I select the text in the "Description" Atto editor
When I click on "Paragraph styles" "button"
When I click on "Heading (large)" "link"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/underline/tests/behat/underline.feature
+2 -2
View File
@@ -5,14 +5,14 @@ Feature: Atto underline button
@javascript
Scenario: Underline some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Deprecated HTML Tag"
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
When I click on "Underline" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature
+2 -2
View File
@@ -5,13 +5,13 @@ Feature: Atto unordered list button
@javascript
Scenario: Make a list from some text
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Edit profile"
And I set the field "Description" to "Things, dogs, clogs, they're awesome<br/> Rocks, clocks, and socks, they're awesome<br/> Figs, and wigs, and twigs, that's awesome<br/> Everything you see or think or say is awesome"
And I select the text in the "Description" Atto editor
When I click on "Unordered list" "button"
And I press "Update profile"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "Plain text area"
And I press "Save changes"
lib/editor/tinymce/tests/behat/edit_available_icons.feature
+1 -1
View File
@@ -9,7 +9,7 @@ Feature: Add or remove items from the TinyMCE editor toolbar
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And I log in as "admin"
And I follow "My preferences" in the user menu
And I follow "Preferences" in the user menu
And I follow "Editor preferences"
And I set the field "Text editor" to "TinyMCE HTML editor"
And I press "Save changes"
lib/myprofilelib.php
+1 -1
View File
@@ -102,7 +102,7 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
// Preference page. Only visible by administrators.
if (is_siteadmin()) {
$url = new moodle_url('/user/preferences.php', array('userid' => $user->id));
$title = $iscurrentuser ? get_string('mypreferences') : get_string('userspreferences', 'moodle', fullname($user));
$title = $iscurrentuser ? get_string('preferences') : get_string('userspreferences', 'moodle', fullname($user));
$node = new core_user\output\myprofile\node('administration', 'preferences', $title, null, $url);
$tree->add_node($node);
}
lib/navigationlib.php
+15 -19
View File
@@ -1104,7 +1104,7 @@ class global_navigation extends navigation_node {
}
}
$this->rootnodes['site'] = $this->add_course($SITE);
$this->rootnodes['myprofile'] = $this->add(get_string('myprofile'), null, self::TYPE_USER, null, 'myprofile');
$this->rootnodes['myprofile'] = $this->add(get_string('profile'), null, self::TYPE_USER, null, 'myprofile');
$this->rootnodes['currentcourse'] = $this->add(get_string('currentcourse'), null, self::TYPE_ROOTNODE, null, 'currentcourse');
$this->rootnodes['mycourses'] = $this->add(get_string('mycourses'), null, self::TYPE_ROOTNODE, null, 'mycourses');
$this->rootnodes['courses'] = $this->add(get_string('courses'), new moodle_url('/course/index.php'), self::TYPE_ROOTNODE, null, 'courses');
@@ -2231,7 +2231,7 @@ class global_navigation extends navigation_node {
}
// Add the messages link.
// It is context based so can appear in "My profile" and in course participants information.
// It is context based so can appear in the user's profile and in course participants information.
if (!empty($CFG->messaging)) {
$messageargs = array('user1' => $USER->id);
if ($USER->id != $user->id) {
@@ -2245,10 +2245,10 @@ class global_navigation extends navigation_node {
}
// Add the "My private files" link.
// This link doesn't have a unique display for course context so only display it under "My profile".
// This link doesn't have a unique display for course context so only display it under the user's profile.
if ($issitecourse && $iscurrentuser && has_capability('moodle/user:manageownfiles', $usercontext)) {
$url = new moodle_url('/user/files.php');
$usernode->add(get_string('myfiles'), $url, self::TYPE_SETTING);
$usernode->add(get_string('privatefiles'), $url, self::TYPE_SETTING);
}
// Add a node to view the users notes if permitted.
@@ -2261,10 +2261,10 @@ class global_navigation extends navigation_node {
$usernode->add(get_string('notes', 'notes'), $url);
}
// Show the my grades node.
// Show the grades node.
if (($issitecourse && $iscurrentuser) || has_capability('moodle/user:viewdetails', $usercontext)) {
require_once($CFG->dirroot . '/user/lib.php');
// Set the grades node to link to the "My grades" page.
// Set the grades node to link to the "Grades" page.
if ($course->id == SITEID) {
$url = user_mygrades_url($user->id, $course->id);
} else { // Otherwise we are in a course and should redirect to the user grade report (Activity report version).
@@ -2273,7 +2273,7 @@ class global_navigation extends navigation_node {
if ($USER->id != $user->id) {
$usernode->add(get_string('grades', 'grades'), $url, self::TYPE_SETTING, null, 'usergrades');
} else {
$usernode->add(get_string('mygrades', 'grades'), $url);
$usernode->add(get_string('grades', 'grades'), $url);
}
}
@@ -4219,7 +4219,7 @@ class settings_navigation extends navigation_node {
}
// Add the user profile to the dashboard.
$profilenode = $dashboard->add(get_string('myprofile'), new moodle_url('/user/profile.php',
$profilenode = $dashboard->add(get_string('profile'), new moodle_url('/user/profile.php',
array('id' => $user->id)), self::TYPE_SETTING, null, 'myprofile');
if (!empty($CFG->navadduserpostslinks)) {
@@ -4257,7 +4257,7 @@ class settings_navigation extends navigation_node {
}
// Add the messages link.
// It is context based so can appear in "My profile" and in course participants information.
// It is context based so can appear in the user's profile and in course participants information.
if (!empty($CFG->messaging)) {
$messageargs = array('user1' => $USER->id);
if ($USER->id != $user->id) {
@@ -4271,10 +4271,10 @@ class settings_navigation extends navigation_node {
}
// Add the "My private files" link.
// This link doesn't have a unique display for course context so only display it under "My profile".
// This link doesn't have a unique display for course context so only display it under the user's profile.
if ($issitecourse && $iscurrentuser && has_capability('moodle/user:manageownfiles', $usercontext)) {
$url = new moodle_url('/user/files.php');
$dashboard->add(get_string('myfiles'), $url, self::TYPE_SETTING);
$dashboard->add(get_string('privatefiles'), $url, self::TYPE_SETTING);
}
// Add a node to view the users notes if permitted.
@@ -4287,20 +4287,16 @@ class settings_navigation extends navigation_node {
$dashboard->add(get_string('notes', 'notes'), $url);
}
// Show the my grades node.
// Show the grades node.
if (($issitecourse && $iscurrentuser) || has_capability('moodle/user:viewdetails', $usercontext)) {
require_once($CFG->dirroot . '/user/lib.php');
// Set the grades node to link to the "My grades" page.
// Set the grades node to link to the "Grades" page.
if ($course->id == SITEID) {
$url = user_mygrades_url($user->id, $course->id);
} else { // Otherwise we are in a course and should redirect to the user grade report (Activity report version).
$url = new moodle_url('/course/user.php', array('mode' => 'grade', 'id' => $course->id, 'user' => $user->id));
}
if ($USER->id != $user->id) {
$dashboard->add(get_string('grades', 'grades'), $url, self::TYPE_SETTING, null, 'mygrades');
} else {
$dashboard->add(get_string('mygrades', 'grades'), $url, self::TYPE_SETTING, null, 'mygrades');
}
$dashboard->add(get_string('grades', 'grades'), $url, self::TYPE_SETTING, null, 'mygrades');
}
$usersetting = navigation_node::create(get_string('preferences', 'moodle'), $prefurl, self::TYPE_CONTAINER, null, $key);
$dashboard->add_node($usersetting);
@@ -4490,7 +4486,7 @@ class settings_navigation extends navigation_node {
$badges = $usersetting->add(get_string('badges'), null, navigation_node::TYPE_CONTAINER, null, 'badges');
if (has_capability('moodle/badges:manageownbadges', $usercontext)) {
$url = new moodle_url('/badges/mybadges.php');
$badges->add(get_string('managemybadges', 'badges'), $url, self::TYPE_SETTING);
$badges->add(get_string('managebadges', 'badges'), $url, self::TYPE_SETTING);
}
$badges->add(get_string('preferences', 'badges'), new moodle_url('/badges/preferences.php'),
navigation_node::TYPE_SETTING);
lib/tests/user_menu_test.php
+3 -3
View File
@@ -58,9 +58,9 @@ class core_user_menu_testcase extends advanced_testcase {
// And these are combinations containing both valid and invalid.
array('messages,message|/message/index.php|message
myfiles,moodle|/user/files.php|download
privatefiles,moodle|/user/files.php|download
###
mybadges,badges|/badges/mybadges.php|award
badges,badges|/badges/mybadges.php|award
-|-|-
test
-
@@ -92,7 +92,7 @@ test
// We always add two dividers as standard.
$dividercount += 2;
// The basic entry count will additionally include the wrapper menu, Dashboard, My profile, and the Logout link.
// The basic entry count will additionally include the wrapper menu, Dashboard, Profile, and the Logout link.
$entrycount += 4;
$output = $OUTPUT->user_menu($USER);
mod/assign/tests/behat/quickgrading.feature
+4 -4
View File
@@ -128,7 +128,7 @@ Feature: In an assignment, teachers grade multiple students on one page
And I follow "Test assignment name"
And I should see "I'm the teacher first feedback"
And I should see "60.0"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And I should see "1337"
And I log out
@@ -137,7 +137,7 @@ Feature: In an assignment, teachers grade multiple students on one page
And I follow "Test assignment name"
And I should not see "I'm the teacher first feedback"
And I should not see "60.0"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And I should not see "1337"
And I log out
@@ -167,7 +167,7 @@ Feature: In an assignment, teachers grade multiple students on one page
And I follow "Test assignment name"
And I should see "I'm the teacher first feedback"
And I should see "60.0"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And I should see "1337"
And I log out
@@ -176,6 +176,6 @@ Feature: In an assignment, teachers grade multiple students on one page
And I follow "Test assignment name"
And I should not see "I'm the teacher first feedback"
And I should not see "60.0"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And I should not see "1337"
mod/forum/lib.php
+2 -4
View File
@@ -7833,8 +7833,7 @@ function mod_forum_myprofile_navigation(core_user\output\myprofile\tree $tree, $
if (!empty($course)) {
$postsurl->param('course', $course->id);
}
$string = $iscurrentuser ? get_string('myprofileownpost', 'mod_forum') :
get_string('forumposts', 'mod_forum');
$string = get_string('forumposts', 'mod_forum');
$node = new core_user\output\myprofile\node('miscellaneous', 'forumposts', $string, null, $postsurl);
$tree->add_node($node);
@@ -7842,8 +7841,7 @@ function mod_forum_myprofile_navigation(core_user\output\myprofile\tree $tree, $
if (!empty($course)) {
$discussionssurl->param('course', $course->id);
}
$string = $iscurrentuser ? get_string('myprofileowndis', 'mod_forum') :
get_string('myprofileotherdis', 'mod_forum');
$string = get_string('myprofileotherdis', 'mod_forum');
$node = new core_user\output\myprofile\node('miscellaneous', 'forumdiscussions', $string, null,
$discussionssurl);
$tree->add_node($node);
mod/forum/tests/behat/my_forum_posts.feature
+4 -4
View File
@@ -31,11 +31,11 @@ Feature: A user can view their posts and discussions
| Message | How awesome is this forum discussion? |
And I reply "Forum discussion 1" post from "Test forum name" forum with:
| Message | Actually, I've seen better. |
When I follow "My profile" in the user menu
And I follow "My forum posts"
When I follow "Profile" in the user menu
And I follow "Forum posts"
Then I should see "How awesome is this forum discussion?"
And I should see "Actually, I've seen better."
And I follow "My profile" in the user menu
And I follow "My forum discussions"
And I follow "Profile" in the user menu
And I follow "Forum discussions"
And I should see "How awesome is this forum discussion?"
And I should not see "Actually, I've seen better."
mod/lesson/tests/behat/lesson_practice.feature
+3 -3
View File
@@ -51,7 +51,7 @@ Feature: Practice mode in a lesson activity
| True | 1 |
And I press "Submit"
Then I should see "View grades"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And I should see "Non-practice lesson"
@@ -72,7 +72,7 @@ Feature: Practice mode in a lesson activity
| True | 1 |
And I press "Submit"
Then I should not see "View grades"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And I should not see "Practice lesson"
@@ -94,6 +94,6 @@ Feature: Practice mode in a lesson activity
| True | 1 |
And I press "Submit"
Then I should not see "View grades"
And I follow "My grades" in the user menu
And I follow "Grades" in the user menu
And I follow "Course 1"
And I should not see "Practice lesson with scale"
mod/lesson/tests/behat/questions_images.feature
+1 -1
View File
@@ -17,7 +17,7 @@ Feature: In a lesson activity, teacher can add embedded images in questions answ
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And I log in as "teacher1"
And I follow "Manage my private files"
And I follow "Manage private files"
And I upload "mod/lesson/tests/fixtures/moodle_logo.jpg" file to "Files" filemanager
And I click on "Save changes" "button"
When I am on homepage
mod/quiz/tests/behat/completion_condition_attempts_used.feature
+1 -1
View File
@@ -47,7 +47,7 @@ Feature: Set a quiz to be marked complete when the student uses all attempts all
| Feedback for the response 'True'. | So you think it is true |
| Feedback for the response 'False'. | So you think it is false |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I navigate to "Categories and items" node in "Grade administration > Setup"
And I follow "Edit quiz Test quiz name"
Then I should see "Edit grade item"
mod/quiz/tests/behat/completion_condition_passing_grade.feature
+1 -1
View File
@@ -46,7 +46,7 @@ Feature: Set a quiz to be marked complete when the student passes
| Feedback for the response 'True'. | So you think it is true |
| Feedback for the response 'False'. | So you think it is false |
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I set the field "jump" to "Categories and items"
And I press "Go"
And I follow "Edit quiz Test quiz name"
my/tests/behat/add_blocks.feature
+1 -1
View File
@@ -23,6 +23,6 @@ Feature: Add blocks to dashboard page
When I press "Customise this page"
And I add the "Latest news" block
Then I should see "Latest news" in the "Latest news" "block"
And I should see "My latest badges" in the "My latest badges" "block"
And I should see "Latest badges" in the "Latest badges" "block"
And I should see "Calendar" in the "Calendar" "block"
And I should see "Upcoming events" in the "Upcoming events" "block"
my/tests/behat/reset_page.feature
+1 -1
View File
@@ -25,7 +25,7 @@ Feature: Reset dashboard page to default
And I add the "Comments" block
And I press "Reset page to default"
Then I should not see "Latest news"
And I should see "My latest badges"
And I should see "Latest badges"
And I should see "Calendar"
And I should see "Upcoming events"
And I should not see "Comments"
notes/lib.php
+1 -2
View File
@@ -380,8 +380,7 @@ function note_view($context, $userid) {
*/
function core_notes_myprofile_navigation(core_user\output\myprofile\tree $tree, $user, $iscurrentuser, $course) {
$url = new moodle_url("/notes/index.php", array('user' => $user->id));
$title = $iscurrentuser ? get_string('myprofileownnotes', 'core_notes') :
get_string('notes', 'core_notes');
$title = get_string('notes', 'core_notes');
if (empty($course)) {
// Site level profile.
if (!has_capability('moodle/notes:view', context_system::instance())) {
report/outline/tests/behat/user.feature
+6 -6
View File
@@ -49,13 +49,13 @@ Feature: View the user page for the outline report
And I follow "URL name"
And I follow "URL name"
And I click on "Student 1" "link"
And I follow "My profile" in the open menu
And I follow "Profile" in the open menu
And I follow "Course 1"
When I follow "Outline report"
Then I should see "4 views" in the "Folder name" "table_row"
And I should see "3 views" in the "URL name" "table_row"
And I click on "Student 1" "link"
And I follow "My profile" in the open menu
And I follow "Profile" in the open menu
And I follow "Course 1"
When I follow "Complete report"
And I should see "4 views"
@@ -79,12 +79,12 @@ Feature: View the user page for the outline report
And I follow "URL name"
And I follow "URL name"
And I follow "URL name"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Course 1"
When I follow "Outline report"
Then I should see "4 views" in the "Folder name" "table_row"
And I should see "3 views" in the "URL name" "table_row"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Course 1"
When I follow "Complete report"
And I should see "4 views"
@@ -110,12 +110,12 @@ Feature: View the user page for the outline report
And I follow "URL name"
And I follow "URL name"
And I follow "URL name"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Course 1"
When I follow "Outline report"
Then I should see "4 views" in the "Folder name" "table_row"
And I should see "3 views" in the "URL name" "table_row"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
And I follow "Course 1"
When I follow "Complete report"
And I should see "4 views"
report/usersessions/tests/behat/usersessions_report.feature
+1 -1
View File
@@ -7,6 +7,6 @@ Feature: In a report, admin can see current sessions
@javascript
Scenario: Check usersessions report shows current session
Given I log in as "admin"
And I follow "My profile" in the user menu
And I follow "Profile" in the user menu
When I follow "Browser sessions"
Then I should see "Current session"
repository/recent/tests/behat/add_recent.feature
+1 -1
View File
@@ -10,7 +10,7 @@ Feature: Recent files repository lists the recently used files
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And I log in as "admin"
And I follow "Manage my private files"
And I follow "Manage private files"
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I upload "lib/tests/fixtures/upload_users.csv" file to "Files" filemanager
And I press "Save changes"
repository/tests/behat/cancel_add_file.feature
+1 -1
View File
@@ -10,7 +10,7 @@ Feature: A selected file can be cancelled
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And I log in as "admin"
And I follow "Manage my private files"
And I follow "Manage private files"
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I press "Save changes"
And I am on site homepage
repository/tests/behat/create_shortcut.feature
+1 -1
View File
@@ -16,7 +16,7 @@ Feature: Create shortcuts
| user | course | role |
| teacher1 | C1 | editingteacher |
When I log in as "teacher1"
And I follow "Manage my private files"
And I follow "Manage private files"
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
Then I should see "empty.txt" in the "div.fp-content" "css_element"
And I press "Save changes"
repository/tests/behat/delete_files.feature
+3 -3
View File
@@ -7,15 +7,15 @@ Feature: Delete files and folders from the file manager
@javascript @_bug_phantomjs
Scenario: Delete a file and a folder
Given I log in as "admin"
And I follow "Manage my private files"
And I follow "Manage private files"
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I create "Delete me" folder in "Files" filemanager
And I press "Save changes"
And I follow "Manage my private files"
And I follow "Manage private files"
When I delete "empty.txt" from "Files" filemanager
And I press "Save changes"
Then I should not see "empty.txt"
And I follow "Manage my private files"
And I follow "Manage private files"
And I delete "Delete me" from "Files" filemanager
And I press "Save changes"
And I should not see "Delete me"
repository/tests/behat/overwrite_file.feature
+1 -1
View File
@@ -16,7 +16,7 @@ Feature: Overwrite file feature
| user | course | role |
| teacher1 | C1 | editingteacher |
When I log in as "teacher1"
And I follow "Manage my private files"
And I follow "Manage private files"
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
Then I should see "1" elements in "Files" filemanager
And I upload and overwrite "lib/tests/fixtures/empty.txt" file to "Files" filemanager
repository/upload/tests/behat/upload_file.feature
+1 -1
View File
@@ -10,7 +10,7 @@ Feature: Upload files
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And I log in as "admin"
When I follow "Manage my private files..."
When I follow "Manage private files..."
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
Then I should see "1" elements in "Files" filemanager
And I should see "empty.txt" in the "div.fp-content" "css_element"
user/files.php
+1 -1
View File
@@ -41,7 +41,7 @@ if (empty($returnurl)) {
$context = context_user::instance($USER->id);
require_capability('moodle/user:manageownfiles', $context);
$title = get_string('myfiles');
$title = get_string('privatefiles');
$struser = get_string('user');
$PAGE->set_url('/user/files.php');
user/lib.php
+4 -4
View File
@@ -674,7 +674,7 @@ function user_convert_text_to_menu_items($text, $page) {
$bits[1] = null;
$child->itemtype = "invalid";
} else {
// Nasty hack to replace the my grades with the direct url.
// Nasty hack to replace the grades with the direct url.
if (strpos($bits[1], '/grade/report/mygrades.php') !== false) {
$bits[1] = user_mygrades_url();
}
@@ -818,7 +818,7 @@ function user_get_user_navigation_info($user, $page) {
$myprofile = new stdClass();
$myprofile->itemtype = 'link';
$myprofile->url = new moodle_url('/user/profile.php', array('id' => $user->id));
$myprofile->title = get_string('myprofile');
$myprofile->title = get_string('profile');
$myprofile->pix = "i/user";
$returnobject->navitems[] = $myprofile;
@@ -1030,11 +1030,11 @@ function user_list_view($course, $context) {
}
/**
* Returns the url to use for the "My grades" link in the user navigation.
* Returns the url to use for the "Grades" link in the user navigation.
*
* @param int $userid The user's ID.
* @param int $courseid The course ID if available.
* @return mixed A URL to be directed to for "My grades".
* @return mixed A URL to be directed to for "Grades".
*/
function user_mygrades_url($userid = null, $courseid = SITEID) {
global $CFG, $USER;
user/preferences.php
+1 -1
View File
@@ -15,7 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* My preferences.
* Preferences.
*
* @package core_user
* @copyright 2015 Frédéric Massart - FMCorz.net
user/tests/behat/user_grade_navigation.feature
+7 -7
View File
@@ -1,5 +1,5 @@
@core @core_user
Feature: The student can navigate to the My grades page and user grade report.
Feature: The student can navigate to their grades page and user grade report.
In order to view my grades and the user grade report
As a user
I need to log in and browse to my grades.
@@ -29,16 +29,16 @@ Feature: The student can navigate to the My grades page and user grade report.
| assign | C2 | a4 | Test assignment four | Submit something! | 150 |
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Grades"
And I navigate to "Grades" node in "Course administration"
And I turn editing mode on
And I give the grade "150.00" to the user "Student 1" for the grade item "Test assignment one"
And I give the grade "67.00" to the user "Student 1" for the grade item "Test assignment two"
And I press "Save changes"
And I log out
Scenario: Navigation to My grades and the user grade report.
Scenario: Navigation to Grades and the user grade report.
When I log in as "student1"
And I follow "My grades"
And I follow "Grades"
Then the following should exist in the "overview-grade" table:
| Course name | Grade |
| Course 2 | - |
@@ -50,7 +50,7 @@ Feature: The student can navigate to the My grades page and user grade report.
| Test assignment two | 25.00 % | 67.00 | 0–100 | 67.00 % | 16.75 % |
| Test assignment three | 0.00 %( Empty ) | - | 0–150 | - | 0.00 % |
Scenario: Change My grades settings to go to a custom url.
Scenario: Change Grades settings to go to a custom url.
When I log in as "admin"
And I set the following administration settings values:
| grade_mygrades_report | External URL |
@@ -58,7 +58,7 @@ Feature: The student can navigate to the My grades page and user grade report.
And I log out
And I log in as "student1"
And I follow "Student 1"
And I follow "My grades"
And I follow "Grades"
Then I should see "My badges from Acceptance test site web site"
@javascript
@@ -90,7 +90,7 @@ Feature: The student can navigate to the My grades page and user grade report.
And I log in as "parent1"
And I am on site homepage
And I follow "Student 1"
And I follow "Grades"
And I navigate to "Grades" node in "Users > Student 1"
Then the following should exist in the "overview-grade" table:
| Course name | Grade |
| Course 2 | - |
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2015050100.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2015050400.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.