Moodle release 3.11

Moodle release 3.11rc2
Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE
2021-05-15 18:10:59 +02:00 · 2021-05-14 11:09:10 +02:00 · 2021-05-14 11:09:07 +02:00 · 2021-05-14 00:07:33 +00:00 · 2021-05-13 22:40:15 +01:00 · 2021-05-13 11:45:41 +02:00
853 changed files with 1071 additions and 38092 deletions
@@ -9,7 +9,7 @@ on:
      - v[0-9]+.[0-9]+.[0-9]+*

 env:
-  php: 7.4
+  php: 8.0

 jobs:
  Grunt:
@@ -55,10 +55,12 @@ jobs:
        include:
          - os: ubuntu-18.04
            php: 7.3
+            extensions:
            db: mysqli
          - os: ubuntu-18.04
-            php: 7.4
+            php: 8.0
            db: pgsql
+            extensions: xmlrpc-beta

    steps:
      - name: Setting up DB mysql
@@ -88,6 +90,7 @@ jobs:
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php }}
+          extensions: ${{ matrix.extensions }}
          ini-values: max_input_vars=5000
          coverage: none

@@ -46,20 +46,20 @@ jobs:
          php: 7.3
          env: DB=mysqli   TASK=PHPUNIT

-        # Then, conditionally, all the highest php ones (7.4)
+        # Then, conditionally, all the highest php ones (8.0)
        - if: env(MOODLE_PHP) = "all"
-          php: 7.4
+          php: 8.0
          env: DB=none     TASK=CITEST
        - if: env(MOODLE_PHP) = "all"
-          php: 7.4
+          php: 8.0
          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'

        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
-          php: 7.4
+          php: 8.0
          env: DB=pgsql    TASK=PHPUNIT

        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 7.4
+          php: 8.0
          env: DB=mysqli   TASK=PHPUNIT

 cache:
@@ -118,6 +118,8 @@ install:
        fi

 before_script:
+    - if [[ ${TRAVIS_PHP_VERSION:0:1} -gt 7 ]]; then pecl install xmlrpc-beta; fi
+    - echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
    - phpenv config-rm xdebug.ini
    - >
      if [ "$TASK" = 'PHPUNIT' ];
@@ -187,10 +189,9 @@ before_script:
        sed -i \
          -e "/require_once/i \\define('TEST_CACHESTORE_REDIS_TESTSERVERS', '127.0.0.1');" \
          config.php ;
-        # Redis session tests, but not for PHP 7.2 and up. See MDL-60978 for more info.
-        redissession="define('TEST_SESSION_REDIS_HOST', '127.0.0.1');"
+        # Redis session tests
        sed -i \
-          -e "/require_once/i \\${redissession}" \
+          -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
          config.php ;

        # Initialise PHPUnit for Moodle.
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_analytics'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'tool_availabilityconditions';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;   // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;   // Requires this Moodle version
+$plugin->version   = 2021051700;   // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;   // Requires this Moodle version.
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)
@@ -1,7 +1,23 @@
-# Accessibility plugin #
+# Brickfield accessibility tool plugin #
+
+Copyright (C) 2021 [Brickfield Education Labs](https://www.brickfield.ie/)

 The Accessibility admin tool plugin provides a simple means of checking content for any accessibility issues.

+Created by an enthusiastic team from Brickfield Education Labs, including:
+* Karen Holland
+* Gavin Henrick
+* Mike Churchward
+* Renée Mackey
+* Laia Joana Canet
+* Jay Churchward
+* Paul Ffrench
+* Holly Lynn
+* Michael Pound
+* Max Larkin
+
+with a little help from our friends.
+
 Portions of the htmlchecker files were derived from the ["Quail PHP Accessibility Library"](https://code.google.com/archive/p/quail-lib/).
 The Quail library (Copyright (C) 2009 Kevin Miller) is licensed under [GNU GPL v3](http://www.gnu.org/licenses/gpl.html).
 See the LICENSE_QUAIL.txt file in this directory for original Quail license information.
@@ -85,6 +85,12 @@ class brickfieldconnect extends curl {
        }

        $headers = $this->get_common_headers();
+
+        // Sanity-check $headers 'id' value.
+        if (!isset($headers['id'])) {
+            return false;
+        }
+
        $this->set_headers($headers);
        $summary = accessibility::get_summary_data($headers['id']);
        $body = json_encode($summary, JSON_UNESCAPED_SLASHES);
@@ -249,4 +255,4 @@ class brickfieldconnect extends curl {
            return self::$baseapiuri;
        }
    }
-}
+}
@@ -31,7 +31,7 @@ $string['accessibilitydisabled'] = 'The Brickfield accessibility toolkit is not
 $string['accessibilityreport'] = 'Accessibility toolkit';
 $string['analysistype'] = 'Enable analysis requests';
 $string['analysistypedisabled'] = 'Content analysis is disabled';
-$string['analysistype_desc'] = 'Prevent content analysis from being requested';
+$string['analysistype_desc'] = 'Allow content accessibility analysis to be requested';
 $string['analysis:disabled'] = 'Disabled';
 $string['analysis:byrequest'] = 'By request';
 $string['brickfield'] = 'Brickfield toolkit';
@@ -65,13 +65,13 @@ $string['contextid'] = 'Contextid';
 $string['core_course'] = 'Course';
 $string['core_question'] = 'Question banks';
 $string['count'] = 'Count';
-$string['coursecount'] = 'Num of courses';
+$string['coursecount'] = 'Number of courses';
 $string['deletehistoricaldata'] = 'Delete historical checks results';
 $string['dependency'] = 'Dependent on';
 $string['emptycategory'] = 'No courses found for category {$a}';
 $string['emptytagcourses'] = 'No results found for courses with configured tags';
 $string['enableaccessibilitytools'] = 'Enable accessibility tools';
-$string['enableaccessibilitytools_desc'] = 'Provides tools to help ensure accessible content for your site';
+$string['enableaccessibilitytools_desc'] = 'The accessibility toolkit helps identify accessibility issues in courses.';
 $string['errorlink'] = 'Edit error instance for {$a}';
 $string['errors'] = 'Errors: {$a}';
 $string['eventanalysis_requested'] = 'Content analysis requested';
@@ -93,7 +93,7 @@ $string['invalidcourseid'] = 'Invalid course, please check your input';
 $string['invalidlinkphrases'] = 'click|click here|here|more|more here|info|info here|information|information here|read more|read more here|further information|further information here|further details|further details here';
 $string['module'] = 'Module';
 $string['modulename'] = 'Name';
-$string['noerrorsfound'] = 'No common accessibility errors were found for your search parameters, congratulations!';
+$string['noerrorsfound'] = 'No common accessibility errors were found for your search parameters. Congratulations!';
 $string['norecords'] = 'No relevant records were found for your search parameters.';
 $string['notregistered'] = 'Your accessibility toolkit needs to be registered.';
 $string['notvalidated'] = 'Your accessibility toolkit is functional while being validated.';
@@ -109,18 +109,18 @@ $string['perpage'] = 'Items to show per page';
 $string['privacy:metadata'] = 'The Accessibility checks report plugin does not store any personal data.';
 $string['processanalysisrequests'] = 'Process content analysis requests';
 $string['registernow'] = 'Please register now.';
-$string['registrationinfo'] = '<p>This registration process allows you to use the Brickfield accessibility toolkit freemium version for your registered Moodle site.</p><p>This usage is subject to these <a href="{$a}" target="_blank">terms and conditions (opens in new window)</a> and which you agree to, by using this product.</p>';
+$string['registrationinfo'] = '<p>This registration process allows you to use the Brickfield accessibility toolkit starter version for your registered Moodle site.</p><p>This usage is subject to the <a href="{$a}" target="_blank">Brickfield Education Labs terms and conditions (opens in new window)</a> and which you agree to, by using this product.</p>';
 $string['remaining'] = ' ({$a} errors remaining)';
 $string['response:0'] = 'This URL doesn\'t point anywhere';
 $string['response:404'] = 'This URL page was not found';
-$string['schedule:blocknotscheduled'] = '<p>This course has not yet been scheduled for analysis, to find common accessibility issues.</p><p>Please view the <a href="{$a}">Accessibility toolkit help page</a> for further details.</p>';
-$string['schedule:notscheduled'] = '<p>This course has not yet been scheduled for analysis, to find common accessibility issues.</p><p>By clicking on the "Submit for analysis" button, you confirm that you want all your relevant course HTML content, such as course section descriptions, activity descriptions, questions, pages, and more, to be scheduled for analysis.</p><p>This analysis will conduct multiple common accessibility checks on your course HTML content, and those results will then display on these Accessibility toolkit report pages.</p><p>Please view the <a href="{$a}">Accessibility toolkit help page</a> for further details.</p><p>This analysis will be processed in the background, by the Moodle scheduled tasks, so its speed of completion will depend on task timings and task run schedules.';
+$string['schedule:blocknotscheduled'] = '<p>This course has not yet been scheduled for analysis, to find common accessibility issues.</p>';
+$string['schedule:notscheduled'] = '<p>This course has not yet been scheduled for analysis to find common accessibility issues.</p><p>By clicking on the "Submit for analysis" button, you confirm that you want all your relevant course HTML content, such as course section descriptions, activity descriptions, questions, pages, and more, to be scheduled for analysis.</p><p>This analysis will conduct multiple common accessibility checks on your course HTML content, and those results will then display on these accessibility toolkit report pages. The analysis will be processed in the background, by scheduled tasks, so its speed of completion will depend on task timings and task run schedules.</p>';
 $string['schedule:requestanalysis'] = 'Submit for analysis';
 $string['schedule:scheduled'] = 'This course has been scheduled for analysis.';
-$string['schedule:sitenotscheduled'] = 'The global (course independent) content has not yet been scheduled for analysis, to find common accessibility issues.</p><p>By clicking on the "Submit for analysis" button, you confirm that you want all your relevant global (course independant) content to be scheduled for analysis.</p><p>This analysis will conduct multiple common accessibility checks on this content, and those results will then display on these Accessibility toolkit report pages.</p><p>Please view the <a href="{$a}">Accessibility toolkit help page</a> for further details.</p><p>This analysis will be processed in the background, by the Moodle scheduled tasks, so its speed of completion will depend on task timings and task run schedules.';
+$string['schedule:sitenotscheduled'] = '<p>The global (course independent) content has not yet been scheduled for analysis to find common accessibility issues.</p><p>By clicking on the "Submit for analysis" button, you confirm that you want all your relevant global (course independent) content to be scheduled for analysis.</p><p>This analysis will conduct multiple common accessibility checks on this content, and those results will then display on these accessibility toolkit report pages. The analysis will be processed in the background, by scheduled tasks, so its speed of completion will depend on task timings and task run schedules.</p>';
 $string['schedule:sitescheduled'] = 'The global (course independent) content has been scheduled for analysis.';
 $string['settings'] = 'Accessibility toolkit settings';
-$string['taberrors'] = 'Check Errors';
+$string['taberrors'] = 'Check errors';
 $string['targetavetitle'] = 'Average errors per activity';
 $string['targetpercentage'] = 'Percentage of instances passed/not per activity';
 $string['targetratio'] = 'Activity pass ratio';
@@ -138,9 +138,7 @@ $string['tblpercentage'] = 'Percentage';
 $string['tblpreview'] = 'Preview';
 $string['tbltarget'] = 'Activity';
 $string['tblupdateto'] = 'Update to';
-$string['termsandconditions'] = '<p>These are the terms and conditions you agree to... blah blah...</p>';
-$string['termsandconditionslink'] = 'terms and conditions';
-$string['titleerrorscount'] = 'Error details:&nbsp;(showing first {$a} errors)';
+$string['titleerrorscount'] = 'Error details: (showing first {$a} errors)';
 $string['titleactivityresultsall'] = 'Results per activity: all reviewed courses ({$a->count} courses)';
 $string['titleactivityresultspartial'] = 'Results per activity: course {$a->name}';
 $string['titleall'] = 'Error details: all reviewed courses ({$a->count} courses)';
@@ -163,90 +161,72 @@ $string['messageprovider:warningcheckid'] = 'Warning of invalid checkids';
 $string['warningcheckidbody'] = 'There is an issue with a Brickfield check
 which is active but not listed in the database. Please investigate.';
 $string['warningcheckidsubject'] = 'Brickfield Toolkit checkID warning';
-$string['warningscontact'] = 'Email address for receiving warnings';
-$string['warningscontact_desc'] = 'An email address to receive any Brickfield Toolkit warnings';

 // Check descriptions.
-$string['checkdesc:alinksdontopennewwindow'] = 'Links opening into a new window should warn users in advance';
-$string['checkdesc:amustcontaintext'] = 'A link needs to contain text to be perceivable';
-$string['checkdesc:areadontopennewwindow'] = 'Areas, used in image maps, opening into a new window should warn users in advance';
-$string['checkdesc:areahasaltvalue'] = 'Areas, used in image maps, should not be missing "alt" (alternative) text, similar to images';
-$string['checkdesc:asuspiciouslinktext'] = 'Link text should be descriptive and provide context about its destination';
-$string['checkdesc:basefontisnotused'] = 'Basefont elements (traditionally used for formatting) are not accessible and should not be used';
-$string['checkdesc:blinkisnotused'] = 'Blink elements, which blink on and off, are not accessible and should not be used';
-$string['checkdesc:boldisnotused'] = '"Bold" (b) elements should not be used, "strong" should be used instead';
-$string['checkdesc:contenttoolong'] = 'Overall page content length should not exceed 500 words.';
-$string['checkdesc:csstexthascontrast'] = 'Color contrast between the text and background is too low';
-$string['checkdesc:embedhasassociatednoembed'] = 'Embed elements (for embedding multimedia) should not be missing their corresponding "noembed" elements';
-$string['checkdesc:headerh3'] = 'Headers following after H3 headers (the editor large header option) should not break the page heading hierarchy';
-$string['checkdesc:headershavetext'] = 'A header needs to contain text to be perceivable';
-$string['checkdesc:iisnotused'] = '"Italic" (i) elements should not be used, "em" should be used instead';
-$string['checkdesc:imgaltisdifferent'] = 'Image Alt (Alternative) Text should not be the image filename';
-$string['checkdesc:imgaltistoolong'] = 'Image Alt (Alternative) Text should not be more than the maximum allowed (125) characters';
-$string['checkdesc:imgaltnotemptyinanchor'] = 'Image Alt (Alternative) Text should not be empty, especially when image is a link going elsewhere';
-$string['checkdesc:imgaltnotplaceholder'] = 'Image Alt (Alternative) Text should not be a simple placeholder text, such as "image"';
-$string['checkdesc:imghasalt'] = 'Image Alt (Alternative) Text should not missing for image elements, unless purely decorative with no meaning';
-$string['checkdesc:imgwithmaphasusemap'] = 'Image maps, with clickable areas, need matching "usemap" and "map" elements';
-$string['checkdesc:legendtextnotempty'] = '"Legend" elements, used for captioning fieldset elements, should contain text';
-$string['checkdesc:marqueeisnotused'] = '"Marquee" (auto-scrolling) elements are not accessible and should not be used';
-$string['checkdesc:noheadings'] = 'No headers makes content less structured and harder to read';
-$string['checkdesc:objectmusthaveembed'] = '"Object" elements (for embedding external resources) should not be missing their corresponding "embed" elements';
-$string['checkdesc:objectmusthavetitle'] = '"Object" elements (for embedding external resources) should not be missing their corresponding "title" descriptions';
-$string['checkdesc:objectmusthavevalidtitle'] = '"Object" elements (for embedding external resources) should have corresponding "titles" with text';
-$string['checkdesc:strikeisnotused'] = '"Strike" (strike-through) elements should not be used, "del" (deleted) should be used instead';
-$string['checkdesc:tabledatashouldhaveth'] = 'Tables ideally should not be missing headers';
-$string['checkdesc:tablesummarydoesnotduplicatecaption'] = 'Table "summaries" and "captions" should not be identical';
-$string['checkdesc:tabletdshouldnotmerge'] = 'Tables ideally should not have any merged cells';
-$string['checkdesc:tablethshouldhavescope'] = 'Table row or column "scopes" (used to map row and column to each cell) should be declared';
+$string['checkdesc:alinksdontopennewwindow'] = 'Links opening into a new window should warn users in advance.';
+$string['checkdesc:amustcontaintext'] = 'A link needs to contain text to be perceivable.';
+$string['checkdesc:areadontopennewwindow'] = 'Areas, used in image maps, opening into a new window should warn users in advance.';
+$string['checkdesc:areahasaltvalue'] = 'Areas, used in image maps, should not be missing alt (alternative) text, similar to images.';
+$string['checkdesc:asuspiciouslinktext'] = 'Link text should be descriptive and provide context about its destination.';
+$string['checkdesc:basefontisnotused'] = 'Basefont elements (traditionally used for formatting) are not accessible and should not be used.';
+$string['checkdesc:blinkisnotused'] = 'Blink elements, which blink on and off, are not accessible and should not be used.';
+$string['checkdesc:boldisnotused'] = 'Bold (b) elements should not be used; "strong" should be used instead.';
+$string['checkdesc:contenttoolong'] = 'The overall page content length should not exceed 500 words.';
+$string['checkdesc:csstexthascontrast'] = 'The colour contrast between the text and background is too low.';
+$string['checkdesc:embedhasassociatednoembed'] = 'Embed elements (for embedding multimedia) should not be missing their corresponding "noembed" elements.';
+$string['checkdesc:headerh3'] = 'Headers following after H3 headers (the editor large header option) should not break the page heading hierarchy.';
+$string['checkdesc:headershavetext'] = 'A header needs to contain text to be perceivable.';
+$string['checkdesc:iisnotused'] = 'Italic (i) elements should not be used; "em" should be used instead.';
+$string['checkdesc:imgaltisdifferent'] = 'Image alt (alternative) text should not be the image filename.';
+$string['checkdesc:imgaltistoolong'] = 'Image alt (alternative) text should not be more than the maximum allowed (125) characters.';
+$string['checkdesc:imgaltnotemptyinanchor'] = 'Image alt (alternative) text should not be empty, especially when the image has a link going elsewhere.';
+$string['checkdesc:imgaltnotplaceholder'] = 'Image alt (alternative) text should not be a simple placeholder text, such as "image".';
+$string['checkdesc:imghasalt'] = 'Image alt (alternative) text should not be missing for image elements, unless purely decorative with no meaning.';
+$string['checkdesc:imgwithmaphasusemap'] = 'Image maps, with clickable areas, need matching "usemap" and "map" elements.';
+$string['checkdesc:legendtextnotempty'] = 'Legend elements, used for captioning fieldset elements, should contain text.';
+$string['checkdesc:marqueeisnotused'] = 'Marquee (auto-scrolling) elements are not accessible and should not be used.';
+$string['checkdesc:noheadings'] = 'No headers makes content less structured and harder to read.';
+$string['checkdesc:objectmusthaveembed'] = 'Object elements (for embedding external resources) should not be missing their corresponding "embed" elements.';
+$string['checkdesc:objectmusthavetitle'] = 'Object elements (for embedding external resources) should not be missing their corresponding "title" descriptions.';
+$string['checkdesc:objectmusthavevalidtitle'] = 'Object elements (for embedding external resources) should have corresponding "titles" with text.';
+$string['checkdesc:strikeisnotused'] = 'Strike (strike-through) elements should not be used; "del" (deleted) should be used instead.';
+$string['checkdesc:tabledatashouldhaveth'] = 'Tables ideally should not be missing headers.';
+$string['checkdesc:tablesummarydoesnotduplicatecaption'] = 'Table summaries and captions should not be identical.';
+$string['checkdesc:tabletdshouldnotmerge'] = 'Tables ideally should not have any merged cells.';
+$string['checkdesc:tablethshouldhavescope'] = 'Table row or column scopes (used to map row and column to each cell) should be declared.';

 // Registration process.
 $string['activate'] = 'Activate';
 $string['activated'] = 'The plugin is activated and ready to use.';
 $string['activationform'] = 'Brickfield registration';
 $string['activationheader'] = 'Brickfield activation';
-$string['activationinfo'] = '<p>In order to use this plugin, you must provide valid keys for this site in this form.</p><p>Please {$a}register your details (opens in new window)</a> to receive those keys if you do not already have them. </p><p>Once activated, your keys will then be validated via scheduled cron tasks.</p>';
-$string['automatedsentdaily'] = '';
+$string['activationinfo'] = '<p>In order to use this plugin, you must provide valid keys for this site in this form.</p><p>Please <a href="{$a}" data-action="send_info" target="_blank">register at the Brickfield Portal (opens in new window)</a> to receive those keys if you do not already have them. </p><p>Once activated, your keys will then be validated via scheduled cron tasks.</p>';
 $string['contenttypeerrors'] = 'Total results of activity content tests per course and per content type.';
 $string['contentyperesults'] = 'Total passed/failed for content areas per course.';
 $string['country'] = 'Country';
 $string['country_help'] = 'Country of the site';
 $string['hashcorrect'] = 'The entered code is correct.';
-$string['hashincorrect'] = 'The entered code is not correct.';
+$string['hashincorrect'] = 'The entered code is incorrect.';
 $string['inactive'] = 'The plugin is inactive and cannot be used. Please enter valid registration keys, and press "Activate".';
 $string['installed'] = 'Plugin installed';
 $string['installedcli'] = 'Plugin installed via command line';
 $string['installeddescription'] = 'The plugin has been installed, redirect to activation form.';
 $string['language'] = 'Language';
 $string['language_help'] = 'Language of the site';
-$string['mail'] = 'Email';
-$string['mail_help'] = 'This email will be used to register the account';
 $string['mobileservice'] = 'Mobile services enabled ({$a})';
 $string['moreinfo'] = 'More information';
-$string['notifications'] = 'Receive notifications';
-$string['notifications_help'] = 'Set to "Yes" if you want to receive email notifications. If enabled, you can set another email to receive these notifications.';
 $string['numcourses'] = 'Number of courses ({$a})';
 $string['numfactivities'] = 'Number of activities ({$a})';
 $string['numfiles'] = 'Number of files ({$a})';
 $string['numusers'] = 'Number of users ({$a})';
 $string['percheckerrors'] = 'Number of specific tests and errors per check per course.';
-$string['privacy'] = 'Privacy notice and data processing agreement';
-$string['privacy_help'] = 'Access the link to read the entire policy';
-$string['privacydesc'] = 'I agree to the <a href="{$a}" target="_blank">privacy notice and data processing agreement</a> for someurl.com';
-$string['registerplugin'] = 'Register with {$a}';
 $string['registration'] = 'Registration form';
-$string['registrationheader'] = 'Register here';
-$string['registrationheaderinfo'] = '<p>This registration process allows you to use the Brickfield accessibility toolkit version for your registered Moodle site.</p> <p>This usage is subject to the terms and conditions as stated here and which you agree to, by using this product.</p>';
 $string['release'] = 'Moodle release ({$a})';
 $string['secretkey'] = 'API key';
 $string['secretkey_help'] = 'This code is received by email after registration.';
 $string['sendfollowinginfo'] = '<p>The following information will be periodically sent to contribute to overall statistics only. It will not be made public on any central listing.</p> {$a}';
 $string['sitehash'] = 'Secret key';
 $string['sitehash_help'] = 'This code is received by email after registration.';
-$string['sitename'] = 'Site name';
-$string['sitename_help'] = 'The name of the site';
-$string['siteurl'] = 'Site URL';
-$string['siteurl_help'] = 'The URL of the site';
-$string['usedifferentemail'] = 'Use different email';
 $string['usersmobileregistered'] = 'Number of users with registered mobile devices ({$a})';
 $string['validationerror'] = 'Registration key validation has failed. Check that your registered site URL and keys are correct.';

@@ -268,20 +248,20 @@ $string['printable:toolname'] = 'Summary report';
 $string['printable:toolshortname'] = 'Summary report';
 $string['printable:downloadpdf'] = 'Download PDF';
 $string['printable:printreport'] = 'Printable report';
-$string['error:nocoursespecified'] = '<p>This summary report requires a valid courseid.</p><p> Please access the accessibility toolkit from within a course, by using its Actions menu administration link to the Accessibility toolkit, which will then supply this required courseid.</p>';
+$string['error:nocoursespecified'] = 'This summary report requires a valid course id. Please access the accessibility toolkit from within a course, via the actions menu, which will then supply this required course id.';
 $string['pdf:filename'] = 'Brickfield_Summaryreport_CourseID-{$a}';

 // Advanced page.
-$string['bannercontentone'] = 'The Enterprise Accessibility Toolkit has a full set of features to help your organisation improve accessibility of your courses. {$a} to book a free demo of the advanced features.';
-$string['bannercontenttwo'] = 'Build an effective and inclusive teaching and learning platform by Finding content that does not meet the guidelines, Fixing the issues and Future-proofing your Moodle course content with accessible files, editor and enhanced features.';
+$string['bannercontentone'] = 'The Enterprise Accessibility Toolkit has a full set of features to help your organisation improve accessibility of your courses. <a href="{$a}">Contact Brickfield Education Labs</a> to book a free demo of the advanced features.';
+$string['bannercontenttwo'] = 'Build an effective and inclusive teaching and learning platform by finding content that does not meet the guidelines, fixing the issues and future-proofing your Moodle course content with accessible files, editor and enhanced features.';
 $string['bannerheadingone'] = 'Upgrade to the Enterprise Accessibility Toolkit';
 $string['contactus'] = 'Contact us';
-$string['buttonone'] = 'Get a Free Demo';
+$string['buttonone'] = 'Get a free demo';
 $string['contentone'] = 'Automatically evaluate your course content and assessments for accessibility issues.';
 $string['contenttwo'] = 'Bulk update unclear or missing text for web links, image descriptions and video subtitles.';
 $string['contentthree'] = 'Provide your students with content in accessible formats including Audio, ePub and Electronic Braille.';
 $string['contentfour'] = 'Identify which activities have the most accessibility issues to prioritise effort.';
-$string['contentfive'] = 'Automatically fix out of date HTML tags.';
+$string['contentfive'] = 'Automatically fix out-of-date HTML tags.';
 $string['contentsix'] = 'Provide teachers with just in time tips for creating better content.';
 $string['footerheading'] = 'Footer section';
 $string['headingone'] = 'Evaluate content';
@@ -41,15 +41,6 @@ admin_externalpage_setup('tool_brickfield_activation');
 $thisurl = new moodle_url(\tool_brickfield\accessibility::get_plugin_url().'/registration.php');
 $PAGE->set_url($thisurl);

-$termsandconditions = optional_param('terms', 0, PARAM_BOOL);
-if ($termsandconditions) {
-    $PAGE->set_pagelayout('popup');
-    echo $OUTPUT->header();
-    echo format_text(get_string('termsandconditions', 'tool_brickfield'), FORMAT_HTML, ['noclean' => true]);
-    echo $OUTPUT->footer();
-    exit;
-}
-
 $context = context_system::instance();
 $PAGE->set_context($context);
 $PAGE->set_title(get_string('registration', manager::PLUGINNAME));
@@ -85,8 +76,7 @@ if (!$registration->toolkit_is_active()) {
    echo $OUTPUT->notification(get_string('activated', manager::PLUGINNAME), 'success');
 }

-$keyinfo = get_string('activationinfo', manager::PLUGINNAME, '<a href="' . $registration->get_regurl() .
-    '" data-action="send_info" target="_blank">');
+$keyinfo = get_string('activationinfo', manager::PLUGINNAME, $registration->get_regurl());
 echo format_text($keyinfo, FORMAT_HTML, ['noclean' => true]);

 $registrationform->display();
@@ -35,7 +35,7 @@
        <h2>{{# str }}bannerheadingone, tool_brickfield{{/ str }}</h2>
    </div>
    <p>
-        {{# str }}bannercontentone, tool_brickfield, <a href="https://www.brickfield.ie/moodle_talk_to_sales/">{{# str }}contactus, tool_brickfield{{/ str }}</a>{{/ str }}
+        {{# str }}bannercontentone, tool_brickfield, https://www.brickfield.ie/moodle_talk_to_sales/{{/ str }}
    </p>
 </section>

@@ -64,7 +64,7 @@
    <tr>
        <td class="cell c0" style="width:30%;">{{activity}}</td>
        <td class="cell c1" style="width:30%;">{{check}}</td>
-        <td class="cell c2" style="width:30%;">{{html}}</td>
+        <td class="cell c2 text-break" style="width:30%;">{{html}}</td>
        <td class="cell c3" style="width:5%;">{{line}}</td>
        <td class="cell c4" style="width:5%;">{{{edit}}}</td>
    </tr>
@@ -32,8 +32,8 @@ Feature: Brickfield activityresults
    And I run the scheduled task "\tool_brickfield\task\bulk_process_caches"
    And I navigate to "Accessibility toolkit" in current page administration
    And I should see "Error details: course Course 1"
-    And I should see "Overall page content length"
-    And I should see "\"Bold\" (b) elements should not be used"
+    And I should see "The overall page content length"
+    And I should see "Bold (b) elements should not be used"
    And I should see "Link text should be descriptive"
    And I follow "Activity breakdown"
    Then I should see "Results per activity: course Course 1"
@@ -25,5 +25,5 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component = 'tool_brickfield';
-$plugin->version = 2021050400;
-$plugin->requires = 2021042000;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_capability'; // Full name of the plugin (used for diagnostics).
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_cohortroles'; // Full name of the plugin (used for diagnostics).

 $plugin->dependencies = array(
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;
-$plugin->requires  = 2020110300;
+$plugin->version   = 2021051700;
+$plugin->requires  = 2021051100;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2020110900;
-$plugin->requires  = 2020110300;
+$plugin->version   = 2021051700;
+$plugin->requires  = 2021051100;
 $plugin->component = 'tool_dataprivacy';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'tool_filetypes';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'tool_generator';
@@ -25,8 +25,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_health'; // Full name of the plugin (used for diagnostics)

 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_httpsreplace'; // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_innodb'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component  = 'tool_installaddon';
-$plugin->version    = 2020110900;
-$plugin->requires   = 2020110300;
+$plugin->version    = 2021051700;
+$plugin->requires   = 2021051100;
 $plugin->maturity   = MATURITY_STABLE;
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_langimport'; // Full name of the plugin (used for diagnostics)
@@ -24,8 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;
-$plugin->requires  = 2020110300;         // Requires this Moodle version.
+$plugin->version   = 2021051700;
+$plugin->requires  = 2021051100;         // Requires this Moodle version.
 $plugin->component = 'tool_licensemanager';

 $plugin->maturity = MATURITY_STABLE;
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2020110300; // Requires this Moodle version.
+$plugin->version = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2021051100; // Requires this Moodle version.
 $plugin->component = 'logstore_database'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2020110300; // Requires this Moodle version.
+$plugin->version = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2021051100; // Requires this Moodle version.
 $plugin->component = 'logstore_legacy'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2020110300; // Requires this Moodle version.
+$plugin->version = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2021051100; // Requires this Moodle version.
 $plugin->component = 'logstore_standard'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2020110300; // Requires this Moodle version.
+$plugin->version = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_log'; // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_lp'; // Full name of the plugin (used for diagnostics).
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_lpimportcsv'; // Full name of the plugin (used for diagnostics).
-$plugin->dependencies = array('tool_lp' => 2020110300);
+$plugin->dependencies = array('tool_lp' => 2021051100);

@@ -24,8 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_lpmigrate'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
    'tool_lp' => ANY_VERSION
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;
-$plugin->requires  = 2020110300;
+$plugin->version   = 2021051700;
+$plugin->requires  = 2021051100;
 $plugin->component = 'tool_messageinbound';
@@ -23,9 +23,9 @@
 */

 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_mobile'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'webservice_rest' => 2020110300
+    'webservice_rest' => 2021051100
 );
@@ -26,6 +26,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2020110900;     // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300;     // Requires this Moodle version.
+$plugin->version   = 2021051700;     // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;     // Requires this Moodle version.
 $plugin->component = 'tool_monitor'; // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component  = 'tool_moodlenet';
-$plugin->version    = 2020110900;
-$plugin->requires   = 2020110300;
+$plugin->version    = 2021051700;
+$plugin->requires   = 2021051100;
 $plugin->maturity   = MATURITY_ALPHA;
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_multilangupgrade'; // Full name of the plugin (used for diagnostics)

@@ -147,25 +147,21 @@ class issuer extends persistent {
        $mform->addElement('text', 'loginscopes', get_string('issuerloginscopes', 'tool_oauth2'));
        $mform->addRule('loginscopes', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
        $mform->addHelpButton('loginscopes', 'issuerloginscopes', 'tool_oauth2');
-        $mform->hideIf('loginscopes', 'showonloginpage', 'eq', \core\oauth2\issuer::SERVICEONLY);

        // Login scopes offline.
        $mform->addElement('text', 'loginscopesoffline', get_string('issuerloginscopesoffline', 'tool_oauth2'));
        $mform->addRule('loginscopesoffline', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
        $mform->addHelpButton('loginscopesoffline', 'issuerloginscopesoffline', 'tool_oauth2');
-        $mform->hideIf('loginscopesoffline', 'showonloginpage', 'eq', \core\oauth2\issuer::SERVICEONLY);

        // Login params.
        $mform->addElement('text', 'loginparams', get_string('issuerloginparams', 'tool_oauth2'));
        $mform->addRule('loginparams', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
        $mform->addHelpButton('loginparams', 'issuerloginparams', 'tool_oauth2');
-        $mform->hideIf('loginparams', 'showonloginpage', 'eq', \core\oauth2\issuer::SERVICEONLY);

        // Login params offline.
        $mform->addElement('text', 'loginparamsoffline', get_string('issuerloginparamsoffline', 'tool_oauth2'));
        $mform->addRule('loginparamsoffline', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
        $mform->addHelpButton('loginparamsoffline', 'issuerloginparamsoffline', 'tool_oauth2');
-        $mform->hideIf('loginparamsoffline', 'showonloginpage', 'eq', \core\oauth2\issuer::SERVICEONLY);

        // Allowed Domains.
        $mform->addElement('text', 'alloweddomains', get_string('issueralloweddomains', 'tool_oauth2'));
@@ -53,7 +53,7 @@ $string['endpointurl_help'] = 'URL for this endpoint. Must use https:// protocol
 $string['endpointurl'] = 'URL';
 $string['facebook_service'] = 'Facebook';
 $string['google_service'] = 'Google';
-$string['imsobv2p1_service'] = 'OpenBadges';
+$string['imsobv2p1_service'] = 'Open Badges';
 $string['issuersetup'] = 'Detailed instructions on configuring the common OAuth 2 services';
 $string['issuersetuptype'] = 'Detailed instructions on setting up the {$a} OAuth 2 provider';
 $string['issueralloweddomains_help'] = 'If set, this setting is a comma separated list of domains that logins will be restricted to when using this provider.';
@@ -142,29 +142,29 @@ Feature: Basic OAuth2 functionality
    And I should see "Identity issuer deleted"
    And I should not see "Testing service modified"

-  Scenario: Create, edit and delete standard service for OpenBadges
-    Given I press "OpenBadges"
-    And I should see "Create new service: OpenBadges"
+  Scenario: Create, edit and delete standard service for Open Badges
+    Given I press "Open Badges"
+    And I should see "Create new service: Open Badges"
    And I set the following fields to these values:
      | Client ID                  | thisistheclientid                         |
      | Client secret              | supersecret                               |
      | Service base URL           | https://dc.imsglobal.org/                 |
    When I press "Save changes"
    Then I should see "Changes saved"
-    And I should see "OpenBadges"
-    And "Allow services" "icon" should exist in the "OpenBadges" "table_row"
-    And "Do not allow login" "icon" should exist in the "OpenBadges" "table_row"
-    And "Service discovery successful" "icon" should exist in the "OpenBadges" "table_row"
+    And I should see "Open Badges"
+    And "Allow services" "icon" should exist in the "Open Badges" "table_row"
+    And "Do not allow login" "icon" should exist in the "Open Badges" "table_row"
+    And "Service discovery successful" "icon" should exist in the "Open Badges" "table_row"
    And the "src" attribute of "table.admintable th img" "css_element" should contain "IMS-Global-Logo.png"
-    And I click on "Configure endpoints" "link" in the "OpenBadges" "table_row"
+    And I click on "Configure endpoints" "link" in the "Open Badges" "table_row"
    And I should see "https://dc.imsglobal.org/.well-known/badgeconnect.json" in the "discovery_endpoint" "table_row"
    And I should see "authorization_endpoint"
    And I follow "OAuth 2 services"
-    And I click on "Configure user field mappings" "link" in the "OpenBadges" "table_row"
+    And I click on "Configure user field mappings" "link" in the "Open Badges" "table_row"
    And I should not see "given_name"
    And I should not see "middle_name"
    And I follow "OAuth 2 services"
-    And I click on "Edit" "link" in the "OpenBadges" "table_row"
+    And I click on "Edit" "link" in the "Open Badges" "table_row"
    And I set the following fields to these values:
      | Name                       | IMS Global                                |
    And I press "Save changes"
@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_oauth2'; // Full name of the plugin (used for diagnostics).

@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_phpunit'; // Full name of the plugin (used for diagnostics)

@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;         // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300;         // Requires this Moodle version.
+$plugin->version   = 2021051700;         // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;         // Requires this Moodle version.
 $plugin->component = 'tool_policy';      // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_profiling'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_recyclebin'; // Full name of the plugin (used for diagnostics).
@@ -25,8 +25,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_replace'; // Full name of the plugin (used for diagnostics)

 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;
-$plugin->requires  = 2020110300;
+$plugin->version   = 2021051700;
+$plugin->requires  = 2021051100;
 $plugin->component = 'tool_spamcleaner'; // Full name of the plugin (used for diagnostics)

@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_task'; // Full name of the plugin (used for diagnostics)

@@ -21,6 +21,6 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300; // Requires this Moodle version.
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_templatelibrary'; // Full name of the plugin (used for diagnostics).
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_unsuproles'; // Full name of the plugin (used for diagnostics)

@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;            // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300;            // Requires this Moodle version.
+$plugin->version   = 2021051700;            // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;            // Requires this Moodle version.
 $plugin->component = 'tool_uploadcourse';   // Full name of the plugin (used for diagnostics).
@@ -25,7 +25,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_uploaduser'; // Full name of the plugin (used for diagnostics)

@@ -854,10 +854,10 @@ class manager {
        // the format filename => version. The version value needs to
        // be increased if the tour has been updated.
        $shippedtours = [
-            '311_activity_information_activity_page_student.json' => 1,
-            '311_activity_information_activity_page_teacher.json' => 1,
-            '311_activity_information_course_page_student.json' => 1,
-            '311_activity_information_course_page_teacher.json' => 1
+            '311_activity_information_activity_page_student.json' => 2,
+            '311_activity_information_activity_page_teacher.json' => 2,
+            '311_activity_information_course_page_student.json' => 2,
+            '311_activity_information_course_page_teacher.json' => 2
        ];

        // These are tours that we used to ship but don't ship any longer.
@@ -79,11 +79,11 @@ function xmldb_tool_usertours_upgrade($oldversion) {
    // Automatically generated Moodle v3.10.0 release upgrade line.
    // Put any upgrade step following this.

-    if ($oldversion < 2020110901) {
+    if ($oldversion < 2021051700) {
        // Updating shipped tours.
        manager::update_shipped_tours();

-        upgrade_plugin_savepoint(true, 2020110901, 'tool', 'usertours');
+        upgrade_plugin_savepoint(true, 2021051700, 'tool', 'usertours');
    }

    return true;
@@ -234,5 +234,17 @@ $string['tour4_content_starred'] = 'You can choose to star particular conversati
 $string['tour4_title_settings'] = 'Messaging settings';
 $string['tour4_content_settings'] = 'You can access your messaging settings via the cog icon. A new privacy setting allows you to restrict who can message you.';

+// 3.11 Activity information tour.
+$string['tour_activityinfo_activity_student_title'] = 'New: Activity information';
+$string['tour_activityinfo_activity_student_content'] = 'Activity dates plus what to do to complete the activity are shown on the activity page.';
+$string['tour_activityinfo_activity_teacher_title'] = 'New: Activity information';
+$string['tour_activityinfo_activity_teacher_content'] = 'Activity dates and completion conditions are now displayed for students on each activity page (and optionally on the course page).
+
+For activities requiring students to manually mark an activity as completed, a \'Mark as done\' button is shown on the activity page.';
+$string['tour_activityinfo_course_student_title'] = 'New: Activity information';
+$string['tour_activityinfo_course_student_content'] = 'Activity dates and/or what to do to complete the activity are displayed on the course page.';
+$string['tour_activityinfo_course_teacher_title'] = 'New: Activity information';
+$string['tour_activityinfo_course_teacher_content'] = 'New course settings \'Show completion conditions\' and \'Show activity dates\' enable you to choose whether activity completion conditions (if set) and/or dates are displayed for students on the course page.';
+
 $string['tour_final_step_title'] = 'End of tour';
 $string['tour_final_step_content'] = 'This is the end of your user tour. It won\'t show again unless you reset it using the link in the footer.';
@@ -1 +1 @@
-{"name":"Activity information in activity page (Student)","description":"A tour of the activity information for Student display on the activity page","pathmatch":"\/mod\/%\/view.php%","enabled":"1","sortorder":"0","configdata":"{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[\"student\"],\"theme\":[],\"cssselector\":[\"[data-region=activity-information]\"]},\"majorupdatetime\":1620110287,\"shipped_tour\":true,\"shipped_filename\":\"311_activity_information_activity_page_student.json\",\"shipped_version\":1}","version":"2020110901","steps":[{"title":"New: Activity information","content":"Activity dates plus what to do to complete the activity are shown on the activity page.","targettype":"0","targetvalue":"[data-region=activity-information]","sortorder":"0","configdata":"{}"}]}
+{"name":"Activity information in activity page (Student)","description":"A tour of the activity information for Student display on the activity page","pathmatch":"\/mod\/%\/view.php%","enabled":"1","sortorder":"0","configdata":"{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[\"student\"],\"theme\":[],\"cssselector\":[\"[data-region=activity-information]\"]},\"majorupdatetime\":1620110287,\"shipped_tour\":true,\"shipped_filename\":\"311_activity_information_activity_page_student.json\",\"shipped_version\":1}","version":"2020110901","steps":[{"title":"tour_activityinfo_activity_student_title,tool_usertours","content":"tour_activityinfo_activity_student_content,tool_usertours","targettype":"0","targetvalue":"[data-region=activity-information]","sortorder":"0","configdata":"{}"}]}
@@ -1 +1 @@
-{"name":"Activity information in activity page (Teacher)","description":"A tour of the activity information for Teacher display on the activity page","pathmatch":"\/mod\/%\/view.php%","enabled":"1","sortorder":"1","configdata":"{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[\"manager\",\"teacher\",\"editingteacher\"],\"theme\":[],\"cssselector\":[\"[data-region=activity-information]\"]},\"majorupdatetime\":1620110287,\"shipped_tour\":true,\"shipped_filename\":\"311_activity_information_activity_page_teacher.json\",\"shipped_version\":1}","version":"2020110901","steps":[{"title":"New: Activity information","content":"Activity dates and completion conditions are now displayed for students on each activity page (and optionally on the course page).\r\n\r\nFor activities requiring students to manually mark an activity as completed, a 'Mark as done' button is shown on the activity page.","targettype":"0","targetvalue":"[data-region=activity-information]","sortorder":"0","configdata":"{}"}]}
+{"name":"Activity information in activity page (Teacher)","description":"A tour of the activity information for Teacher display on the activity page","pathmatch":"\/mod\/%\/view.php%","enabled":"1","sortorder":"1","configdata":"{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[\"manager\",\"teacher\",\"editingteacher\"],\"theme\":[],\"cssselector\":[\"[data-region=activity-information]\"]},\"majorupdatetime\":1620110287,\"shipped_tour\":true,\"shipped_filename\":\"311_activity_information_activity_page_teacher.json\",\"shipped_version\":1}","version":"2020110901","steps":[{"title":"tour_activityinfo_activity_teacher_title,tool_usertours","content":"tour_activityinfo_activity_teacher_content,tool_usertours","targettype":"0","targetvalue":"[data-region=activity-information]","sortorder":"0","configdata":"{}"}]}
@@ -1 +1 @@
-{"name":"Activity information in course homepage (Student)","description":"A tour of the activity information for Student display on the course homepage","pathmatch":"\/course\/view.php%","enabled":"1","sortorder":"2","configdata":"{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[\"student\"],\"theme\":[],\"cssselector\":[\"[data-region=activity-information]\"]},\"majorupdatetime\":1620109487,\"shipped_tour\":true,\"shipped_filename\":\"311_activity_information_course_page_student.json\",\"shipped_version\":1}","version":"2020110901","steps":[{"title":"New: Activity information","content":"Activity dates and\/or what to do to complete the activity are displayed on the course page.","targettype":"0","targetvalue":"[data-region=activity-information]","sortorder":"0","configdata":"{}"}]}
+{"name":"Activity information in course homepage (Student)","description":"A tour of the activity information for Student display on the course homepage","pathmatch":"\/course\/view.php%","enabled":"1","sortorder":"2","configdata":"{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[\"student\"],\"theme\":[],\"cssselector\":[\"[data-region=activity-information]\"]},\"majorupdatetime\":1620109487,\"shipped_tour\":true,\"shipped_filename\":\"311_activity_information_course_page_student.json\",\"shipped_version\":1}","version":"2020110901","steps":[{"title":"tour_activityinfo_course_student_title,tool_usertours","content":"tour_activityinfo_course_student_content,tool_usertours","targettype":"0","targetvalue":"[data-region=activity-information]","sortorder":"0","configdata":"{}"}]}
@@ -1 +1 @@
-{"name":"Activity information in course homepage (Teacher)","description":"A tour of the activity information for Teacher display on the course homepage","pathmatch":"\/course\/view.php%","enabled":"1","sortorder":"3","configdata":"{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[\"manager\",\"teacher\",\"editingteacher\"],\"theme\":[],\"cssselector\":[\"[data-region=activity-information]\"]},\"majorupdatetime\":1620109487,\"shipped_tour\":true,\"shipped_filename\":\"311_activity_information_course_page_teacher.json\",\"shipped_version\":1}","version":"2020110901","steps":[{"title":"New: Activity information","content":"New course settings 'Show completion conditions' and 'Show activity dates' enable you to choose whether activity completion conditions (if set) and\/or dates are displayed for students on the course page.","targettype":"0","targetvalue":"[data-region=activity-information]","sortorder":"0","configdata":"{}"}]}
+{"name":"Activity information in course homepage (Teacher)","description":"A tour of the activity information for Teacher display on the course homepage","pathmatch":"\/course\/view.php%","enabled":"1","sortorder":"3","configdata":"{\"placement\":\"bottom\",\"orphan\":\"0\",\"backdrop\":\"1\",\"reflex\":\"0\",\"filtervalues\":{\"accessdate\":{\"filter_accessdate\":\"tool_usertours_accountcreation\",\"filter_accessdate_range\":0,\"filter_accessdate_enabled\":\"0\"},\"category\":[],\"course\":[],\"courseformat\":[],\"role\":[\"manager\",\"teacher\",\"editingteacher\"],\"theme\":[],\"cssselector\":[\"[data-region=activity-information]\"]},\"majorupdatetime\":1620109487,\"shipped_tour\":true,\"shipped_filename\":\"311_activity_information_course_page_teacher.json\",\"shipped_version\":1}","version":"2020110901","steps":[{"title":"tour_activityinfo_course_teacher_title,tool_usertours","content":"tour_activityinfo_course_teacher_content,tool_usertours","targettype":"0","targetvalue":"[data-region=activity-information]","sortorder":"0","configdata":"{}"}]}
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110901;            // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300;            // Requires this Moodle version.
+$plugin->version   = 2021051700;            // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;            // Requires this Moodle version.
 $plugin->component = 'tool_usertours';      // Full name of the plugin (used for diagnostics).
@@ -24,7 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300; // Requires this Moodle version
+$plugin->version   = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100; // Requires this Moodle version.
 $plugin->component = 'tool_xmldb'; // Full name of the plugin (used for diagnostics)

@@ -26,8 +26,8 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_cas';        // Full name of the plugin (used for diagnostics)

-$plugin->dependencies = array('auth_ldap' => 2020110300);
+$plugin->dependencies = array('auth_ldap' => 2021051100);
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_db';         // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_email';      // Full name of the plugin (used for diagnostics)
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_ldap';       // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2020110300; // Requires this Moodle version.
+$plugin->version = 2021051700; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2021051100; // Requires this Moodle version.
 $plugin->component = 'auth_lti'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_manual';     // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_mnet';       // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_nologin';    // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_none';       // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300;        // Requires this Moodle version.
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_oauth2';       // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110901;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_shibboleth'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'auth_webservice'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'availability_completion';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'availability_date';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'availability_grade';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'availability_group';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'availability_grouping';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version = 2020110900;
-$plugin->requires = 2020110300;
+$plugin->version = 2021051700;
+$plugin->requires = 2021051100;
 $plugin->component = 'availability_profile';
@@ -156,7 +156,7 @@ abstract class backup implements checksumable {
     * point is backup when some behavior/approach channged, in order to allow
     * conditional coding based on it.
     */
-    const VERSION = 2020110900;
+    const VERSION = 2021051700;
    /**
     * Usually same than major release zero version, mainly for informative/historic purposes.
     */
@@ -3,7 +3,7 @@ information provided here is intended especially for developers.

 === 3.11 ===

- * New setting called "Include override permissions" has been implemented. The default
+ * New setting called "Include permission overrides" has been implemented. The default
   settings is OFF for import, and ON for restore.

 === 3.10 ===
@@ -39,7 +39,7 @@ Feature: Import course's contents into another course
      | enrol/manual:enrol | Allow      | teacher | Course       | C1        |
    And I log in as "teacher1"
    When I import "Course 1" course into "Course 2" course using this options:
-      | Initial | Include override permissions | 1 |
+      | Initial | Include permission overrides | 1 |
    And I navigate to "Users > Permissions" in current page administration
    Then I should see "Non-editing teacher (1)"
    And I set the field "Advanced role override" to "Non-editing teacher (1)"
@@ -52,6 +52,6 @@ Feature: Import course's contents into another course
      | enrol/manual:enrol | Allow      | teacher | Course       | C1        |
    And I log in as "teacher1"
    When I import "Course 1" course into "Course 2" course using this options:
-      | Initial | Include override permissions | 0 |
+      | Initial | Include permission overrides | 0 |
    And I navigate to "Users > Permissions" in current page administration
    Then I should see "Non-editing teacher (0)"
@@ -253,7 +253,7 @@ Feature: Restore Moodle 2 course backups
    And I backup "Course 1" course using this options:
      | Confirmation | Filename | test_backup.mbz |
    When I restore "test_backup.mbz" backup into a new course using this options:
-      | Settings | Include override permissions | 1 |
+      | Settings | Include permission overrides | 1 |
    Then I navigate to "Users > Permissions" in current page administration
    And I should see "Non-editing teacher (1)"
    And I set the field "Advanced role override" to "Non-editing teacher (1)"
@@ -267,6 +267,6 @@ Feature: Restore Moodle 2 course backups
    And I backup "Course 1" course using this options:
      | Confirmation | Filename | test_backup.mbz |
    When I restore "test_backup.mbz" backup into a new course using this options:
-      | Settings | Include override permissions | 0 |
+      | Settings | Include permission overrides | 0 |
    Then I navigate to "Users > Permissions" in current page administration
    And I should see "Non-editing teacher (0)"
@@ -137,6 +137,10 @@ const showAccessMap = (courseId, displayFormat, updatePreference = false) => {
            renderTemplate(element, module.numerrors, module.numchecks, displayFormat, minViews, viewDelta);
        });

+        // Change the icon display.
+        document.querySelector('.icon-accessmap').classList.remove(...['fa-eye-slash']);
+        document.querySelector('.icon-accessmap').classList.add(...['fa-eye']);
+
        return {
            sectionData,
            moduleData,
@@ -161,6 +165,7 @@ const hideAccessMap = (updatePreference = false) => {
        'block_accessreview_warning',
        'block_accessreview_danger',
        'block_accessreview_view',
+        'alert',
    ];

    // Removes the added classes.
@@ -169,6 +174,10 @@ const hideAccessMap = (updatePreference = false) => {
    if (updatePreference) {
        setToggleStatePreference(false);
    }
+
+    // Change the icon display.
+    document.querySelector('.icon-accessmap').classList.remove(...['fa-eye']);
+    document.querySelector('.icon-accessmap').classList.add(...['fa-eye-slash']);
 };


@@ -44,17 +44,12 @@ class block_accessreview extends block_base {
     * @return array
     */
    public function applicable_formats(): array {
-        // If Brickfield accessibility toolkit has been disabled, do nothing.
-        if (accessibility::is_accessibility_enabled()) {
-            return [
-                'course-view' => true,
-                'site' => true,
-                'mod' => false,
-                'my' => false,
-            ];
-        } else {
-            return [];
-        }
+        return [
+            'course-view' => true,
+            'site' => true,
+            'mod' => false,
+            'my' => false,
+        ];
    }

    /**
@@ -232,10 +227,16 @@ class block_accessreview extends block_base {
    protected function get_toggle_link(): string {
        global $OUTPUT;

+        if (get_user_preferences('block_accessreviewtogglestate')) {
+            $icon = 't/hide';
+        } else {
+            $icon = 't/show';
+        }
+
        // Toggle overlay link.
        return html_writer::link(
            '#',
-            $OUTPUT->pix_icon('t/hide', get_string('togglealt', 'block_accessreview')),
+            $OUTPUT->pix_icon($icon, get_string('togglealt', 'block_accessreview'), 'moodle', ['class' => 'icon-accessmap']),
            [
                'title' => get_string('togglealt', 'block_accessreview'),
                'style' => 'cursor: pointer;',
@@ -25,16 +25,13 @@

 defined('MOODLE_INTERNAL') || die();

-$string['accessreview:addinstance'] = 'Add an accessibility review block to a course';
+$string['accessreview:addinstance'] = 'Add an accessibility review block';
 $string['accessreview:view'] = 'View the accessibility review';
 $string['checktypes'] = 'Types';
 $string['errors'] = 'Errors';
 $string['errordisplay'] = 'Display errors in this format';
 $string['errorssummary'] = 'Accessibility review';
 $string['frown'] = 'Errors found, sorry!';
-$string['guides'] = 'Guides';
-$string['link:pdf'] = 'Link to PDF resource on {$a} - opens in new window';
-$string['link:video'] = 'Link to video resource on {$a} - opens in new window';
 $string['nodata'] = 'No accessibility results data was found.';
 $string['pluginname'] = 'Accessibility review';
 $string['privacy:metadata:preference:block_accessreviewtogglestate'] = 'The user\'s preference for hiding or showing the course accessibility highlighting.';
@@ -54,10 +51,10 @@ $string['status:errorsalt'] = 'Errors';
 $string['toggleaccessreview'] = 'Toggle highlighting';
 $string['toolpage'] = 'Toolkit page to show';
 $string['totalerrors'] = '<em>Total errors:</em> {$a} <br>(total excludes course settings)';
-$string['viewreportalt'] = 'View Brickfield accessibility toolkit';
+$string['viewreportalt'] = 'View accessibility toolkit';
 $string['viewreport'] = 'View';
-$string['downloadreportalt'] = 'Download Brickfield accessibility summary report';
+$string['downloadreportalt'] = 'Download accessibility summary report';
 $string['downloadreport'] = 'Download';
-$string['togglealt'] = 'Toggle Brickfield accessibility heatmap';
+$string['togglealt'] = 'Toggle accessibility heatmap';
 $string['toggle'] = 'Toggle highlighting';
 $string['whattoshow'] = 'What to show on course page';
@@ -41,9 +41,9 @@ Feature: Block accessreview results
    And I should see "1" in the "Link" "table_row"
    # We created one text issue, and the standard Behat course generator creates another (too much content).
    And I should see "2" in the "Text" "table_row"
-    And "View Brickfield accessibility toolkit" "icon" should exist in the "Accessibility review" "block"
-    And "Toggle Brickfield accessibility heatmap" "icon" should exist in the "Accessibility review" "block"
-    And "Download Brickfield accessibility summary report" "icon" should exist in the "Accessibility review" "block"
+    And "View accessibility toolkit" "icon" should exist in the "Accessibility review" "block"
+    And "Toggle accessibility heatmap" "icon" should exist in the "Accessibility review" "block"
+    And "Download accessibility summary report" "icon" should exist in the "Accessibility review" "block"

  Scenario: Toggle highlighting on/off
    Given I log in as "admin"
@@ -61,7 +61,7 @@ Feature: Block accessreview results
    And I run the scheduled task "\tool_brickfield\task\bulk_process_courses"
    And I run the scheduled task "\tool_brickfield\task\bulk_process_caches"
    And I reload the page
-    And I click on "Toggle Brickfield accessibility heatmap" "icon"
+    And I click on "Toggle accessibility heatmap" "icon"
    And ".block_accessreview_view" "css_element" should be visible
-    And I click on "Toggle Brickfield accessibility heatmap" "icon"
+    And I click on "Toggle accessibility heatmap" "icon"
    And ".block_accessreview_view" "css_element" should not be visible
@@ -26,8 +26,8 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component = 'block_accessreview';
-$plugin->version   = 2021050400;
-$plugin->requires  = 2021042000;
+$plugin->version   = 2021051700;
+$plugin->requires  = 2021051100;
 $plugin->dependencies = array(
    'tool_brickfield' => ANY_VERSION,
 );
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'block_activity_modules'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;               // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300;               // Requires this Moodle version.
+$plugin->version   = 2021051700;               // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;               // Requires this Moodle version.
 $plugin->component = 'block_activity_results'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'block_admin_bookmarks'; // Full name of the plugin (used for diagnostics)
@@ -25,6 +25,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2020110300;        // Requires this Moodle version.
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'block_badges';
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'block_blog_menu'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'block_blog_recent'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'block_blog_tags'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'block_calendar_month'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2020110900;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2020110300;        // Requires this Moodle version
+$plugin->version   = 2021051700;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2021051100;        // Requires this Moodle version.
 $plugin->component = 'block_calendar_upcoming'; // Full name of the plugin (used for diagnostics)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eloy Lafuente (stronk7)	94f2d3fc4b	Moodle release 3.11	2021-05-15 18:10:59 +02:00
Sara Arjona	bdd30ee5b1	Moodle release 3.11rc2	2021-05-14 11:09:10 +02:00
Sara Arjona	c537bd587c	Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE	2021-05-14 11:09:07 +02:00
AMOS bot	3f02adabd1	Automatically generated installer lang files	2021-05-14 00:07:33 +00:00
Víctor Déniz	439d1cf29d	Merge branch 'MDL-71569_Summarydata' of https://github.com/brickfield/moodle into MOODLE_311_STABLE	2021-05-13 22:40:15 +01:00
Sara Arjona	511986822d	Merge branch 'MDL-71611-311_blockaccessreviewupgrade' of https://github.com/brickfield/moodle into MOODLE_311_STABLE	2021-05-13 11:45:41 +02:00
Jun Pataleta	3bf7557afd	Merge branch 'MDL-71612-311' of https://github.com/snake/moodle into MOODLE_311_STABLE	2021-05-13 14:30:07 +08:00
Jun Pataleta	789fab146f	Merge branch 'MDL-71584-311_Languagestrings' of https://github.com/brickfield/moodle into MOODLE_311_STABLE	2021-05-13 14:00:28 +08:00
Jake Dallimore	aaaaf28ec2	MDL-71612 tool_oauth2: remove erroneous hideIf rules for form fields Some fields were being hidden based on whether the service was set up for internal service use or was a service shown on the login page. These fields refer to OAuth 2 logins and must be configurable for both kinds of services.	2021-05-13 12:54:01 +08:00
Eloy Lafuente (stronk7)	370a38484f	Merge branch 'MDL-71580-311-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_311_STABLE	2021-05-12 23:00:00 +02:00
Mike Churchward	311dc0cdea	MDL-71611 block_accessreview: Return formats if feature disabled.	2021-05-12 16:27:55 -04:00
David Mudrák	857d7b613f	MDL-71580 lang: Fix reworded strings in tests	2021-05-12 17:11:57 +02:00
Helen Foster	5070425e99	MDL-71580 lang: Import fixed English strings (en_fix)	2021-05-12 17:11:57 +02:00
Mike Churchward	38f57b67b6	MDL-71584 tool_brickfield: Fixed up language string issues.	2021-05-12 08:42:30 -04:00
Jun Pataleta	6c3f385c8b	Merge branch 'MDL-71590-311' of git://github.com/HuongNV13/moodle into MOODLE_311_STABLE	2021-05-12 13:25:28 +08:00
Huong Nguyen	8a4a205bb5	MDL-71590 usertours: Create language string for activity information	2021-05-12 11:30:54 +07:00
Jake Dallimore	c2d7d4cf35	Merge branch 'MDL-71583_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE	2021-05-12 10:36:01 +08:00
Karen Holland	66a7400dcf	MDL-71569 Accessibility toolkit: Fix Summary data task failure	2021-05-11 19:44:41 -04:00
Eloy Lafuente (stronk7)	0524a0b9f9	MDL-71583 versions: Add all the missing full-stops to version/requires It seems that the new phpcs3 checker is now controlling those line comments that previously were ignored. This commit just looks for all the cases and bulk-add them when needed. The bash script (mac) used to add all them is: while read -r line; do arr=(${line//:/ }) if [[ -n ${arr[0]} ]] && [[ -n ${arr[1]} ]]; then echo " file ${arr[0]}, line ${arr[1]}" sed -i "${arr[1]}s/\$/\./" ${arr[0]} fi done < <(find . -name version.php \| xargs ag --nomultiline '>(version\|requires) =.//.*[^;\.]$')	2021-05-11 20:00:11 +02:00
Eloy Lafuente (stronk7)	ab8275f28f	MDL-71583 versions: main version bump	2021-05-11 18:50:49 +02:00
Eloy Lafuente (stronk7)	71d0cfefab	MDL-71583 versions: bump all versions and requires near release version = 2021051700 release version requires= 2021051100 current rc1 (week7roll1) version Note that, because we are under parallel development period, this is being done in the branch that is going to be released (MOODLE_311_STABLE already existing) for Moodle 3.11.0 and not in master, that is the one getting the bump under normal (non-parallel) periods.	2021-05-11 18:50:34 +02:00
Sara Arjona	62142a081a	Moodle release 3.11rc1	2021-05-11 12:43:50 +02:00
Sara Arjona	7fa14d7439	Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE	2021-05-11 12:43:47 +02:00
AMOS bot	9f2e86e07c	Automatically generated installer lang files	2021-05-11 00:07:34 +00:00
Thong Bui	6af383f5b4	MDL-71060 Questions: Duplicates 'Current category' text.	2021-05-10 23:25:12 +01:00
Víctor Déniz	c53a0816c4	Merge branch 'MDL-70900_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE	2021-05-10 22:46:30 +01:00
Víctor Déniz	773e8b6cda	Merge branch 'MDL-71543-311_toggleicon' of https://github.com/brickfield/moodle into MOODLE_311_STABLE	2021-05-10 22:18:35 +01:00
Sara Arjona	e62225b1f5	Merge branch 'MDL-71570-311' of git://github.com/mihailges/moodle into MOODLE_311_STABLE	2021-05-10 15:38:30 +02:00
Sara Arjona	7969291581	Merge branch 'm311_MDL-71533' of git://github.com/danmarsden/moodle into MOODLE_311_STABLE	2021-05-10 11:38:05 +02:00
Jun Pataleta	e4a811ab21	Merge branch 'MDL-71552-311_heatmaptoggle' of https://github.com/brickfield/moodle into MOODLE_311_STABLE	2021-05-10 17:23:11 +08:00
Mihail Geshoski	f78e9f3ffe	MDL-71570 mod_forum: Avoid using deprecated string in forum templates	2021-05-10 12:22:11 +08:00
Mihail Geshoski	f0351e4d95	MDL-71570 core_grades: Avoid using deprecated string in grade templates	2021-05-10 12:22:10 +08:00
Víctor Déniz	ec21302c3c	Merge branch 'MDL-71544-311_Errorspage' of https://github.com/brickfield/moodle into MOODLE_311_STABLE	2021-05-08 20:20:57 +01:00
Eloy Lafuente (stronk7)	09febbd51b	MDL-70900 ci: Move highest PHP to 8.0 (from current 7.4) Also adds xmlrpc-beta from PECL (PHP8 moved the extension there) and setups max_input_vars=5000 as initial value (see MDL-71390). Note that this also includes a tiny modification when configuring redis sessions, because there was some outdated code from old issue, now fixed (MDL-60978), so that info has been removed.	2021-05-07 17:43:22 +02:00
Dan Marsden	c0e623878e	MDL-71533 lib: Remove libraries that already exist in core.	2021-05-07 12:24:12 +12:00
Mike Churchward	e514384695	MDL-71543 block_accessreview: Toggling the heatmap icon image.	2021-05-06 17:28:26 -04:00
Mike Churchward	94e6f3c84f	MDL-71552 block_accessreview: Removed 'alert' class when toggling off.	2021-05-06 15:24:28 -04:00
Mike Churchward	f136aec38f	MDL-71544 tool_brickfield: Allowing text to break in table.	2021-05-06 13:10:47 -04:00