From 1a9778d387e5d48ac4f8db377376a9a1f8984075 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Wed, 4 Mar 2015 16:22:38 +1100
Subject: [PATCH] Further config option rearrangement

---
 booking.admin.inc | 56 ++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/booking.admin.inc b/booking.admin.inc
index 4692db6..84f1076 100644
--- a/booking.admin.inc
+++ b/booking.admin.inc
@@ -95,6 +95,13 @@ function booking_admin() {
 	'#type' => 'fieldset',
 	'#title' => 'Paypal Settings',
 	);	
+	$form['paypal']['booking_use_paypal'] = array (
+	'#type' => 'radios',
+	'#title' => t('Use Paypal?'),
+	'#description' => t('Select whether to use paypal for automatic payment handling, or process payments manually.'),
+	'#options' => array (0 => t('No'), t('Yes')),
+	'#default_value' => variable_get('booking_use_paypal', 0),
+	);	
 	$form['paypal']['booking_paypal_account'] = array (
 	'#type' => 'textfield',
 	'#title' => t('Account'),
@@ -120,7 +127,13 @@ function booking_admin() {
 	'#options' => array (0 => t('No'), t('Yes')),
 	'#default_value' => variable_get('booking_enable_roomallocations', 0),
 	);				
-
+	$form['features']['booking_enable_travelform'] = array (
+	'#type' => 'radios',
+	'#title' => t('Enable travel details form?'),
+	'#description' => t('Select whether to enable the form that allows attendees to enter their travel details.'),
+	'#options' => array (0 => t('No'), t('Yes')),
+	'#default_value' => variable_get('booking_enable_travelform', 0),
+	);
 	$form['features']['booking_enable_studygroups'] = array (
 	'#type' => 'radios',
 	'#title' => t('Enable study group calculations?'),
@@ -128,25 +141,21 @@ function booking_admin() {
 	'#options' => array (0 => t('No'), t('Yes')),
 	'#default_value' => variable_get('booking_enable_studygroups', 0),
 	);	
-	$form['features']['booking_enable_travelform'] = array (
-	'#type' => 'radios',
-	'#title' => t('Enable travel details form?'),
-	'#description' => t('Select whether to enable the form that allows attendees to enter their travel details.'),
-	'#options' => array (0 => t('No'), t('Yes')),
-	'#default_value' => variable_get('booking_enable_travelform', 0),
-	);		
 	$form['features']['booking_readinggroup_id'] = array (
 	'#type' => 'textfield',
 	'#title' => t('Studygroup ID for the reading group'),
-	'#description' => t("Set the ID for the studygroup that corresponds with the reading group. Set to zero if reading groups aren't in use."),	
+	'#description' => t("Set the ID for the studygroup that corresponds with the reading group. Set to zero if reading groups aren't in use. "
+		. " This option is only applicable if study groups are enabled. If in doubt, leave as zero."),	
 	'#size' => 3,	
 	'#maxlength' => 3,
 	'#default_value' => variable_get('booking_readinggroup_id','0'),
-	);	
+	);		
+		
+
 	$form['features']['booking_publish_readinggroups'] = array (
 	'#type' => 'radios',
 	'#title' => t('Display reading group colours on the Who\'s Coming page?'),
-	'#description' => t('Select whether to publish reading group colours.'),
+	'#description' => t('Select whether to publish reading group colours. This option is only applicable if study groups are enabled.'),
 	'#options' => array (0 => t('No'), t('Yes')),
 	'#default_value' => variable_get('booking_publish_readinggroups', 0),
 	);		
@@ -156,15 +165,6 @@ function booking_admin() {
 	'#title' => 'Configuration Options',
 	);	
 
-		
-	$form['misc']['booking_allow_couples'] = array (
-		'#type' => 'radios',
-		'#title' => t('Allow married couples?'),
-		'#description' => t('Select whether to cater for married couples in the registration form'),
-		'#options' => array (0 => t('No'), t('Yes')),
-		'#default_value' => variable_get('booking_allow_couples', 0),
-	);	
-
 	$form['misc']['booking_auto_confirm_email'] = array (
 	'#type' => 'radios',
 	'#title' => t('Automatic Registration Email'),
@@ -186,13 +186,7 @@ function booking_admin() {
 		'#options' => array (0 => t('No'), t('Yes')),
 		'#default_value' => variable_get('booking_auto_show_on_lists', 0),
 	);	
-	$form['misc']['booking_use_paypal'] = array (
-	'#type' => 'radios',
-	'#title' => t('Use Paypal?'),
-	'#description' => t('Select whether to use paypal for automatic payment handling, or process payments manually.'),
-	'#options' => array (0 => t('No'), t('Yes')),
-	'#default_value' => variable_get('booking_use_paypal', 0),
-	);
+
 	$form['misc']['booking_enable_combined_pricing'] = array (
 	'#type' => 'radios',
 	'#title' => t('Use Combined Pricing?'),
@@ -229,6 +223,14 @@ function booking_admin() {
         '#default_value' => variable_get('booking_default_gender', 'M'),
     );	
 	
+	$form['regn_options']['booking_allow_couples'] = array (
+		'#type' => 'radios',
+		'#title' => t('Allow married couples?'),
+		'#description' => t('Select whether to cater for married couples in the registration form'),
+		'#options' => array (0 => t('No'), t('Yes')),
+		'#default_value' => variable_get('booking_allow_couples', 0),
+	);		
+	
 	$form['regn_options']['booking_enable_medicare'] = array (
 	'#type' => 'radios',
 	'#title' => t('Enable Medicare requirement?'),