From 6d50ccf1a35f356ccb8b0ba1c117e735bc315463 Mon Sep 17 00:00:00 2001
From: Tyler Jackson <150186522+tjackson2113@users.noreply.github.com>
Date: Mon, 9 Mar 2026 09:02:31 -0500
Subject: [PATCH 1/5] updated install file to set gin toolbar on update hook

---
 illinois_framework_core.install | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/illinois_framework_core.install b/illinois_framework_core.install
index 2cfa9a8a..6f438dd8 100644
--- a/illinois_framework_core.install
+++ b/illinois_framework_core.install
@@ -294,3 +294,21 @@ function illinois_framework_core_update_9900() {
     }
   }
 }
+/**
+ * Switch Gin to use the classic (core) toolbar instead of experimental.
+ */
+function illinois_framework_core_update_9951() {
+  // Ensure core toolbar module is enabled.
+  if (!\Drupal::moduleHandler()->moduleExists('toolbar')) {
+    \Drupal::service('module_installer')->install(['toolbar']);
+  }
+  // Update Gin configuration.
+  $config = \Drupal::configFactory()->getEditable('gin.settings');
+  // This is the toolbar setting.
+  $config->set('classic_toolbar', TRUE);
+  // Optional: explicitly disable experimental toolbar if present.
+  if ($config->get('enable_gin_toolbar') !== NULL) {
+    $config->set('enable_gin_toolbar', FALSE);
+  }
+  $config->save(TRUE);
+}

From 35efcfda7f56463e60b0565edfcb6e9fe0ef8c13 Mon Sep 17 00:00:00 2001
From: Tyler Jackson <150186522+tjackson2113@users.noreply.github.com>
Date: Tue, 17 Mar 2026 09:39:32 -0500
Subject: [PATCH 2/5] Added helper function to install the gin toolbar on core
 install.

---
 illinois_framework_core.install | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/illinois_framework_core.install b/illinois_framework_core.install
index 6f438dd8..aa0abe42 100644
--- a/illinois_framework_core.install
+++ b/illinois_framework_core.install
@@ -5,6 +5,30 @@
  */
 function illinois_framework_core_install() {
   illinois_framework_core_set_image_processor();
+  illinois_framework_core_configure_toolbar();
+}
+
+/**
+ * Enables toolbar and configures Gin toolbar settings.
+ */
+function illinois_framework_core_configure_toolbar() {
+  // Ensure core toolbar module is enabled.
+  if (!\Drupal::moduleHandler()->moduleExists('toolbar')) {
+    \Drupal::service('module_installer')->install(['toolbar']);
+  }
+
+  // Update Gin configuration.
+  $config = \Drupal::configFactory()->getEditable('gin.settings');
+
+  // Enable classic toolbar.
+  $config->set('classic_toolbar', TRUE);
+
+  // Disable experimental Gin toolbar if present.
+  if ($config->get('enable_gin_toolbar') !== NULL) {
+    $config->set('enable_gin_toolbar', FALSE);
+  }
+
+  $config->save(TRUE);
 }
 
 /**

From a7157402afb6323a4b6922fd10a523dc02e8adce Mon Sep 17 00:00:00 2001
From: Tyler Jackson <150186522+tjackson2113@users.noreply.github.com>
Date: Tue, 17 Mar 2026 10:46:17 -0500
Subject: [PATCH 3/5] Switched to clean up code, calls helper function in
 update hook.

---
 illinois_framework_core.install | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/illinois_framework_core.install b/illinois_framework_core.install
index aa0abe42..fc0fc588 100644
--- a/illinois_framework_core.install
+++ b/illinois_framework_core.install
@@ -322,17 +322,5 @@ function illinois_framework_core_update_9900() {
  * Switch Gin to use the classic (core) toolbar instead of experimental.
  */
 function illinois_framework_core_update_9951() {
-  // Ensure core toolbar module is enabled.
-  if (!\Drupal::moduleHandler()->moduleExists('toolbar')) {
-    \Drupal::service('module_installer')->install(['toolbar']);
-  }
-  // Update Gin configuration.
-  $config = \Drupal::configFactory()->getEditable('gin.settings');
-  // This is the toolbar setting.
-  $config->set('classic_toolbar', TRUE);
-  // Optional: explicitly disable experimental toolbar if present.
-  if ($config->get('enable_gin_toolbar') !== NULL) {
-    $config->set('enable_gin_toolbar', FALSE);
-  }
-  $config->save(TRUE);
+  illinois_framework_core_configure_toolbar();
 }

From b9882863496bf7f9688ffa00cd2098166423782d Mon Sep 17 00:00:00 2001
From: Tyler Jackson <150186522+tjackson2113@users.noreply.github.com>
Date: Tue, 17 Mar 2026 15:26:46 -0500
Subject: [PATCH 4/5] updated toolbar setting

---
 illinois_framework_core.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/illinois_framework_core.install b/illinois_framework_core.install
index fc0fc588..3bee2011 100644
--- a/illinois_framework_core.install
+++ b/illinois_framework_core.install
@@ -21,7 +21,7 @@ function illinois_framework_core_configure_toolbar() {
   $config = \Drupal::configFactory()->getEditable('gin.settings');
 
   // Enable classic toolbar.
-  $config->set('classic_toolbar', TRUE);
+  $config->set('classic_toolbar', 'vertical');
 
   // Disable experimental Gin toolbar if present.
   if ($config->get('enable_gin_toolbar') !== NULL) {

From d8595d1041ff1e266292ba69614db7f4419cacf2 Mon Sep 17 00:00:00 2001
From: Tyler Jackson <150186522+tjackson2113@users.noreply.github.com>
Date: Wed, 18 Mar 2026 14:12:43 -0500
Subject: [PATCH 5/5] Cleaned up the toolbar code

---
 illinois_framework_core.install | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/illinois_framework_core.install b/illinois_framework_core.install
index 3bee2011..fcea2ad6 100644
--- a/illinois_framework_core.install
+++ b/illinois_framework_core.install
@@ -23,11 +23,6 @@ function illinois_framework_core_configure_toolbar() {
   // Enable classic toolbar.
   $config->set('classic_toolbar', 'vertical');
 
-  // Disable experimental Gin toolbar if present.
-  if ($config->get('enable_gin_toolbar') !== NULL) {
-    $config->set('enable_gin_toolbar', FALSE);
-  }
-
   $config->save(TRUE);
 }