diff --git a/admin/renderer.php b/admin/renderer.php index 0dab67c514d..0f9333f78e5 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -2210,7 +2210,7 @@ class core_admin_renderer extends plugin_renderer_base { $out = format_text(get_string('registerwithmoodleorginfo', 'core_hub'), FORMAT_MARKDOWN); $out .= html_writer::link( - new moodle_url('/admin/settings.php', ['section' => 'moodleservices']), + MOODLE_PRODUCTURL.'/solutions/moodle-app/', $this->output->pix_icon('i/info', '').' '.get_string('registerwithmoodleorginfoapp', 'core_hub'), ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href'] ); diff --git a/admin/settings/moodleservices.php b/admin/settings/moodleservices.php deleted file mode 100644 index 2f34cfdb0e0..00000000000 --- a/admin/settings/moodleservices.php +++ /dev/null @@ -1,53 +0,0 @@ -. - -/** - * This file gives information about Moodle Services - * - * @package core - * @copyright 2018 Amaia Anabitarte - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -defined('MOODLE_INTERNAL') || die(); - -if ($hassiteconfig) { - - // Create Moodle Services information. - $moodleservices->add(new admin_setting_heading('moodleservicesintro', '', - new lang_string('moodleservices_help', 'admin'))); - - // Moodle Partners information. - if (empty($CFG->disableserviceads_partner)) { - $moodleservices->add(new admin_setting_heading('moodlepartners', - new lang_string('moodlepartners', 'admin'), - new lang_string('moodlepartners_help', 'admin'))); - } - - // Moodle app information. - $moodleservices->add(new admin_setting_heading('moodleapp', - new lang_string('moodleapp', 'admin'), - new lang_string('moodleapp_help', 'admin'))); - - // Branded Moodle app information. - if (empty($CFG->disableserviceads_branded)) { - $moodleservices->add(new admin_setting_heading('moodlebrandedapp', - new lang_string('moodlebrandedapp', 'admin'), - new lang_string('moodlebrandedapp_help', 'admin'))); - } -} - - diff --git a/admin/settings/top.php b/admin/settings/top.php index d567741ad85..3161059a587 100644 --- a/admin/settings/top.php +++ b/admin/settings/top.php @@ -14,12 +14,6 @@ $ADMIN->add('root', new admin_externalpage('registrationmoodleorg', new lang_str new moodle_url("/admin/registration/index.php"))); // hidden upgrade script $ADMIN->add('root', new admin_externalpage('upgradesettings', new lang_string('upgradesettings', 'admin'), "$CFG->wwwroot/$CFG->admin/upgradesettings.php", 'moodle/site:config', true)); - -// Adding Moodle Services information page. -$moodleservices = new admin_settingpage('moodleservices', new lang_string('moodleservices', - 'admin')); -$ADMIN->add('root', $moodleservices); - $userfeedback = new admin_settingpage('userfeedback', new lang_string('feedbacksettings', 'admin')); $ADMIN->add('root', $userfeedback); diff --git a/lang/en/admin.php b/lang/en/admin.php index eca426df416..cfbc3a23988 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -957,20 +957,8 @@ $string['nosupportedlogstore'] = 'No supported logstore found'; $string['noteunneededblocks'] = 'Note: Blocks set to show will not be listed in the \'Add a block\' menu in a course if they are specified in the theme setting \'Unneeded blocks\'.'; $string['maxtimelimit'] = 'Maximum time limit'; $string['maxtimelimit_desc'] = 'To restrict the maximum PHP execution time that Moodle will allow without any output being displayed, enter a value in seconds here. 0 means that Moodle default restrictions are used. If you have a front-end server with its own time limit, set this value lower to receive PHP errors in logs. Does not apply to CLI scripts.'; -$string['moodleapp'] = 'Moodle app'; -$string['moodleapp_help'] = '

The free Moodle app enables users to access their courses on mobile devices. Additional app features are available with a Pro or Premium app plan.

-Get the Moodle app
-Moodle Apps Portal'; $string['moodlebrandedapp'] = 'Branded Moodle app'; -$string['moodlebrandedapp_help'] = '

The Branded Moodle app has all the functionality of our free mobile app for Moodle combined with your own custom branding.

-About the Branded Moodle app'; $string['moodlebrandedappreference'] = 'Alternatively, get a Branded Moodle app with your own custom branding.'; -$string['moodlepartners'] = 'Moodle Partners'; -$string['moodlepartners_help'] = '

Moodle Partners are services providers that are certified by Moodle HQ to provide high quality Moodle services for your organisation\'s online learning environment.

-About our Partners
-Find a Partner'; -$string['moodleservices'] = 'Moodle services'; -$string['moodleservices_help'] = 'Make sure you get the best from your Moodle learning environment by using these Moodle services:'; $string['noreplyaddress'] = 'No-reply address'; $string['noreplydomain'] = 'No-reply and domain'; $string['noreplydomaindetail'] = 'Settings for No-reply and configured domains'; @@ -1650,3 +1638,15 @@ $string['taskdeletecachetext'] = 'Delete old text cache records'; $string['themesettings'] = 'Theme settings'; $string['linkcoursesections'] = 'Always link course sections'; $string['linkcoursesections_help'] = 'Always try to provide a link for course sections. Course sections are usually only shown as links if the course format displays a single section per page. If this setting is enabled a link will always be provided.'; +$string['moodleapp'] = 'Moodle app'; +$string['moodleapp_help'] = '

The free Moodle app enables users to access their courses on mobile devices. Additional app features are available with a Pro or Premium app plan.

+Get the Moodle app
+Moodle Apps Portal'; +$string['moodlebrandedapp_help'] = '

The Branded Moodle app has all the functionality of our free mobile app for Moodle combined with your own custom branding.

+About the Branded Moodle app'; +$string['moodlepartners'] = 'Moodle Partners'; +$string['moodlepartners_help'] = '

Moodle Partners are services providers that are certified by Moodle HQ to provide high quality Moodle services for your organisation\'s online learning environment.

+About our Partners
+Find a Partner'; +$string['moodleservices'] = 'Moodle services'; +$string['moodleservices_help'] = 'Make sure you get the best from your Moodle learning environment by using these Moodle services:'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 4a591276b46..42b5148ed5f 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -113,6 +113,13 @@ updatingain,core summaryof,core gradeitemadvanced,core_grades gradeitemadvanced_help,core_grades +moodleapp,core_admin +moodleapp_help,core_admin +moodlebrandedapp_help,core_admin +moodlepartners,core_admin +moodlepartners_help,core_admin +moodleservices,core_admin +moodleservices_help,core_admin to,core from,core aria-toggledropdown,core_grades diff --git a/lib/moodlelib.php b/lib/moodlelib.php index dc276725674..22b56caf6f7 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -536,6 +536,11 @@ define('HOMEPAGE_MYCOURSES', 3); */ defined('HUB_MOODLEORGHUBURL') || define('HUB_MOODLEORGHUBURL', 'https://stats.moodle.org'); +/** + * URL of main Moodle site for marketing, products and services. + */ +defined('MOODLE_PRODUCTURL') || define('MOODLE_PRODUCTURL', 'https://moodle.com'); + /** * URL of the statistic server public key. */