? .git
? .gitignore
Index: uc_order/uc_order.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_order/uc_order.admin.inc,v
retrieving revision 1.45
diff -u -p -r1.45 uc_order.admin.inc
--- uc_order/uc_order.admin.inc	17 Feb 2011 04:07:59 -0000	1.45
+++ uc_order/uc_order.admin.inc	21 Feb 2011 21:27:07 -0000
@@ -7,81 +7,44 @@
  */
 
 /**
- * Displays an overview of the order settings.
- */
-function uc_order_settings_overview() {
-  $summaries = array();
-
-  // don't load admin/store/settings/orders/edit/workflow/create
-  $summaries = array_merge($summaries, uc_summarize_child_form_pages('admin/store/settings/orders/edit/basic', FALSE, TRUE));
-  $summaries = array_merge($summaries, uc_summarize_child_form_pages('admin/store/settings/orders/edit/workflow', FALSE, TRUE));
-  $summaries = array_merge($summaries, uc_summarize_child_form_pages('admin/store/settings/orders/edit/panes', FALSE, TRUE));
-
-  // Theme it all up in a summaries overview.
-  return array(
-    '#theme' => 'uc_summary_overview',
-    '#summaries' => $summaries,
-  );
-}
-
-/**
  * Generates the settings form for orders.
  *
  * @ingroup forms
  */
 function uc_order_settings_form($form, &$form_state) {
+  $form['order-settings'] = array('#type' => 'vertical_tabs');
+
   $form['admin'] = array(
     '#type' => 'fieldset',
     '#title' => t('Admin settings'),
-    '#summary callback' => 'uc_summarize_form',
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE,
+    '#group' => 'order-settings',
   );
-
   $form['admin']['uc_order_number_displayed'] = array(
     '#type' => 'select',
     '#title' => t('Number of orders on overview screen'),
     '#options' => drupal_map_assoc(range(10, 100, 10)),
-    '#summary' => t('Displaying @orders orders at a time on the admin overview', array('@orders' => variable_get('uc_order_number_displayed', 30))),
     '#default_value' => variable_get('uc_order_number_displayed', 30),
   );
   $form['admin']['uc_order_logging'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable order logging'),
-    '#summary callback' => 'uc_summarize_checkbox',
-    '#summary arguments' => array(
-      t('Order logging is enabled.'),
-      t('Order logging is disabled.'),
-    ),
     '#default_value' => variable_get('uc_order_logging', TRUE),
   );
   $form['admin']['uc_order_capitalize_addresses'] = array(
     '#type' => 'checkbox',
     '#title' => t('Capitalize address on order screens'),
-    '#summary callback' => 'uc_summarize_checkbox',
-    '#summary arguments' => array(
-      t('Addresses on order view pages are capitalized.'),
-      t('Addresses on order view pages are not capitalized.'),
-    ),
     '#default_value' => variable_get('uc_order_capitalize_addresses', TRUE),
   );
 
   $form['customer'] = array(
     '#type' => 'fieldset',
     '#title' => t('Customer settings'),
-    '#summary callback' => 'uc_summarize_form',
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE,
+    '#group' => 'order-settings',
   );
   $form['customer']['uc_cust_view_order_invoices'] = array(
     '#type' => 'checkbox',
     '#title' => t('Allow customers to view order invoices from their order history.'),
     '#description' => t('Enabling this feature allows pop-up invoices to be opened when a particular order is being viewed.'),
-    '#summary callback' => 'uc_summarize_checkbox',
-    '#summary arguments' => array(
-      t('Customers are allowed to view order invoices from their accounts.'),
-      t('Customers are not allowed to view order invoices from their accounts.'),
-    ),
     '#default_value' => variable_get('uc_cust_view_order_invoices', TRUE),
   );
   $form['customer']['uc_cust_order_invoice_template'] = array(
@@ -89,7 +52,6 @@ function uc_order_settings_form($form, &
     '#title' => t('On-site invoice template'),
     '#description' => t('Select the invoice template to use when invoices are viewed on the site.<br />This is separate from the template used to e-mail invoices to customers which is configured through <a href="!url">Rules</a>.', array('!url' => url(RULES_UI_PATH))),
     '#options' => uc_order_template_options(),
-    '#summary' => t('You are using the %template order invoice template.', array('%template' => variable_get('uc_cust_order_invoice_template', 'customer'))),
     '#default_value' => variable_get('uc_cust_order_invoice_template', 'customer'),
   );
 
@@ -97,36 +59,6 @@ function uc_order_settings_form($form, &
 }
 
 /**
- * Summarizes the order status settings.
- *
- * This function summarizes the order statuses that have been defined. It is
- * organized under a parent node specifying that the following settings are
- * order statuses.
- *
- * @param $form
- *   The form passed from the summarizer.
- * @param $states
- *   An array of order statuses.
- *
- * @return
- *   An array of summary information.
- */
-function _uc_order_states_summarize($form, $states) {
-  $statuses = $items = array();
-
-  foreach ($states as $state) {
-    $items[] = t('@state', array('@state' => $state['title']));
-  }
-
-  $statuses[] = array(
-    'data' => t('The following order statuses have been defined:'),
-    'children' => $items,
-  );
-
-  return $statuses;
-}
-
-/**
  * Displays the order workflow form for order state and status customization.
  *
  * @see uc_order_workflow_form_submit()
@@ -141,14 +73,11 @@ function uc_order_workflow_form($form, &
     '#title' => t('Order states'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#summary callback' => 'uc_summarize_null',
     '#theme' => 'uc_order_state_table',
     '#tree' => TRUE,
   );
 
   foreach ($states as $state) {
-
-    $form['order_states'][$state['id']]['#summary callback'] = 'uc_summarize_form';
     $form['order_states'][$state['id']]['title'] = array(
       '#markup' => $state['title'],
     );
@@ -178,8 +107,6 @@ function uc_order_workflow_form($form, &
     '#type' => 'fieldset',
     '#title' => t('Order statuses'),
     '#collapsible' => FALSE,
-    '#summary callback' => '_uc_order_states_summarize',
-    '#summary arguments' => array($states),
     '#theme' => 'uc_order_status_table',
     '#tree' => TRUE,
   );
@@ -280,6 +207,7 @@ function uc_order_workflow_form_submit($
  */
 function uc_order_panes_form($form, &$form_state) {
   $panes = _uc_order_pane_list();
+  $form['pane-settings'] = array('#type' => 'vertical_tabs');
 
   foreach ($panes as $pane) {
     foreach ($pane['show'] as $view) {
@@ -315,12 +243,10 @@ function uc_order_panes_form($form, &$fo
       '#theme' => 'uc_pane_sort_table',
       '#pane_prefix' => 'uc_order_pane',
       '#type' => 'fieldset',
-      '#title' => t('Order panes on !screen screen', array('!screen' => $titles[$view])),
-      '#summary callback' => '_uc_order_panes_summarize',
-      '#summary arguments' => array($data, $titles[$view], $view),
+      '#title' => t('!screen screen', array('!screen' => $titles[$view])),
+      '#group' => 'pane-settings',
     );
     $form['panes'][$view] = array_merge($fieldset, $form['panes'][$view]);
-    $form['panes']['#summary callback'] = 'uc_summarize_form';
   }
 
   return system_settings_form($form);
@@ -338,7 +264,6 @@ function uc_order_status_create_form($fo
     '#type' => 'textfield',
     '#title' => t('Order status ID'),
     '#description' => t('Must be a unique ID with no spaces.'),
-    '#summary callback' => 'uc_summarize_null',
     '#size' => 32,
     '#maxlength' => 32,
     '#required' => TRUE,
@@ -348,7 +273,6 @@ function uc_order_status_create_form($fo
     '#type' => 'textfield',
     '#title' => t('Title'),
     '#description' => t('The order status title displayed to users.'),
-    '#summary callback' => 'uc_summarize_null',
     '#size' => 32,
     '#maxlength' => 48,
     '#required' => TRUE,
@@ -363,7 +287,6 @@ function uc_order_status_create_form($fo
     '#type' => 'select',
     '#title' => t('Order state'),
     '#description' => t('Set which order state this status is for.'),
-    '#summary callback' => 'uc_summarize_null',
     '#options' => $options,
     '#default_value' => 'post_checkout',
   );
Index: uc_order/uc_order.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_order/uc_order.module,v
retrieving revision 1.63
diff -u -p -r1.63 uc_order.module
--- uc_order/uc_order.module	17 Feb 2011 09:36:46 -0000	1.63
+++ uc_order/uc_order.module	21 Feb 2011 21:27:08 -0000
@@ -72,54 +72,28 @@ function uc_order_menu() {
   $items['admin/store/settings/orders'] = array(
     'title' => 'Order settings',
     'description' => 'Configure the order settings.',
-    'page callback' => 'uc_order_settings_overview',
-    'access arguments' => array('administer store'),
-    'file' => 'uc_order.admin.inc',
-  );
-  $items['admin/store/settings/orders/overview'] = array(
-    'title' => 'Overview',
-    'description' => 'View the order settings.',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-    'weight' => -10,
-  );
-  $items['admin/store/settings/orders/edit'] = array(
-    'title' => 'Edit',
-    'description' => 'Edit the order settings.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_order_settings_form'),
     'access arguments' => array('administer store'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => -5,
     'file' => 'uc_order.admin.inc',
   );
-  $items['admin/store/settings/orders/edit/basic'] = array(
-    'title' => 'Order settings',
+  $items['admin/store/settings/orders/settings'] = array(
+    'title' => 'Settings',
     'description' => 'Edit the basic order settings.',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
-  $items['admin/store/settings/orders/edit/workflow'] = array(
-    'title' => 'Order workflow',
+  $items['admin/store/settings/orders/workflow'] = array(
+    'title' => 'Workflow',
     'description' => 'Modify and configure order states and statuses.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_order_workflow_form'),
     'access arguments' => array('administer order workflow'),
     'type' => MENU_LOCAL_TASK,
-    'weight' => -5,
+    'weight' => -8,
     'file' => 'uc_order.admin.inc',
   );
-  $items['admin/store/settings/orders/edit/panes'] = array(
-    'title' => 'Order panes',
-    'description' => 'Edit the pane settings for order pages.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('uc_order_panes_form'),
-    'access arguments' => array('administer store'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 0,
-    'file' => 'uc_order.admin.inc',
-  );
-
-  $items['admin/store/settings/orders/edit/workflow/create'] = array(
+  $items['admin/store/settings/orders/workflow/create'] = array(
     'title' => 'Create custom order status',
     'description' => 'Create a custom order status for your store.',
     'page callback' => 'drupal_get_form',
@@ -128,6 +102,16 @@ function uc_order_menu() {
     'type' => MENU_LOCAL_ACTION,
     'file' => 'uc_order.admin.inc',
   );
+  $items['admin/store/settings/orders/panes'] = array(
+    'title' => 'Panes',
+    'description' => 'Edit the pane settings for order pages.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_order_panes_form'),
+    'access arguments' => array('administer store'),
+    'type' => MENU_LOCAL_TASK,
+    'weight' => -5,
+    'file' => 'uc_order.admin.inc',
+  );
 
   $items['admin/store/orders'] = array(
     'title' => 'Orders',