Unverified Commit 2103b199 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Revert "Issue #3215044 by quietone, murilohp, larowlan, Gábor Hojtsy, catch,... 

Revert "Issue #3215044 by quietone, murilohp, larowlan, Gábor Hojtsy, catch, xjm, daffie, dww: Promote the non-stable statuses in admin/appearance page, optionally even visually"

This reverts commit fd949e55.
parent 577f9357

core/modules/system/css/system.admin.css

+0 −4
Original line number Diff line number Diff line
@@ -255,10 +255,6 @@ 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;

}

core/modules/system/src/Controller/SystemController.php

+3 −19
Original line number Diff line number Diff line
@@ -4,13 +4,11 @@ 


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;
@@ -349,7 +347,8 @@ public function themesPage() { 
        }

      }



      // Add notes to default theme, administration theme and non-stable themes.

      // Add notes to default theme, administration theme and experimental

      // themes.

      $theme->notes = [];

      if ($theme->is_default) {

        $theme->notes[] = $this->t('default theme');
@@ -357,22 +356,7 @@ public function themesPage() { 
      if ($theme->is_admin) {

        $theme->notes[] = $this->t('administration theme');

      }

      $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])) {

      if ($theme->isExperimental()) {

        $theme->notes[] = $this->t('experimental theme');

      }

core/modules/system/tests/src/Functional/System/ThemeTest.php

+0 −6
Original line number Diff line number Diff line
@@ -288,12 +288,6 @@ public function testAdministrationTheme() { 
    $this->drupalGet('admin/appearance');

    $this->submitForm($edit, 'Save configuration');



    // Check the display of non stable themes.

    $this->drupalGet('admin/appearance');

    $this->assertSession()->pageTextContains('Experimental test 9.4.0-dev (experimental theme)');

    $this->assertSession()->pageTextContains('Test deprecated theme 9.4.0-dev (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');