Commit 6112d7b9 authored by heddn's avatar heddn Committed by heddn
Browse files

Issue #3093072 by heddn, mherchel: Improve UX of settings page

parent be1f33e7
......@@ -38,7 +38,7 @@ function automatic_updates_admin_form() {
$form['automatic_updates_ignored_paths'] = [
'#type' => 'textarea',
'#title' => t('Paths to ignore for readiness checks'),
'#description' => t('Paths relative to %drupal_root. One path per line.', ['%drupal_root' => DRUPAL_ROOT]),
'#description' => t('Paths relative to %drupal_root. One path per line. Automatic Updates is intentionally limited to Drupal core. It is recommended to ignore paths to contrib extensions.', ['%drupal_root' => DRUPAL_ROOT]),
'#default_value' => variable_get('automatic_updates_ignored_paths', "sites/all/modules/*\nsites/all/themes/*"),
'#states' => [
'visible' => [
......@@ -66,18 +66,18 @@ function automatic_updates_admin_form() {
'#value' => t('A security update is available for your version of Drupal.'),
];
}
$update_text = t('Even with all that caution, if you want to try it out... <i>no update is available at this time. Check back later once a newer release is provided for a link to update your site.</i>');
$update_text = t('Your site is running %version of Drupal core. No recommended update is available at this time.', ['%version' => VERSION]);
if ($not_recommended && $no_dev_core) {
$from_version = VERSION;
$to_version = $data['drupal']['latest_version'];
$query['token'] = drupal_get_token('in-place-automatic-updates-link');
$update_text = t('Even with all that caution, if you want to try it out, <a href="@link">update now</a>.', [
$update_text = t('Even with all that caution, if you want to try it out, <a href="@link">manually update now</a>.', [
'@link' => url("/automatic_updates/in-place-update/drupal/core/$from_version/$to_version", ['query' => $query]),
]);
}
$form['experimental']['update'] = [
'#prefix' => 'Database updates are not run after an update. This module does not have a stable release and it is recommended to not use these features on a live website. Use at your own risk.',
'#prefix' => 'Database updates are <strong>not</strong> run after an update. This module does not have a stable release and it is recommended to not use these features on a live website. Use at your own risk.',
'#type' => 'html_tag',
'#tag' => 'p',
'#value' => $update_text,
......@@ -87,7 +87,7 @@ function automatic_updates_admin_form() {
'#type' => 'checkbox',
'#title' => t('Enable automatic updates of Drupal core via cron.'),
'#default_value' => variable_get('automatic_updates_enable_cron_updates', FALSE),
'#description' => t('As an alternative to the full control of manually executing an update, enable automated updates via cron.'),
'#description' => t('When a recommended update for Drupal core is available, a manual method to update is available. As an alternative to the full control of manually executing an update, enable automated updates via cron.'),
'#states' => [
'visible' => [
':input[name="automatic_updates_enable_readiness_checks"]' => ['checked' => TRUE],
......
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