diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system/system.js | 21 | ||||
| -rw-r--r-- | modules/update/update.module | 8 |
2 files changed, 29 insertions, 0 deletions
diff --git a/modules/system/system.js b/modules/system/system.js index 7bea58dee..a0f712aec 100644 --- a/modules/system/system.js +++ b/modules/system/system.js @@ -2,6 +2,25 @@ (function ($) { /** + * Show/hide the 'Email site administrator when updates are available' checkbox + * on the install page. + */ +Drupal.hideEmailAdministratorCheckbox = function () { + // Make sure the secondary box is shown / hidden as necessary on page load. + if ($('#edit-update-status-module-1').is(':checked')) { + $('.update-status-module-2-wrapper').show(); + } + else { + $('.update-status-module-2-wrapper').hide(); + } + + // Toggle the display as necessary when the checkbox is clicked. + $('#edit-update-status-module-1').change( function () { + $('.update-status-module-2-wrapper').toggle(); + }) +}; + +/** * Internal function to check using Ajax if clean URLs can be enabled on the * settings page. * @@ -128,4 +147,6 @@ Drupal.behaviors.poweredByPreview = { } }; + })(jQuery); + diff --git a/modules/update/update.module b/modules/update/update.module index ca6cab3a5..2ba9add43 100644 --- a/modules/update/update.module +++ b/modules/update/update.module @@ -419,6 +419,14 @@ function update_mail($key, &$message, $params) { $message['body'][] = _update_message_text($msg_type, $msg_reason, FALSE, $language); } $message['body'][] = t('See the available updates page for more information:', array(), array('langcode' => $langcode)) . "\n" . url('admin/reports/updates', array('absolute' => TRUE, 'language' => $language)); + + $settings_url = url('admin/settings/updates', array('absolute' => TRUE)); + if (variable_get('update_notification_threshold', 'all') == 'all') { + $message['body'][] = t('Your site is currently configured to send these emails when any updates are available. To get notified only for security updates, please visit !url.', array('!url' => $settings_url)); + } + else { + $message['body'][] = t('Your site is currently configured to send these emails only when security updates are available. To get notified for any available updates, please visit !url.', array('!url' => $settings_url)); + } } /** |