Commit 9b3f4b56 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Adding additional description text to explain the settings (Bug #1299993)

Change-Id: I9b87550d4b542b5e46df9a055968fdd48cb6867f
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent ea47410c
......@@ -546,7 +546,15 @@ $siteoptionform = array(
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('notificationsettings', 'admin'),
'elements' => $notificationelements,
'elements' => array_merge(
array(
'activitydescription' => array(
'type' => 'html',
'class' => 'description',
'value' => get_string('notificationsettingsdescription', 'admin'),
)
),
$notificationelements),
),
'generalsettings' => array(
'type' => 'fieldset',
......
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Objectionable content in forum</h3>
<p>Messages to administrators that contain complaints by users about objectionable forum content. Forum topics and posts can be flagged as containing objectionable content.</p>
\ No newline at end of file
......@@ -542,9 +542,8 @@ $string['emailsmtpsecuretls'] = 'TLS';
$string['emailnoreplyaddress'] = 'System mail address';
$string['emailnoreplyaddressdescription'] = 'Emails come out as from this address';
$string['notificationsettings'] = 'Notification settings';
$string['notificationsettingsdescription'] = 'Here you can set the default options for new users to get notifications. Users can override these settings on their own "Settings -> Notifications" page.<br>
If you select either of the email options, notifications will still arrive in the user\'s inbox, but they will be automatically marked as read.';
// Upload CSV and CSV errors
$string['csvfile'] = 'CSV file';
......
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Objectionable content</h3>
<p>Messages to administrators that contain complaints by users about objectionable content.</p>
<p>Pages and artefacts can be flagged as containing objectionable content.</p>
\ No newline at end of file
<p>Messages to administrators that contain complaints by users about objectionable content. Pages and artefacts can be flagged as containing objectionable content.</p>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment