Merge pull request #32 from CuBoulder/issue/31

CU Boulder site configuration 2.5.1
CuBoulder · Nov 17, 2023 · a7b4a0b · a7b4a0b
2 parents 130e4a8 + e4b496c
commit a7b4a0b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/SiteConfiguration.php b/src/SiteConfiguration.php
@@ -195,13 +195,6 @@ public function buildThemeSettingsForm(array &$form, FormStateInterface &$form_s
       '#description'    => $this->t('Select if sidebar content should appear on the left or right side of a page.'),
     ];
 
-    $form['ucb_rave_alerts'] = [
-      '#type'           => 'checkbox',
-      '#title'          => $this->t('Show campus-wide alerts'),
-      '#default_value'  => theme_get_setting('ucb_rave_alerts', $themeName),
-      '#description'    => $this->t('If enabled, campus-wide alerts will be displayed at the top of the site.'),
-    ];
-
     $form['ucb_breadcrumb_nav'] = [
       '#type'           => 'checkbox',
       '#title'          => $this->t('Show breadcrumb navigation on pages'),
@@ -277,7 +270,12 @@ public function buildThemeSettingsForm(array &$form, FormStateInterface &$form_s
         '#title' => $this->t('Advanced'),
         '#open'  => FALSE,
       ];
-      // @todo Add the custom logo stuff here
+      $form['advanced']['ucb_rave_alerts'] = [
+        '#type'           => 'checkbox',
+        '#title'          => $this->t('Show campus-wide alerts'),
+        '#default_value'  => theme_get_setting('ucb_rave_alerts', $themeName),
+        '#description'    => $this->t('If enabled, campus-wide alerts will be displayed at the top of the site.'),
+      ];
       $form['advanced']['ucb_be_boulder'] = [
         '#type'           => 'select',
         '#title'          => $this->t('Where to display the Be Boulder slogan on the site.'),

diff --git a/ucb_site_configuration.info.yml b/ucb_site_configuration.info.yml
@@ -2,7 +2,7 @@ name: CU Boulder Site Configuration
 description: 'Allows CU Boulder site administrators to configure site-specific settings.'
 core_version_requirement: ^9 || ^10
 type: module
-version: '2.5'
+version: '2.5.1'
 package: CU Boulder
 dependencies:
   - block

diff --git a/ucb_site_configuration.module b/ucb_site_configuration.module
@@ -78,6 +78,7 @@ function ucb_site_configuration_form_node_form_alter(array &$form, FormStateInte
     '#type' => 'details',
     '#title' => t('Third-party services'),
     '#group' => 'advanced',
+    '#weight' => 35,
     '#open' => (bool) $contentServicesFieldDefaultOptions,
     'ucb_external_services_enabled' => [
       '#type'  => 'checkboxes',