ACMS-1989: Update admin theme in Acquia CMS to Gin.

acquia · Oct 16, 2023 · 0a45aaa · 0a45aaa
1 parent e4b84da
commit 0a45aaa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/modules/acquia_cms_common/acquia_cms_common.install b/modules/acquia_cms_common/acquia_cms_common.install
@@ -27,16 +27,15 @@ function acquia_cms_common_install($is_syncing) {
       'view media',
     ]);
 
-    // Enable acquia_claro theme.
+    // Enable gin theme.
     $themesList = \Drupal::service('extension.list.theme')->getList();
-    $themesInstall = ["olivero"];
-    if (isset($themesList['acquia_claro'])) {
-      $themesInstall[] = "acquia_claro";
-    }
-    \Drupal::service('theme_installer')->install($themesInstall);
-    \Drupal::configFactory()->getEditable('system.theme')->set('default', 'olivero')->save();
-    if (in_array("acquia_claro", $themesInstall)) {
-      \Drupal::configFactory()->getEditable('system.theme')->set('admin', "acquia_claro")->save();
+    $theme_installer = \Drupal::service('theme_installer');
+    $theme_installer->install(["olivero"]);
+    $system_theme_config = \Drupal::configFactory()->getEditable('system.theme');
+    $system_theme_config->set('default', 'olivero')->save();
+    if (isset($themesList['gin'])) {
+      $theme_installer->install(["gin"]);
+      $system_theme_config->set('admin', "gin")->save();
     }
 
     // Re-write the content and media view on module install,

diff --git a/modules/acquia_cms_common/acquia_cms_common.module b/modules/acquia_cms_common/acquia_cms_common.module
@@ -396,7 +396,6 @@ function acquia_cms_common_modules_installed($modules, $is_syncing) {
  * @see template_preprocess_maintenance_page()
  */
 function acquia_cms_common_preprocess_maintenance_page(array &$variables) {
-  $variables['#attached']['library'][] = 'acquia_claro/install-page';
   $acquia_cms_path = \Drupal::service('extension.list.module')->getPath('acquia_cms_common');
   $variables['install_page_logo_path'] = '/' . $acquia_cms_path . '/acquia_cms.png';
 }

diff --git a/...ms_headless/modules/acquia_cms_headless_ui/src/Service/PureHeadlessModeInstallHandler.php b/...ms_headless/modules/acquia_cms_headless_ui/src/Service/PureHeadlessModeInstallHandler.php
@@ -194,11 +194,11 @@ public function deleteHeadlessUiPaths() {
    */
   public function updateHeadlessUiConfig(bool $isEnabled = TRUE) {
     if ($isEnabled) {
-      // Reset default theme to acquia_claro.
-      if ($this->themeHandler->themeExists('acquia_claro')) {
+      // Reset default theme to gin.
+      if ($this->themeHandler->themeExists('gin')) {
         $this->configFactory
           ->getEditable('system.theme')
-          ->set('default', 'acquia_claro')
+          ->set('default', 'gin')
           ->save();
       }
 

diff --git a/modules/acquia_cms_tour/src/Services/StarterKitService.php b/modules/acquia_cms_tour/src/Services/StarterKitService.php
@@ -155,7 +155,7 @@ public function getModulesAndThemes(string $starter_kit, string $demo_question =
           'acquia_cms_tour',
         ];
         $enableThemes = [
-          'admin'   => 'acquia_claro',
+          'admin'   => 'gin',
           'default' => 'cohesion_theme',
         ];
         break;
@@ -167,7 +167,7 @@ public function getModulesAndThemes(string $starter_kit, string $demo_question =
           'acquia_cms_tour',
         ];
         $enableThemes = [
-          'admin'   => 'acquia_claro',
+          'admin'   => 'gin',
           'default' => 'olivero',
         ];
         break;
@@ -180,14 +180,14 @@ public function getModulesAndThemes(string $starter_kit, string $demo_question =
           'acquia_cms_tour',
         ];
         $enableThemes = [
-          'admin'   => 'acquia_claro',
+          'admin'   => 'gin',
           'default' => 'olivero',
         ];
         break;
 
       default:
         $enableThemes = [
-          'admin'   => 'acquia_claro',
+          'admin'   => 'gin',
           'default' => 'olivero',
         ];
         $enableModules = [