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

MDL-48936 lang: Changed "My Home" to "Dashboard".

Browse Source 
Part of MDL-45774
This commit is contained in:
Dave Cooper
2015-04-10 17:16:27 +08:00
committed by Adrian Greeve
parent d7551257a0
commit 81d7de1aa1
42 changed files with 88 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/admin_bookmarks/lang/en/block_admin_bookmarks.php
+1 -1
View File
@@ -23,5 +23,5 @@
*/
$string['admin_bookmarks:addinstance'] = 'Add a new admin bookmarks block';
$string['admin_bookmarks:myaddinstance'] = 'Add a new admin bookmarks block to My home';
$string['admin_bookmarks:myaddinstance'] = 'Add a new admin bookmarks block to Dashboard';
$string['pluginname'] = 'Admin bookmarks';
blocks/badges/lang/en/block_badges.php
+1 -1
View File
@@ -27,4 +27,4 @@ $string['pluginname'] = 'My 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';
$string['badges:myaddinstance'] = 'Add a new My latest badges block to My home';
$string['badges:myaddinstance'] = 'Add a new My latest badges block to Dashboard';
blocks/calendar_month/lang/en/block_calendar_month.php
+1 -1
View File
@@ -23,5 +23,5 @@
*/
$string['calendar_month:addinstance'] = 'Add a new calendar block';
$string['calendar_month:myaddinstance'] = 'Add a new calendar block to My home';
$string['calendar_month:myaddinstance'] = 'Add a new calendar block to Dashboard';
$string['pluginname'] = 'Calendar';
blocks/calendar_upcoming/lang/en/block_calendar_upcoming.php
+1 -1
View File
@@ -23,5 +23,5 @@
*/
$string['calendar_upcoming:addinstance'] = 'Add a new upcoming events block';
$string['calendar_upcoming:myaddinstance'] = 'Add a new upcoming events block to My home';
$string['calendar_upcoming:myaddinstance'] = 'Add a new upcoming events block to Dashboard';
$string['pluginname'] = 'Upcoming events';
blocks/comments/lang/en/block_comments.php
+1 -1
View File
@@ -23,6 +23,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['comments:myaddinstance'] = 'Add a new comments block to My home';
$string['comments:myaddinstance'] = 'Add a new comments block to Dashboard';
$string['comments:addinstance'] = 'Add a new comments block';
$string['pluginname'] = 'Comments';
blocks/community/lang/en/block_community.php
+1 -1
View File
@@ -37,7 +37,7 @@ $string['blocks'] = 'Blocks';
$string['cannotselecttopsubject'] = 'Cannot select a top subject level';
$string['comments'] = 'Comments ({$a})';
$string['community:addinstance'] = 'Add a new community finder block';
$string['community:myaddinstance'] = 'Add a new community finder block to My home';
$string['community:myaddinstance'] = 'Add a new community finder block to Dashboard';
$string['contentinfo'] = 'Subject: {$a->subject} - Audience: {$a->audience} - Educational level: {$a->educationallevel}';
$string['continue'] = 'Continue';
$string['contributors'] = ' - Contributors: {$a}';
blocks/course_list/lang/en/block_course_list.php
+1 -1
View File
@@ -27,7 +27,7 @@ $string['allcourses'] = 'Admin user sees all courses';
$string['configadminview'] = 'What should the admin see in the course list block?';
$string['confighideallcourseslink'] = 'Remove the \'All courses\' link under the list of courses. (This setting does not affect the admin view.)';
$string['course_list:addinstance'] = 'Add a new courses block';
$string['course_list:myaddinstance'] = 'Add a new courses block to My home';
$string['course_list:myaddinstance'] = 'Add a new courses block to Dashboard';
$string['hideallcourseslink'] = 'Hide \'All courses\' link';
$string['owncourses'] = 'Admin user sees own courses';
$string['pluginname'] = 'Courses';
blocks/course_overview/lang/en/block_course_overview.php
+1 -1
View File
@@ -28,7 +28,7 @@ $string['collapseall'] = 'Collapse all course lists';
$string['configotherexpanded'] = 'If enabled, other courses will be expanded by default unless overridden by user preferences.';
$string['configpreservestates'] = 'If enabled, the collapsed/expanded states set by the user are stored and used on each load.';
$string['course_overview:addinstance'] = 'Add a new course overview block';
$string['course_overview:myaddinstance'] = 'Add a new course overview block to My home';
$string['course_overview:myaddinstance'] = 'Add a new course overview block to Dashboard';
$string['defaultmaxcourses'] = 'Default maximum courses';
$string['defaultmaxcoursesdesc'] = 'Maximum courses which should be displayed on course overview block, 0 will show all courses';
$string['expandall'] = 'Expand all course lists';
blocks/glossary_random/lang/en/block_glossary_random.php
+1 -1
View File
@@ -27,7 +27,7 @@ $string['askaddentry'] = 'When users can add entries to the glossary, show a lin
$string['askinvisible'] = 'When users cannot edit or view the glossary, show this text (without link)';
$string['askviewglossary'] = 'When users can view the glossary but not add entries, show a link with this text';
$string['glossary_random:addinstance'] = 'Add a new random glossary entry block';
$string['glossary_random:myaddinstance'] = 'Add a new random glossary entry block to My home';
$string['glossary_random:myaddinstance'] = 'Add a new random glossary entry block to Dashboard';
$string['intro'] = 'Make sure you have at least one glossary with at least one entry added to this course. Then you can adjust the following settings';
$string['invisible'] = '(to be continued)';
$string['lastmodified'] = 'Last modified entry';
blocks/html/lang/en/block_html.php
+1 -1
View File
@@ -29,7 +29,7 @@ $string['configclasses_help'] = 'The purpose of this configuration is to aid wit
$string['configcontent'] = 'Content';
$string['configtitle'] = 'Block title';
$string['html:addinstance'] = 'Add a new HTML block';
$string['html:myaddinstance'] = 'Add a new HTML block to My home';
$string['html:myaddinstance'] = 'Add a new HTML block to Dashboard';
$string['leaveblanktohide'] = 'leave blank to hide the title';
$string['newhtmlblock'] = '(new HTML block)';
$string['pluginname'] = 'HTML';
blocks/mentees/lang/en/block_mentees.php
+1 -1
View File
@@ -27,6 +27,6 @@ $string['configtitle'] = 'Block title';
$string['configtitleblankhides'] = 'Block title (no title if blank)';
$string['leaveblanktohide'] = 'leave blank to hide the title';
$string['mentees:addinstance'] = 'Add a new mentees block';
$string['mentees:myaddinstance'] = 'Add a new mentees block to My home';
$string['mentees:myaddinstance'] = 'Add a new mentees block to Dashboard';
$string['newmenteesblock'] = '(new Mentees block)';
$string['pluginname'] = 'Mentees';
blocks/messages/lang/en/block_messages.php
+1 -1
View File
@@ -23,5 +23,5 @@
*/
$string['messages:addinstance'] = 'Add a new messages block';
$string['messages:myaddinstance'] = 'Add a new messages block to My home';
$string['messages:myaddinstance'] = 'Add a new messages block to Dashboard';
$string['pluginname'] = 'Messages';
blocks/mnet_hosts/lang/en/block_mnet_hosts.php
+1 -1
View File
@@ -26,6 +26,6 @@ $string['error_authmnetneeded'] = 'MNet authentication plugin must be enabled to
$string['error_localusersonly'] = 'Remote users can not jump to other MNet network servers from this host';
$string['error_roamcapabilityneeded'] = 'Users need the capability \'Roam to a remote application via MNet\' to see the list of MNet network servers';
$string['mnet_hosts:addinstance'] = 'Add a new network servers block';
$string['mnet_hosts:myaddinstance'] = 'Add a new network servers block to My home';
$string['mnet_hosts:myaddinstance'] = 'Add a new network servers block to Dashboard';
$string['pluginname'] = 'Network servers';
$string['server'] = 'Server';
blocks/myprofile/lang/en/block_myprofile.php
+1 -1
View File
@@ -43,6 +43,6 @@ $string['display_lastaccess'] = 'Display last access';
$string['display_currentlogin'] = 'Display current login';
$string['display_lastip'] = 'Display last IP';
$string['myprofile:addinstance'] = 'Add a new logged in user block';
$string['myprofile:myaddinstance'] = 'Add a new logged in user block to My home';
$string['myprofile:myaddinstance'] = 'Add a new logged in user block to Dashboard';
$string['myprofile_settings'] = 'Visible user information';
$string['pluginname'] = 'Logged in user';
blocks/navigation/lang/en/block_navigation.php
+1 -1
View File
@@ -32,7 +32,7 @@ $string['enabledockdesc'] = 'Allow the user to dock this block';
$string['expansionlimit'] = 'Generate navigation for the following';
$string['linkcategoriesdesc'] = 'Display categories as links';
$string['navigation:addinstance'] = 'Add a new navigation block';
$string['navigation:myaddinstance'] = 'Add a new navigation block to My home';
$string['navigation:myaddinstance'] = 'Add a new navigation block to Dashboard';
$string['pluginname'] = 'Navigation';
$string['trimmode'] = 'Trim mode';
$string['trimmoderight'] = 'Trim characters from the right';
blocks/navigation/tests/behat/expand_my_courses_setting.feature
+11 -7
View File
@@ -22,27 +22,31 @@ Feature: Test expand my courses navigation setting
Scenario: The My Courses branch is expanded on the My Moodle page by default
When I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
Then I should see "c1" in the "Navigation" "block"
And I should see "c2" in the "Navigation" "block"
And I should not see "c3" in the "Navigation" "block"
@javascript
Scenario: The My Courses branch is collapsed when expand my courses is off
Given the following config values are set as admin:
| navexpandmycourses | 0 |
Given I log in as "admin"
And I set the following administration settings values:
| Show My courses expanded on Dashboard | 0 |
And I log out
When I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
Then I should not see "c1" in the "Navigation" "block"
And I should not see "c2" in the "Navigation" "block"
And I should not see "c3" in the "Navigation" "block"
@javascript
Scenario: My Courses can be expanded on the My Moodle page when expand my courses is off
Given the following config values are set as admin:
| navexpandmycourses | 0 |
Given I log in as "admin"
And I set the following administration settings values:
| Show My courses expanded on Dashboard | 0 |
And I log out
When I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
And I should not see "c1" in the "Navigation" "block"
And I should not see "c2" in the "Navigation" "block"
And I should not see "c3" in the "Navigation" "block"
blocks/navigation/tests/behat/view_my_courses.feature
+2 -2
View File
@@ -35,7 +35,7 @@ Feature: View my courses in navigation block
Given the following config values are set as admin:
| navshowmycoursecategories | 0 |
And I log in as "student1"
When I click on "My home" "link" in the "Navigation" "block"
When I click on "Dashboard" "link" in the "Navigation" "block"
Then I should not see "cat1" in the "Navigation" "block"
And I should not see "cat2" in the "Navigation" "block"
And I should see "c1" in the "Navigation" "block"
@@ -50,7 +50,7 @@ Feature: View my courses in navigation block
Given the following config values are set as admin:
| navshowmycoursecategories | 1 |
And I log in as "student1"
When I click on "My home" "link" in the "Navigation" "block"
When I click on "Dashboard" "link" in the "Navigation" "block"
Then I should see "cat1" in the "Navigation" "block"
And I should see "cat3" in the "Navigation" "block"
And I should not see "cat2" in the "Navigation" "block"
blocks/news_items/lang/en/block_news_items.php
+1 -1
View File
@@ -23,5 +23,5 @@
*/
$string['news_items:addinstance'] = 'Add a new latest news block';
$string['news_items:myaddinstance'] = 'Add a new latest news block to My home';
$string['news_items:myaddinstance'] = 'Add a new latest news block to Dashboard';
$string['pluginname'] = 'Latest news';
blocks/online_users/lang/en/block_online_users.php
+1 -1
View File
@@ -25,7 +25,7 @@
$string['configtimetosee'] = 'Number of minutes determining the period of inactivity after which a user is no longer considered to be online.';
$string['online_users:addinstance'] = 'Add a new online users block';
$string['online_users:myaddinstance'] = 'Add a new online users block to My home';
$string['online_users:myaddinstance'] = 'Add a new online users block to Dashboard';
$string['online_users:viewlist'] = 'View list of online users';
$string['periodnminutes'] = 'last {$a} minutes';
$string['pluginname'] = 'Online users';
blocks/private_files/lang/en/block_private_files.php
+1 -1
View File
@@ -25,5 +25,5 @@
$string['pluginname'] = 'My 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 My home';
$string['private_files:myaddinstance'] = 'Add a new my private files block to Dashboard';
blocks/rss_client/lang/en/block_rss_client.php
+1 -1
View File
@@ -66,7 +66,7 @@ $string['rss_client:createprivatefeeds'] = 'Create private RSS feeds';
$string['rss_client:createsharedfeeds'] = 'Create shared RSS feeds';
$string['rss_client:manageanyfeeds'] = 'Manage any RSS feeds';
$string['rss_client:manageownfeeds'] = 'Manage own RSS feeds';
$string['rss_client:myaddinstance'] = 'Add a new RSS feeds block to My home';
$string['rss_client:myaddinstance'] = 'Add a new RSS feeds block to Dashboard';
$string['seeallfeeds'] = 'See all feeds';
$string['sharedfeed'] = 'Shared feed';
$string['shownumentrieslabel'] = 'Max number entries to show per block.';
blocks/settings/lang/en/block_settings.php
+1 -1
View File
@@ -27,4 +27,4 @@
$string['enabledock'] = 'Allow the user to dock this block';
$string['pluginname'] = 'Administration';
$string['settings:addinstance'] = 'Add a new administration block';
$string['settings:myaddinstance'] = 'Add a new administration block to My home';
$string['settings:myaddinstance'] = 'Add a new administration block to Dashboard';
blocks/tags/lang/en/block_tags.php
+1 -1
View File
@@ -72,6 +72,6 @@ $string['showcoursetagsdef'] = 'Display the course tagging features in the tags
$string['suggestedtagthisunit'] = 'Suggested tag to this course:';
$string['tags'] = 'tags';
$string['tags:addinstance'] = 'Add a new tags block';
$string['tags:myaddinstance'] = 'Add a new tags block to My home';
$string['tags:myaddinstance'] = 'Add a new tags block to Dashboard';
$string['tagthisunit'] = 'Tag this course:';
$string['tagunits'] = 'to tag your favourite courses';
blocks/tests/behat/configure_block_throughout_site.feature
+2 -2
View File
@@ -33,12 +33,12 @@ Feature: Add and configure blocks throughout the site
# The first block matching the pattern should be top-left block
And I should see "Comments" in the "//*[@id='region-pre' or @id='block-region-side-pre']/descendant::div[contains(concat(' ', normalize-space(@class), ' '), ' block ')]" "xpath_element"
Scenario: Blocks on the my home page cannot have roles assigned to them
Scenario: Blocks on the dashboard page cannot have roles assigned to them
Given the following "users" exist:
| username | firstname | lastname | email |
| manager1 | Manager | 1 | manager1@asd.com |
And I log in as "manager1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
When I press "Customise this page"
Then I should not see "Assign roles in Navigation block"
lang/en/admin.php
+6 -6
View File
@@ -49,7 +49,7 @@ $string['allowediplist'] = 'Allowed IP list';
$string['allowemailaddresses'] = 'Allowed email domains';
$string['allowframembedding'] = 'Allow frame embedding';
$string['allowframembedding_help'] = 'Allow embedding of this site in frames on external sites. Enabling of this feature is not recommended for security reasons.';
$string['allowguestmymoodle'] = 'Allow guest access to My home';
$string['allowguestmymoodle'] = 'Allow guest access to Dashboard';
$string['allowobjectembed'] = 'Allow EMBED and OBJECT tags';
$string['allowthemechangeonurl'] = 'Allow theme changes in the URL';
$string['allowuserblockhiding'] = 'Allow users to hide blocks';
@@ -132,7 +132,7 @@ $string['configallowblockstodock'] = 'If enabled and supported by the selected t
$string['configallowcategorythemes'] = 'If you enable this, then themes can be set at the category level. This will affect all child categories and courses unless they have specifically set their own theme. WARNING: Enabling category themes may affect performance.';
$string['configallowcoursethemes'] = 'If you enable this, then courses will be allowed to set their own themes. Course themes override all other theme choices (site, user, or session themes)';
$string['configallowemailaddresses'] = 'If you want to restrict all new email addresses to particular domains, then list them here separated by spaces. All other domains will be rejected. To allow subdomains add the domain with a preceding \'.\'. eg <strong>ourcollege.edu.au .gov.au</strong>';
$string['configallowguestmymoodle'] = 'If enabled guests can access My home, otherwise guests are redirected to the site front page.';
$string['configallowguestmymoodle'] = 'If enabled guests can access Dashboard, otherwise guests are redirected to the site front page.';
$string['configallowobjectembed'] = 'As a default security measure, normal users are not allowed to embed multimedia (like Flash) within texts using explicit EMBED and OBJECT tags in their HTML (although it can still be done safely using the mediaplugins filter). If you wish to allow these tags then enable this option.';
$string['configallowoverride'] = 'You can allow people with the roles on the left side to override some of the column roles';
$string['configallowoverride2'] = 'Select which role(s) can be overridden by each role in the left column.<br />Note that these settings only apply to users who have either the capability moodle/role:override or the capability moodle/role:safeoverride allowed.';
@@ -726,17 +726,17 @@ $string['multilangforceold'] = 'Force old multilang syntax: &lt;span&gt; without
$string['mustenablestats'] = 'Statistics have not yet been enabled on this site.';
$string['mycoursesperpage'] = 'Number of courses';
$string['mydashboard'] = 'System default dashboard';
$string['mymoodle'] = 'My home';
$string['mymoodle'] = 'Dashboard';
$string['mymoodleredirect'] = 'Force users to use My Moodle';
$string['mypage'] = 'Default My home page';
$string['mypage'] = 'Default Dashboard page';
$string['myprofile'] = 'Default profile page';
$string['mypagelocked'] = 'Lock default page';
$string['navadduserpostslinks'] = 'Add links to view user posts';
$string['navadduserpostslinks_help'] = 'If enabled two links will be added to each user in the navigation to view discussions the user has started and posts the user has made in forums throughout the site or in specific courses.';
$string['navigationupgrade'] = 'This upgrade introduces two new navigation blocks that will replace these blocks: Administration, Courses, Activities and Participants. If you had set any special permissions on those blocks you should check to make sure everything is behaving as you want it.';
$string['navcourselimit'] = 'Course limit';
$string['navexpandmycourses'] = 'Show My courses expanded on My home';
$string['navexpandmycourses_desc'] = 'If enabled, My courses is initially shown expanded in the navigation block on My home.';
$string['navexpandmycourses'] = 'Show My courses expanded on Dashboard';
$string['navexpandmycourses_desc'] = 'If enabled, My courses is initially shown expanded in the navigation block on Dashboard.';
$string['navshowfullcoursenames'] = 'Show course full names';
$string['navshowfullcoursenames_help'] = 'If enabled, course full names will be used in the navigation rather than short names.';
$string['navshowfrontpagemods'] = 'Show front page activities in the navigation';
lang/en/moodle.php
+1 -1
View File
@@ -1213,7 +1213,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['myhome'] = 'My home';
$string['myhome'] = 'Dashboard';
$string['mymoodledashboard'] = 'My Moodle dashboard';
$string['myprofile'] = 'My profile';
$string['name'] = 'Name';
lang/en/my.php
+2 -2
View File
@@ -22,9 +22,9 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['mymoodle'] = 'My home';
$string['mymoodle'] = 'Dashboard';
$string['nocourses'] = 'No course information to show.';
$string['noguest'] = 'The My home page is not available to guest users';
$string['noguest'] = 'The Dashboard page is not available to guest users';
$string['pinblocks'] = 'Configure pinned blocks for my moodle';
$string['pinblocksexplan'] = 'Any block settings you configure here will be visible (and non-editable) for any user of moodle on their \'My Moodle\' overview page.';
$string['defaultpage'] = 'Default My Moodle page';
lang/en/pagetype.php
+1 -1
View File
@@ -33,7 +33,7 @@ $string['page-course-x'] = 'Any course page';
$string['page-course-report-x'] = 'Any course report';
$string['page-mod-x'] = 'Any activity module page';
$string['page-mod-x-view'] = 'Any main activity module page';
$string['page-my-index'] = 'My home page';
$string['page-my-index'] = 'Dashboard page';
$string['page-report-x'] = 'Any report page';
$string['page-site-index'] = 'The front page only';
$string['page-site-x'] = 'Any top-level site page';
lang/en/role.php
+2 -2
View File
@@ -248,8 +248,8 @@ $string['manageroles'] = 'Manage roles';
$string['maybeassignedin'] = 'Context types where this role may be assigned';
$string['morethan'] = 'More than {$a}';
$string['multipleroles'] = 'Multiple roles';
$string['my:manageblocks'] = 'Manage My home page blocks';
$string['my:configsyspages'] = 'Configure system templates for My home pages';
$string['my:manageblocks'] = 'Manage Dashboard page blocks';
$string['my:configsyspages'] = 'Configure system templates for Dashboard pages';
$string['neededroles'] = 'Roles with permission';
$string['nocapabilitiesincontext'] = 'No capabilities available in this context';
$string['noneinthisx'] = 'None in this {$a}';
lib/tests/user_menu_test.php
+1 -1
View File
@@ -92,7 +92,7 @@ test
// We always add two dividers as standard.
$dividercount += 2;
// The basic entry count will additionally include the wrapper menu, My home, My profile, and the Logout link.
// The basic entry count will additionally include the wrapper menu, Dashboard, My profile, and the Logout link.
$entrycount += 4;
$output = $OUTPUT->user_menu($USER);
lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js
Vendored
+2 -2
View File
@@ -49,7 +49,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
this.samenodeclass = CSS.BLOCK;
this.parentnodeclass = CSS.REGIONCONTENT;
// Add relevant classes and ID to 'content' block region on My Home page.
// Add relevant classes and ID to 'content' block region on Dashboard page.
var myhomecontent = Y.Node.all('body#'+CSS.MYINDEX+' #'+CSS.REGIONMAIN+' > .'+CSS.REGIONCONTENT);
if (myhomecontent.size() > 0) {
var contentregion = myhomecontent.item(0);
@@ -453,7 +453,7 @@ MANAGER.prototype = {
this.samenodeclass = CSS.BLOCK;
this.parentnodeclass = CSS.BLOCKREGION;
// Add relevant classes and ID to 'content' block region on My Home page.
// Add relevant classes and ID to 'content' block region on Dashboard page.
var myhomecontent = Y.Node.all('body#'+CSS.MYINDEX+' #'+CSS.REGIONMAIN+' > .'+CSS.REGIONCONTENT);
if (myhomecontent.size() > 0) {
var contentregion = myhomecontent.item(0);
lib/yui/build/moodle-core-blocks/moodle-core-blocks.js
Vendored
+2 -2
View File
@@ -49,7 +49,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
this.samenodeclass = CSS.BLOCK;
this.parentnodeclass = CSS.REGIONCONTENT;
// Add relevant classes and ID to 'content' block region on My Home page.
// Add relevant classes and ID to 'content' block region on Dashboard page.
var myhomecontent = Y.Node.all('body#'+CSS.MYINDEX+' #'+CSS.REGIONMAIN+' > .'+CSS.REGIONCONTENT);
if (myhomecontent.size() > 0) {
var contentregion = myhomecontent.item(0);
@@ -449,7 +449,7 @@ MANAGER.prototype = {
this.samenodeclass = CSS.BLOCK;
this.parentnodeclass = CSS.BLOCKREGION;
// Add relevant classes and ID to 'content' block region on My Home page.
// Add relevant classes and ID to 'content' block region on Dashboard page.
var myhomecontent = Y.Node.all('body#'+CSS.MYINDEX+' #'+CSS.REGIONMAIN+' > .'+CSS.REGIONCONTENT);
if (myhomecontent.size() > 0) {
var contentregion = myhomecontent.item(0);
lib/yui/src/blocks/js/blocks.js
Vendored
+1 -1
View File
@@ -47,7 +47,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
this.samenodeclass = CSS.BLOCK;
this.parentnodeclass = CSS.REGIONCONTENT;
// Add relevant classes and ID to 'content' block region on My Home page.
// Add relevant classes and ID to 'content' block region on Dashboard page.
var myhomecontent = Y.Node.all('body#'+CSS.MYINDEX+' #'+CSS.REGIONMAIN+' > .'+CSS.REGIONCONTENT);
if (myhomecontent.size() > 0) {
var contentregion = myhomecontent.item(0);
lib/yui/src/blocks/js/manager.js
Vendored
+1 -1
View File
@@ -65,7 +65,7 @@ MANAGER.prototype = {
this.samenodeclass = CSS.BLOCK;
this.parentnodeclass = CSS.BLOCKREGION;
// Add relevant classes and ID to 'content' block region on My Home page.
// Add relevant classes and ID to 'content' block region on Dashboard page.
var myhomecontent = Y.Node.all('body#'+CSS.MYINDEX+' #'+CSS.REGIONMAIN+' > .'+CSS.REGIONCONTENT);
if (myhomecontent.size() > 0) {
var contentregion = myhomecontent.item(0);
mod/assign/tests/behat/grading_status.feature
+6 -6
View File
@@ -31,7 +31,7 @@ Feature: View the grading status of an assignment
And I log out
# Add a submission.
And I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
And I click on ".collapsibleregioncaption" "css_element"
And I should see "Not marked"
And I follow "Course 1"
@@ -42,7 +42,7 @@ Feature: View the grading status of an assignment
And I set the following fields to these values:
| Online text | I'm the student's first submission |
And I press "Save changes"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
And ".collapsibleregioncaption" "css_element" should not exist
And I should not see "Not marked"
And I log out
@@ -66,7 +66,7 @@ Feature: View the grading status of an assignment
And I follow "Test assignment name"
And I should see "In review" in the "Grading status" "table_row"
And I should not see "Great job! Lol, not really."
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
And ".collapsibleregioncaption" "css_element" should not exist
And I should not see "In review"
And I log out
@@ -88,7 +88,7 @@ Feature: View the grading status of an assignment
And I follow "Test assignment name"
And I should see "Released" in the "Grading status" "table_row"
And I should see "Great job! Lol, not really."
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
And ".collapsibleregioncaption" "css_element" should not exist
And I should not see "Released"
And I log out
@@ -121,7 +121,7 @@ Feature: View the grading status of an assignment
And I log out
# Add a submission.
And I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
When I click on ".collapsibleregioncaption" "css_element"
Then I should see "Not graded"
And I follow "Course 1"
@@ -152,7 +152,7 @@ Feature: View the grading status of an assignment
And I follow "Test assignment name"
And I should see "Graded" in the "Grading status" "table_row"
And I should see "Great job! Lol, not really."
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
And ".collapsibleregioncaption" "css_element" should not exist
And I should not see "Graded"
And I log out
mod/lesson/tests/behat/lesson_number_of_student_attempts.feature
+5 -5
View File
@@ -1,9 +1,9 @@
@mod @mod_lesson
Feature: In My home, teacher can see the number of student attempts to lessons
Feature: In Dashboard, teacher can see the number of student attempts to lessons
In order to know the number of student attempts to a lesson
As a teacher
I need to see it in My home
I need to see it in Dashboard
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
@@ -141,7 +141,7 @@ Feature: In My home, teacher can see the number of student attempts to lessons
And I should see "Your score is 2 (out of 3)."
And I log out
And I log in as "teacher1"
When I click on "My home" "link" in the "Navigation" "block"
When I click on "Dashboard" "link" in the "Navigation" "block"
Then I should see "You have lessons that are due"
And I click on ".collapsibleregioncaption" "css_element"
And I should see "3 attempts"
And I should see "3 attempts"
mod/scorm/lang/en/scorm.php
+4 -4
View File
@@ -51,8 +51,8 @@ $string['asset'] = 'Asset';
$string['assetlaunched'] = 'Asset - Viewed';
$string['attempt'] = 'Attempt';
$string['attempts'] = 'Attempts';
$string['attemptstatusall'] = 'My home and entry page';
$string['attemptstatusmy'] = 'My home only';
$string['attemptstatusall'] = 'Dashboard and entry page';
$string['attemptstatusmy'] = 'Dashboard only';
$string['attemptstatusentry'] = 'Entry page only';
$string['attemptsx'] = '{$a} attempts';
$string['attemptsmanagement'] = 'Attempts management';
@@ -104,8 +104,8 @@ $string['display'] = 'Display package';
$string['displayactivityname'] = 'Display activity name';
$string['displayactivityname_help'] = 'Whether or not to display the activity name above the SCORM player.';
$string['displayattemptstatus'] = 'Display attempt status';
$string['displayattemptstatus_help'] = 'This preference allows a summary of the users attempts to show in the course overview block in My home and/or the SCORM entry page.';
$string['displayattemptstatusdesc'] = 'Whether a summary of the user\'s attempts is shown in the course overview block in My home and/or the SCORM entry page.';
$string['displayattemptstatus_help'] = 'This preference allows a summary of the users attempts to show in the course overview block in Dashboard and/or the SCORM entry page.';
$string['displayattemptstatusdesc'] = 'Whether a summary of the user\'s attempts is shown in the course overview block in Dashboard and/or the SCORM entry page.';
$string['displaycoursestructure'] = 'Display course structure on entry page';
$string['displaycoursestructure_help'] = 'If enabled, the table of contents is displayed on the SCORM outline page.';
$string['displaycoursestructuredesc'] = 'If enabled, the table of contents is displayed on the SCORM outline page.';
my/tests/behat/add_blocks.feature
+5 -5
View File
@@ -1,8 +1,8 @@
@core @core_my
Feature: Add blocks to my home page
In order to add more functionality to my home page
Feature: Add blocks to dashboard page
In order to add more functionality to dashboard page
As a user
I need to add blocks to my home page
I need to add blocks to dashboard page
Background:
Given the following "users" exist:
@@ -17,7 +17,7 @@ Feature: Add blocks to my home page
| student1 | C1 | student |
| student2 | C1 | student |
And I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
Scenario: Add blocks to page
When I press "Customise this page"
@@ -25,4 +25,4 @@ Feature: Add blocks to my home page
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 "Calendar" in the "Calendar" "block"
And I should see "Upcoming events" in the "Upcoming events" "block"
And I should see "Upcoming events" in the "Upcoming events" "block"
my/tests/behat/reset_page.feature
+5 -5
View File
@@ -1,8 +1,8 @@
@core @core_my
Feature: Reset my home page to default
In order to remove customisations from my home page
Feature: Reset dashboard page to default
In order to remove customisations from dashboard page
As a user
I need to reset my home page
I need to reset dashboard page
Background:
Given the following "users" exist:
@@ -17,7 +17,7 @@ Feature: Reset my home page to default
| student1 | C1 | student |
| student2 | C1 | student |
And I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
Scenario: Add blocks to page and reset
When I press "Customise this page"
@@ -29,4 +29,4 @@ Feature: Reset my home page to default
And I should see "Calendar"
And I should see "Upcoming events"
And I should not see "Comments"
And I should not see "Reset page to default"
And I should not see "Reset page to default"
my/tests/behat/restrict_available_blocks.feature
+6 -6
View File
@@ -1,5 +1,5 @@
@core @core_my
Feature: Restrict which blocks can be added to My home
Feature: Restrict which blocks can be added to Dashboard
In order to restrict which blocks can be added
As a student I need to ensure I can add the blocks
As an admin I need to remove the capability to add a blocks
@@ -16,9 +16,9 @@ Feature: Restrict which blocks can be added to My home
| user | course | role |
| student1 | C1 | student |
Scenario: The comments block can be added to My home by default
Scenario: The comments block can be added to Dashboard by default
And I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
And I press "Customise this page"
Then the "Add a block" select box should contain "Comments"
And the "Add a block" select box should contain "Courses"
@@ -26,7 +26,7 @@ Feature: Restrict which blocks can be added to My home
And the "Add a block" select box should contain "Tags"
@javascript
Scenario: Remove the ability to add the comments block to My home
Scenario: Remove the ability to add the comments block to Dashboard
When I log in as "admin"
And I set the following system permissions of "Authenticated user" role:
| block/comments:myaddinstance | Prohibit |
@@ -34,9 +34,9 @@ Feature: Restrict which blocks can be added to My home
| block/html:myaddinstance | Prohibit |
And I log out
And I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
And I press "Customise this page"
Then the "Add a block" select box should not contain "Comments"
And the "Add a block" select box should not contain "Courses"
And the "Add a block" select box should not contain "HTML"
And the "Add a block" select box should contain "Tags"
And the "Add a block" select box should contain "Tags"
user/lib.php
+1 -1
View File
@@ -801,7 +801,7 @@ function user_get_user_navigation_info($user, $page) {
}
}
// Links: My Home.
// Links: Dashboard.
$myhome = new stdClass();
$myhome->itemtype = 'link';
$myhome->url = new moodle_url('/my/');
user/tests/behat/edituserpassword.feature
+1 -1
View File
@@ -7,7 +7,7 @@ Feature: Enable/disable password field based on authentication selected.
@javascript
Scenario: Verify the password field is enabled/disabled based on authentication selected, in user edit advanced page.
Given I log in as "admin"
And I click on "My home" "link" in the "Navigation" "block"
And I click on "Dashboard" "link" in the "Navigation" "block"
When I navigate to "Add a new user" node in "Site administration > Users > Accounts"
Then the "newpassword" "field" should be enabled
And I set the field "auth" to "Web services authentication"