From 2afbf15b31e4339ce2a03d20cb36301e8b00c80c Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 22 Feb 2022 14:00:10 +0000
Subject: [PATCH] =?UTF-8?q?Issue=20#3215044=20by=20quietone,=20murilohp,?=
=?UTF-8?q?=20larowlan,=20G=C3=A1bor=20Hojtsy,=20catch,=20dww,=20daffie:?=
=?UTF-8?q?=20Promote=20the=20non-stable=20statuses=20in=20admin/appearanc?=
=?UTF-8?q?e=20page,=20optionally=20even=20visually?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(cherry picked from commit 44a1bff1f4b9fe0eea493a9067b3dfaafc8e91be)
---
core/modules/system/css/system.admin.css | 4 ++++
.../src/Controller/SystemController.php | 22 ++++++++++++++++---
.../tests/src/Functional/System/ThemeTest.php | 9 ++++++++
3 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/core/modules/system/css/system.admin.css b/core/modules/system/css/system.admin.css
index 2577c724b164..36c3f17c2dcd 100644
--- a/core/modules/system/css/system.admin.css
+++ b/core/modules/system/css/system.admin.css
@@ -255,6 +255,10 @@ small .admin-link:after {
.theme-info__description {
margin-top: 0;
}
+.theme-link--non-stable {
+ padding-left: 18px;
+ background: url(../../../misc/icons/e29700/warning.svg) 0 50% no-repeat; /* LTR */
+}
.system-themes-list {
margin-bottom: 20px;
}
diff --git a/core/modules/system/src/Controller/SystemController.php b/core/modules/system/src/Controller/SystemController.php
index 83b2bcce5794..4d30102d06bb 100644
--- a/core/modules/system/src/Controller/SystemController.php
+++ b/core/modules/system/src/Controller/SystemController.php
@@ -4,11 +4,13 @@
use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Extension\ExtensionLifecycle;
use Drupal\Core\Extension\ModuleDependencyMessageTrait;
use Drupal\Core\Extension\ModuleExtensionList;
use Drupal\Core\Extension\ThemeExtensionList;
use Drupal\Core\Extension\ThemeHandlerInterface;
use Drupal\Core\Form\FormBuilderInterface;
+use Drupal\Core\Link;
use Drupal\Core\Menu\MenuLinkTreeInterface;
use Drupal\Core\Menu\MenuTreeParameters;
use Drupal\Core\Theme\ThemeAccessCheck;
@@ -347,8 +349,7 @@ public function themesPage() {
}
}
- // Add notes to default theme, administration theme and experimental
- // themes.
+ // Add notes to default theme, administration theme and non-stable themes.
$theme->notes = [];
if ($theme->is_default) {
$theme->notes[] = $this->t('default theme');
@@ -356,7 +357,22 @@ public function themesPage() {
if ($theme->is_admin) {
$theme->notes[] = $this->t('administration theme');
}
- if ($theme->isExperimental()) {
+ $lifecycle = $theme->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER];
+ if (!empty($theme->info[ExtensionLifecycle::LIFECYCLE_LINK_IDENTIFIER])) {
+ $theme->notes[] = Link::fromTextAndUrl($this->t('@lifecycle', ['@lifecycle' => ucfirst($lifecycle)]),
+ Url::fromUri($theme->info[ExtensionLifecycle::LIFECYCLE_LINK_IDENTIFIER], [
+ 'attributes' =>
+ [
+ 'class' => 'theme-link--non-stable',
+ 'aria-label' => $this->t('View information on the @lifecycle status of the theme @theme', [
+ '@lifecycle' => ucfirst($lifecycle),
+ '@theme' => $theme->info['name'],
+ ]),
+ ],
+ ])
+ )->toString();
+ }
+ if ($theme->isExperimental() && empty($theme->info[ExtensionLifecycle::LIFECYCLE_LINK_IDENTIFIER])) {
$theme->notes[] = $this->t('experimental theme');
}
diff --git a/core/modules/system/tests/src/Functional/System/ThemeTest.php b/core/modules/system/tests/src/Functional/System/ThemeTest.php
index 6859bf697ecd..7765a2b93e60 100644
--- a/core/modules/system/tests/src/Functional/System/ThemeTest.php
+++ b/core/modules/system/tests/src/Functional/System/ThemeTest.php
@@ -288,6 +288,15 @@ public function testAdministrationTheme() {
$this->drupalGet('admin/appearance');
$this->submitForm($edit, 'Save configuration');
+ // Check the display of non stable themes.
+ $themes = \Drupal::service('theme_handler')->rebuildThemeData();
+ $experimental_version = $themes['experimental_theme_test']->info['version'];
+ $deprecated_version = $themes['deprecated_theme_test']->info['version'];
+ $this->drupalGet('admin/appearance');
+ $this->assertSession()->pageTextContains('Experimental test ' . $experimental_version . ' (experimental theme)');
+ $this->assertSession()->pageTextContains('Test deprecated theme ' . $deprecated_version . ' (Deprecated)');
+ $this->assertSession()->elementExists('xpath', "//a[contains(@href, 'http://example.com/deprecated_theme')]");
+
// Check that the administration theme is used on an administration page.
$this->drupalGet('admin/config');
$this->assertSession()->responseContains('core/themes/seven');
--
GitLab