From 8ab937d5389c18b688e120b801a9d7fab6bb1e16 Mon Sep 17 00:00:00 2001
From: Jason Yergeau <jason@storybynumbers.com>
Date: Mon, 16 May 2011 18:22:20 -0300
Subject: [PATCH] In theme settings, moved "layout settings" out of "general settings" and up a level.  de-nested breadcrumb setting.

---
 fusion_core/theme-settings.php |   53 ++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/fusion_core/theme-settings.php b/fusion_core/theme-settings.php
index 29a6ad0..4d6d254 100644
--- a/fusion_core/theme-settings.php
+++ b/fusion_core/theme-settings.php
@@ -36,19 +36,11 @@ function fusion_core_form_system_theme_settings_alter(&$form, $form_state) {
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
-
-  // General Settings
-  $form['tnt_container']['general_settings'] = array(
+  
+  // Grid Layout
+  $form['tnt_container']['theme_grid_config'] = array(
     '#type' => 'fieldset',
-    '#title' => t('General settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
-  );
-
-  // Grid settings
-  $form['tnt_container']['general_settings']['theme_grid_config'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Layout'),
+    '#title' => t('Grid Layout'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
@@ -61,15 +53,15 @@ function fusion_core_form_system_theme_settings_alter(&$form, $form_state) {
       $grid_options[$grid_option] = (int)substr($grid_option, 4, 2) . t(' column ') . $grid_type;
     }
   }
-  $form['tnt_container']['general_settings']['theme_grid_config']['theme_grid'] = array(
+  $form['tnt_container']['theme_grid_config']['theme_grid'] = array(
     '#type'          => 'radios',
     '#title'         => t('Select a grid layout for your theme'),
     '#default_value' => theme_get_setting('theme_grid'),
     '#options'       => $grid_options,
   );
-  $form['tnt_container']['general_settings']['theme_grid_config']['theme_grid']['#options'][$defaults['theme_grid']] .= t(' - Theme Default');
+  $form['tnt_container']['theme_grid_config']['theme_grid']['#options'][$defaults['theme_grid']] .= t(' - Theme Default');
   // Fluid grid width
-  $form['tnt_container']['general_settings']['theme_grid_config']['fluid_grid_width'] = array(
+  $form['tnt_container']['theme_grid_config']['fluid_grid_width'] = array(
     '#type'          => 'select',
     '#title'         => t('Select a width for your fluid grid layout'),
     '#default_value' => theme_get_setting('fluid_grid_width'),
@@ -80,9 +72,9 @@ function fusion_core_form_system_theme_settings_alter(&$form, $form_state) {
       'fluid-85' => t('85%'),
     ),
   );
-  $form['tnt_container']['general_settings']['theme_grid_config']['fluid_grid_width']['#options'][$defaults['fluid_grid_width']] .= t(' - Theme Default');
+  $form['tnt_container']['theme_grid_config']['fluid_grid_width']['#options'][$defaults['fluid_grid_width']] .= t(' - Theme Default');
   // Sidebar layout
-  $form['tnt_container']['general_settings']['theme_grid_config']['sidebar_layout'] = array(
+  $form['tnt_container']['theme_grid_config']['sidebar_layout'] = array(
     '#type'          => 'radios',
     '#title'         => t('Select a sidebar layout for your theme'),
     '#default_value' => theme_get_setting('sidebar_layout'),
@@ -92,7 +84,7 @@ function fusion_core_form_system_theme_settings_alter(&$form, $form_state) {
       'sidebars-both-last' => t('Both sidebars last'),
     ),
   );
-  $form['tnt_container']['general_settings']['theme_grid_config']['sidebar_layout']['#options'][$defaults['sidebar_layout']] .= t(' - Theme Default');
+  $form['tnt_container']['theme_grid_config']['sidebar_layout']['#options'][$defaults['sidebar_layout']] .= t(' - Theme Default');
   // Calculate sidebar width options
   $grid_width = (int)substr(theme_get_setting('theme_grid'), 4, 2);
   $grid_type = substr(theme_get_setting('theme_grid'), 7);
@@ -102,21 +94,30 @@ function fusion_core_form_system_theme_settings_alter(&$form, $form_state) {
     $width_options[$i] = $grid_units . (($grid_type == 'fluid') ? (round($i * (100 / $grid_width), 2) . '%') : ($i * ((int)$grid_type / $grid_width)) . 'px');
   }
   // Sidebar first width
-  $form['tnt_container']['general_settings']['theme_grid_config']['sidebar_first_width'] = array(
+  $form['tnt_container']['theme_grid_config']['sidebar_first_width'] = array(
     '#type'          => 'select',
     '#title'         => t('Select a different width for your first sidebar'),
     '#default_value' => theme_get_setting('sidebar_first_width'),
     '#options'       => $width_options,
   );
-  $form['tnt_container']['general_settings']['theme_grid_config']['sidebar_first_width']['#options'][$defaults['sidebar_first_width']] .= t(' - Theme Default');
+  $form['tnt_container']['theme_grid_config']['sidebar_first_width']['#options'][$defaults['sidebar_first_width']] .= t(' - Theme Default');
   // Sidebar last width
-  $form['tnt_container']['general_settings']['theme_grid_config']['sidebar_second_width'] = array(
+  $form['tnt_container']['theme_grid_config']['sidebar_second_width'] = array(
     '#type'          => 'select',
     '#title'         => t('Select a different width for your second sidebar'),
     '#default_value' => theme_get_setting('sidebar_second_width'),
     '#options'       => $width_options,
   );
-  $form['tnt_container']['general_settings']['theme_grid_config']['sidebar_second_width']['#options'][$defaults['sidebar_second_width']] .= t(' - Theme Default');
+  $form['tnt_container']['theme_grid_config']['sidebar_second_width']['#options'][$defaults['sidebar_second_width']] .= t(' - Theme Default');
+  
+
+  // General Settings
+  $form['tnt_container']['general_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('General settings'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
+  );
 
   // Theme fonts
   $form['tnt_container']['general_settings']['theme_font_config'] = array(
@@ -167,13 +168,7 @@ function fusion_core_form_system_theme_settings_alter(&$form, $form_state) {
     '#collapsed' => TRUE,
   );
   // Breadcrumb
-  $form['tnt_container']['general_settings']['navigation']['breadcrumb'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Breadcrumb'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-  $form['tnt_container']['general_settings']['navigation']['breadcrumb']['breadcrumb_display'] = array(
+  $form['tnt_container']['general_settings']['navigation']['breadcrumb_display'] = array(
     '#type' => 'checkbox',
     '#title' => t('Display breadcrumb'),
     '#default_value' => theme_get_setting('breadcrumb_display'),
-- 
1.7.3.4