' . t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') . '
'; + return '' . t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') . '
' + . '' . t('Projects covered by Drupal’s security advisory policy will have security advisories responsibly disclosed when vulnerabilities are reported to Drupal’s security team. Projects from Drupal.org that are not covered may have publicly disclosed vulnerabilities.') . '
'; case 'system.modules_list': if (_update_manager_access()) { @@ -245,7 +246,12 @@ function update_theme() { // We are using template instead of '#type' => 'table' here to keep markup // out of preprocess and allow for easier changes to markup. 'update_version' => [ - 'variables' => ['version' => NULL, 'title' => NULL, 'attributes' => []], + 'variables' => [ + 'version' => NULL, + 'title' => NULL, + 'attributes' => [], + 'version_type' => NULL, + ], 'file' => 'update.report.inc', ], ]; diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc index 7b14a05852..71839ae383 100644 --- a/core/modules/update/update.report.inc +++ b/core/modules/update/update.report.inc @@ -8,6 +8,8 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Template\Attribute; use Drupal\Core\Url; +use Drupal\update\UpdateFetcherInterface; +use Drupal\update\UpdateManagerInterface; /** * Prepares variables for project status report templates. @@ -39,45 +41,39 @@ function template_preprocess_update_report(&$variables) { $variables['no_updates_message'] = _update_no_data(); } - $rows = []; - + $projects = []; foreach ($data as $project) { - $project_status = [ - '#theme' => 'update_project_status', - '#project' => $project, - ]; - - // Build project rows. - if (!isset($rows[$project['project_type']])) { - $rows[$project['project_type']] = [ - '#type' => 'table', - '#attributes' => ['class' => ['update']], - ]; - } - $row_key = !empty($project['title']) ? Unicode::strtolower($project['title']) : Unicode::strtolower($project['name']); - - // Add the project status row and details. - $rows[$project['project_type']][$row_key]['status'] = $project_status; - - // Add project status class attribute to the table row. + // Add the project status and details. switch ($project['status']) { - case UPDATE_CURRENT: - $rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-success']]; + case UpdateManagerInterface::CURRENT: + $class = 'color-success'; break; - case UPDATE_UNKNOWN: - case UPDATE_FETCH_PENDING: - case UPDATE_NOT_FETCHED: - case UPDATE_NOT_SECURE: - case UPDATE_REVOKED: - case UPDATE_NOT_SUPPORTED: - $rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-error']]; + + case UpdateFetcherInterface::UNKNOWN: + case UpdateFetcherInterface::FETCH_PENDING: + case UpdateFetcherInterface::NOT_FETCHED: + case UpdateManagerInterface::NOT_SECURE: + case UpdateManagerInterface::REVOKED: + case UpdateManagerInterface::NOT_SUPPORTED: + $class = 'color-error'; break; - case UPDATE_NOT_CHECKED: - case UPDATE_NOT_CURRENT: + + case UpdateFetcherInterface::NOT_CHECKED: + case UpdateManagerInterface::NOT_CURRENT: default: - $rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-warning']]; + $class = 'color-warning'; break; } + $projects[$project['project_type']][Unicode::strtolower(!empty($project['title']) ? $project['title'] : $project['name'])] = [ + '#theme' => 'admin_block', + '#block' => [ + 'content' => [ + '#theme' => 'update_project_status', + '#project' => $project, + ], + ], + '#attributes' => ['class' => [$class]], + ]; } $project_types = [ @@ -90,11 +86,11 @@ function template_preprocess_update_report(&$variables) { $variables['project_types'] = []; foreach ($project_types as $type_name => $type_label) { - if (!empty($rows[$type_name])) { - ksort($rows[$type_name]); + if (!empty($projects[$type_name])) { + ksort($projects[$type_name]); $variables['project_types'][] = [ 'label' => $type_label, - 'table' => $rows[$type_name], + 'table' => $projects[$type_name], ]; } } @@ -159,8 +155,9 @@ function template_preprocess_update_project_status(&$variables) { $versions_inner[] = [ '#theme' => 'update_version', '#version' => $project['releases'][$project['recommended']], - '#title' => t('Recommended version:'), + '#title' => t('Recommended update:'), '#attributes' => ['class' => $version_class], + '#version_type' => 'recommended', ]; } @@ -173,6 +170,7 @@ function template_preprocess_update_project_status(&$variables) { '#version' => $security_update, '#title' => t('Security update:'), '#attributes' => ['class' => $security_class], + '#version_type' => 'security', ]; } } @@ -184,6 +182,7 @@ function template_preprocess_update_project_status(&$variables) { '#version' => $project['releases'][$project['latest_version']], '#title' => t('Latest version:'), '#attributes' => ['class' => ['version-latest']], + '#version_type' => 'latest', ]; } if ($project['install_type'] == 'dev' @@ -195,6 +194,7 @@ function template_preprocess_update_project_status(&$variables) { '#version' => $project['releases'][$project['dev_version']], '#title' => t('Development version:'), '#attributes' => ['class' => ['version-latest']], + '#version_type' => 'dev', ]; } } @@ -206,10 +206,22 @@ function template_preprocess_update_project_status(&$variables) { '#version' => $project['releases'][$also], '#title' => t('Also available:'), '#attributes' => ['class' => ['version-also-available']], + '#version_type' => 'also', ]; } } + // Currently installed version. + if (isset($project['releases'][$project['version_normalized']])) { + $versions_inner[] = [ + '#theme' => 'update_version', + '#version' => $project['releases'][$project['version_normalized']], + '#title' => t('Installed version:'), + '#attributes' => ['class' => ['project-update__version--installed']], + '#version_type' => 'installed', + ]; + } + if (!empty($versions_inner)) { $variables['versions'] = $versions_inner; } diff --git a/core/themes/seven/css/components/update.admin.theme.css b/core/themes/seven/css/components/update.admin.theme.css new file mode 100644 index 0000000000..3891e864fc --- /dev/null +++ b/core/themes/seven/css/components/update.admin.theme.css @@ -0,0 +1,66 @@ +/** + * @file + * Styles used by the Update Manager module. + */ + +.project-update__title { + font-weight: bold; + font-size: 110%; +} +.project-update__status { + float: right; /* LTR */ + font-size: 110%; +} +[dir="rtl"] .project-update__status { + float: left; +} +.project-update__status--not-supported { + float: left; /* LTR */ +} +[dir="rtl"] .project-update__status--not-supported { + float: right; +} +.project-update__status--security-error { + font-weight: bold; + color: #970f00; +} + +.project-update__status-icon { + padding-left: 0.5em; /* LTR */ +} +[dir="rtl"] .project-update__status-icon { + padding-left: 0; + padding-right: 0.5em; +} +.project-update__details { + padding: 1em 1em 0.25em 1em; +} + +.project-update__version { + border-bottom: 1px solid #bfbfbf; + padding: 0.5em 0; +} +.project-update__version--installed { + border-bottom: none; +} +.project-update__version-date { + white-space: nowrap; +} +.project-update__version-details { + padding-right: 0.5em; /* LTR */ +} +[dir="rtl"] .project-update__version-details { + padding-left: 0.5em; + direction: ltr; /* Version numbers should always be LTR. */ +} +.project-update__version-links { + text-align: right; /* LTR */ + list-style-type: none; +} +[dir="rtl"] .project-update__version-links { + text-align: left; +} +.project-update__version--recommended-strong .project-update__version-title, +.version-security .project-update__version-title { + font-weight: bold; +} diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml index 3f0e43c025..559a06160c 100644 --- a/core/themes/seven/seven.info.yml +++ b/core/themes/seven/seven.info.yml @@ -42,6 +42,8 @@ libraries-override: assets/vendor/jquery.ui/themes/base/dialog.css: false classy/dialog: seven/seven.drupal.dialog + update/drupal.update.admin: + seven/drupal.update.admin libraries-extend: core/ckeditor: - seven/ckeditor-dialog diff --git a/core/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml index 508c0fe497..de1d1e048d 100644 --- a/core/themes/seven/seven.libraries.yml +++ b/core/themes/seven/seven.libraries.yml @@ -93,6 +93,12 @@ drupal.responsive-detail: - core/jquery.once - core/collapse +drupal.update.admin: + version: VERSION + css: + theme: + css/components/update.admin.theme.css: {} + vertical-tabs: version: VERSION css: diff --git a/core/themes/seven/templates/update-project-status.html.twig b/core/themes/seven/templates/update-project-status.html.twig new file mode 100644 index 0000000000..894379e785 --- /dev/null +++ b/core/themes/seven/templates/update-project-status.html.twig @@ -0,0 +1,103 @@ +{# +/** + * @file + * Default theme implementation for the project status report. + * + * Available variables: + * - title: The project title. + * - url: The project url. + * - status: The project status. + * - label: The project status label. + * - attributes: HTML attributes for the project status. + * - reason: The reason you should update the project. + * - icon: The project status version indicator icon. + * - existing_version: The version of the installed project. + * - versions: The available versions of the project. + * - install_type: The type of project (e.g., dev). + * - datestamp: The date/time of a project version's release. + * - extras: HTML attributes and additional information about the project. + * - attributes: HTML attributes for the extra item. + * - label: The label for an extra item. + * - data: The data about an extra item. + * - includes: The projects within the project. + * - disabled: The currently disabled projects in the project. + * + * @see template_preprocess_update_project_status() + * + * @ingroup themeable + */ +#} +{% + set status_classes = [ + project.status == constant('UPDATE_NOT_SECURE') ? 'project-update__status--security-error', + project.status == constant('UPDATE_REVOKED') ? 'project-update__status--revoked', + project.status == constant('UPDATE_NOT_SUPPORTED') ? 'project-update__status--not-supported', + project.status == constant('UPDATE_NOT_CURRENT') ? 'project-update__status--not-current', + project.status == constant('UPDATE_CURRENT') ? 'project-update__status--current', + ] +%} +