MDL-81129 hub: Update the intro paragraph on the site registration page

I added a new javascript in admin to trigger a collapse element to be
expanded using the URL hash.

admin/amd/build/expand_hash.min.js

@@ -0,0 +1,12 @@
+define("core_admin/expand_hash",["exports"],(function(_exports){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=_exports.expandSection=void 0;
+/**
+   * Expand the collapse section element.
+   *
+   * @module      core_admin/expand_hash
+   * @copyright   Meirza <meirza.arson@moodle.com>
+   * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   * @since       4.5
+   */
+const SELECTORS_COLLAPSE_ELEMENTS='[data-toggle="collapse"]',SELECTORS_FOCUSTHENEXPAND_ELEMENTS=".focus-expand";_exports.init=()=>{const focusexpand=document.querySelector(SELECTORS_FOCUSTHENEXPAND_ELEMENTS);null==focusexpand||focusexpand.addEventListener("click",(()=>{expandSection("".concat(focusexpand.getAttribute("href")))}))};const expandSection=hash=>{const container=document.querySelector(hash),targetContainer=null==container?void 0:container.querySelector(SELECTORS_COLLAPSE_ELEMENTS);if("false"===(null==targetContainer?void 0:targetContainer.getAttribute("aria-expanded"))){const collapseId=targetContainer.getAttribute("aria-controls"),collapseContainer=document.getElementById(collapseId);collapseContainer.classList.remove("collapse"),collapseContainer.classList.add("show"),targetContainer.setAttribute("aria-expanded","true"),targetContainer.classList.remove("collapsed");const collapseElement=document.querySelector(".collapseexpand.collapsemenu");collapseElement.setAttribute("aria-expanded","true"),collapseElement.classList.remove("collapsed")}};_exports.expandSection=expandSection}));
+
+//# sourceMappingURL=expand_hash.min.js.map

admin/amd/build/expand_hash.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expand_hash.min.js","sources":["../src/expand_hash.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Expand the collapse section element.\n *\n * @module      core_admin/expand_hash\n * @copyright   Meirza <meirza.arson@moodle.com>\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since       4.5\n */\n\nconst SELECTORS = {\n    COLLAPSE_ELEMENTS: '[data-toggle=\"collapse\"]',\n    FOCUSTHENEXPAND_ELEMENTS: '.focus-expand',\n};\n\n/**\n * Initializes the focus and expand functionality.\n */\nexport const init = () => {\n    // Select all collapsible elements only.\n    const focusexpand = document.querySelector(SELECTORS.FOCUSTHENEXPAND_ELEMENTS);\n\n    // Add click event listener to the anchor element\n    focusexpand?.addEventListener('click', () => {\n        expandSection(`${focusexpand.getAttribute('href')}`);\n    });\n};\n\n/**\n * Expands a section based on the provided URL hash.\n *\n * This function takes a hash string, finds the corresponding element in the DOM,\n * and expands it if it is currently collapsed. It updates the necessary ARIA\n * attributes and classes to reflect the expanded state.\n *\n * @param {string} hash - The hash (e.g., '#elementId') of the element to expand.\n */\nexport const expandSection = (hash) => {\n    const container = document.querySelector(hash);\n    const targetContainer = container?.querySelector(SELECTORS.COLLAPSE_ELEMENTS);\n\n    if (targetContainer?.getAttribute('aria-expanded') === 'false') {\n        const collapseId = targetContainer.getAttribute('aria-controls');\n        const collapseContainer = document.getElementById(collapseId);\n\n        // Show the content.\n        collapseContainer.classList.remove('collapse');\n        collapseContainer.classList.add('show');\n\n        // Update aria-expanded attribute to reflect the new state.\n        targetContainer.setAttribute('aria-expanded', 'true');\n        targetContainer.classList.remove('collapsed');\n\n        // Get collapse expand menu element.\n        const collapseElement = document.querySelector('.collapseexpand.collapsemenu');\n        // Ensure it gets noticed to make it work.\n        collapseElement.setAttribute('aria-expanded', 'true');\n        collapseElement.classList.remove('collapsed');\n    }\n};\n"],"names":["SELECTORS","focusexpand","document","querySelector","addEventListener","expandSection","getAttribute","hash","container","targetContainer","collapseId","collapseContainer","getElementById","classList","remove","add","setAttribute","collapseElement"],"mappings":";;;;;;;;;MAwBMA,4BACiB,2BADjBA,mCAEwB,8BAMV,WAEVC,YAAcC,SAASC,cAAcH,oCAG3CC,MAAAA,aAAAA,YAAaG,iBAAiB,SAAS,KACnCC,wBAAiBJ,YAAYK,aAAa,oBAarCD,cAAiBE,aACpBC,UAAYN,SAASC,cAAcI,MACnCE,gBAAkBD,MAAAA,iBAAAA,UAAWL,cAAcH,gCAEM,WAAnDS,MAAAA,uBAAAA,gBAAiBH,aAAa,kBAA8B,OACtDI,WAAaD,gBAAgBH,aAAa,iBAC1CK,kBAAoBT,SAASU,eAAeF,YAGlDC,kBAAkBE,UAAUC,OAAO,YACnCH,kBAAkBE,UAAUE,IAAI,QAGhCN,gBAAgBO,aAAa,gBAAiB,QAC9CP,gBAAgBI,UAAUC,OAAO,mBAG3BG,gBAAkBf,SAASC,cAAc,gCAE/Cc,gBAAgBD,aAAa,gBAAiB,QAC9CC,gBAAgBJ,UAAUC,OAAO"}

admin/amd/src/expand_hash.js

@@ -0,0 +1,74 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Expand the collapse section element.
+ *
+ * @module      core_admin/expand_hash
+ * @copyright   Meirza <meirza.arson@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since       4.5
+ */
+
+const SELECTORS = {
+    COLLAPSE_ELEMENTS: '[data-toggle="collapse"]',
+    FOCUSTHENEXPAND_ELEMENTS: '.focus-expand',
+};
+
+/**
+ * Initializes the focus and expand functionality.
+ */
+export const init = () => {
+    // Select all collapsible elements only.
+    const focusexpand = document.querySelector(SELECTORS.FOCUSTHENEXPAND_ELEMENTS);
+
+    // Add click event listener to the anchor element
+    focusexpand?.addEventListener('click', () => {
+        expandSection(`${focusexpand.getAttribute('href')}`);
+    });
+};
+
+/**
+ * Expands a section based on the provided URL hash.
+ *
+ * This function takes a hash string, finds the corresponding element in the DOM,
+ * and expands it if it is currently collapsed. It updates the necessary ARIA
+ * attributes and classes to reflect the expanded state.
+ *
+ * @param {string} hash - The hash (e.g., '#elementId') of the element to expand.
+ */
+export const expandSection = (hash) => {
+    const container = document.querySelector(hash);
+    const targetContainer = container?.querySelector(SELECTORS.COLLAPSE_ELEMENTS);
+
+    if (targetContainer?.getAttribute('aria-expanded') === 'false') {
+        const collapseId = targetContainer.getAttribute('aria-controls');
+        const collapseContainer = document.getElementById(collapseId);
+
+        // Show the content.
+        collapseContainer.classList.remove('collapse');
+        collapseContainer.classList.add('show');
+
+        // Update aria-expanded attribute to reflect the new state.
+        targetContainer.setAttribute('aria-expanded', 'true');
+        targetContainer.classList.remove('collapsed');
+
+        // Get collapse expand menu element.
+        const collapseElement = document.querySelector('.collapseexpand.collapsemenu');
+        // Ensure it gets noticed to make it work.
+        collapseElement.setAttribute('aria-expanded', 'true');
+        collapseElement.classList.remove('collapsed');
+    }
+};

admin/registration/index.php

@@ -125,4 +125,7 @@ if (\core\hub\registration::is_registered()) {
     echo html_writer::div(html_writer::link(new moodle_url($returnurl), get_string('skipregistration', 'hub')),
         'skipregistration mt-2');
 }
+
+$PAGE->requires->js_call_amd('core_admin/expand_hash', 'init');
+
 echo $OUTPUT->footer();

admin/renderer.php

@@ -2206,14 +2206,10 @@ class core_admin_renderer extends plugin_renderer_base {
      * @return string
      */
     public function moodleorg_registration_message() {
-
-        $out = format_text(get_string('registerwithmoodleorginfo', 'core_hub'), FORMAT_MARKDOWN);
-
-        $out .= html_writer::link(
-            MOODLE_PRODUCTURL.'/solutions/moodle-app/',
-            $this->output->pix_icon('i/info', '').' '.get_string('registerwithmoodleorginfoapp', 'core_hub'),
-            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
-        );
+        $a = new stdClass();
+        $a->moreinformation = '#id_sitestats'; // More information anchor.
+        $a->moodleapp = HUB_MOODLEORGHUBURL . '/solutions/moodle-app/';
+        $out = format_text(get_string('registerwithmoodleorginfo', 'core_hub', $a), FORMAT_MARKDOWN);
 
         $out .= html_writer::link(
             HUB_MOODLEORGHUBURL,

lang/en/deprecated.txt

@@ -127,3 +127,4 @@ reviewbadge,core_badges
 myisamproblem,core_error
 newpasswordtext,core
 cannotsetpassword,core_error
+registerwithmoodleorginfoapp,core_hub

lang/en/hub.php

@@ -105,15 +105,15 @@ $string['registeredactiveuserdevices'] = 'Number of active users with registered
 $string['registerwithmoodleorg'] = 'Register your site';
 $string['registerwithmoodleorgupdate'] = 'Update your site registration';
 $string['registerwithmoodleorgcomplete'] = 'Complete your site registration';
-$string['registerwithmoodleorginfo'] = 'We\'d love to stay in touch and provide you with important things for your Moodle site! By registering:
+$string['registerwithmoodleorginfo'] = 'Registering your site involves periodically sending <a href="{$a->moreinformation}" class="focus-expand">anonymised site stats</a> to Moodle HQ. This helps us gain insights into how you\'re using Moodle, and make decisions about new features and plugins.
 
-* You can subscribe to receive notifications of new Moodle releases, security alerts and other important news.
-* You can access and activate mobile push notifications from your Moodle site through our free Moodle app.
-* You are contributing to our Moodle statistics of the worldwide community, which help us improve Moodle and our community sites.
-* If you wish, your site can be included in the list of registered Moodle sites in your country.';
-$string['registerwithmoodleorginfoapp'] = 'About the Moodle app';
-$string['registerwithmoodleorginfostats'] = 'Moodle statistics';
-$string['registerwithmoodleorginfosites'] = 'Other sites in my country';
+Plus, it enables you to:
+
+* Stay up to date with important updates, like security alerts and new available releases.
+* Activate mobile push notifications for the <a href="{$a->moodleapp}">Moodle App</a>.
+* Increase the visibility of your site by featuring it on the list of registered Moodle sites in your country (optional).';
+$string['registerwithmoodleorginfosites'] = 'Discover other sites in my country';
+$string['registerwithmoodleorginfostats'] = 'View global Moodle stats';
 $string['registerwithmoodleorgremove'] = 'You are about to unregister your site. You will no longer receive security alert notifications and users will not be able to receive push notifications from your site to their Moodle app. However, you will be able to re-register at any time! Are you sure you want to continue?';
 $string['registrationconfirmed'] = 'Site registration confirmed';
 $string['registrationconfirmedon'] = 'Thank you for registering your site. Registration information will be kept up to date by the \'Site registration\' scheduled task.';
@@ -178,5 +178,6 @@ $string['wrongtoken'] = 'The registration failed for some unknown reason (networ
 $string['sitecommnewsno'] = 'No, I do not wish to receive any emails';
 
 // Deprecated since 4.5.
+$string['registerwithmoodleorginfoapp'] = 'About the Moodle app';
 $string['siteregistrationcontact'] = 'Display contact form';
 $string['siteregistrationcontact_help'] = 'If you allow it, other people in our Moodle community (who need a login account) can contact you via a form on our Moodle community site. However, they will never be able to see your email address.';