Index: eventrepeat.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/eventrepeat/eventrepeat.module,v
retrieving revision 1.50.2.6
diff -u -r1.50.2.6 eventrepeat.module
--- eventrepeat.module	30 May 2007 14:56:21 -0000	1.50.2.6
+++ eventrepeat.module	30 May 2007 16:26:10 -0000
@@ -465,7 +465,7 @@
       'callback arguments' => array('eventrepeat_admin_settings'),
       'access' => user_access('administer site configuration'),
       'type' => MENU_NORMAL_ITEM, // optional
-      'weight' => 10
+      'weight' => 0
     );
     $items[] = array(
       'path' => 'admin/settings/eventrepeat/debug',
@@ -1958,35 +1958,30 @@
 
   //print the settings forms
   $form = array();
-  $form['eventrepeat_title_tag'] = array('#type' => 'textfield', '#title' => t('Title tag'), '#default_value' => variable_get('eventrepeat_title_tag', '[R]'), '#size' => 10, '#maxlength' => 10, '#description' => t('Enter a tag that will be prepended to all events in a repeat sequence--leave blank for no tag.'));
-  $form['eventrepeat_initial_render'] = array('#type' => 'textfield', '#title' => t('Initial render period'), '#default_value' => variable_get('eventrepeat_initial_render', 90), '#size' => 3, '#maxlength' => 3, '#description' => t('Initial period of time for which a repeat sequence is rendered upon it\'s creation--also the number of days from the current date that repeating nodes are automatically updated (events outside this range will only be rendered upon first viewing of a calendar period that contains them, up to the rendering support period). Default value is 90 days. Maximum allowed value is 730 days'));
-  $form['eventrepeat_render_support'] = array(
+  
+  // Event display
+  $form['eventrepeat_display'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Event Display'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE
+  );
+  $form['eventrepeat_display']['eventrepeat_title_tag'] = array(
     '#type' => 'textfield',
-    '#title' => t('Render support period'),
-    '#default_value' => variable_get('eventrepeat_render_support', 2000),
-    '#size' => 5,
-    '#maxlength' => 5,
-    '#description' => t('Number of days from current date that repeat rendering is supported. Default is 2000 days, and it\'s recommended that this value be kept. Maximum allowed value is 10000. Note that the database is refreshed with this many rows from todays date on the first cron run or if cron has not been run in a while. High values could, potentially, cause a cron or database timeout.')
+    '#title' => t('Title tag'),
+    '#default_value' => variable_get('eventrepeat_title_tag', '[R]'),
+    '#size' => 10,
+    '#maxlength' => 10,
+    '#description' => t('Enter a tag that will be prepended to all events in a repeat sequence. Leave this blank if you don\'t want any indicator to display.')
   );
 
-  // default edit type
-  $form['eventrepeat_sequences'] = array('#type' => 'fieldset', '#title' => t('Sequences'), '#collapsible' => TRUE, '#collapsed' => FALSE);
-  $form['eventrepeat_sequences']['eventrepeat_single_edit_in_sequence'] = array('#type' => 'checkbox', '#title' => t('Leave individual edits in sequence'), '#default_value' => variable_get('eventrepeat_single_edit_in_sequence', FALSE), '#description' => t('If selected, individually edited nodes will remain part of their repeat sequence<br>WARNING: Subsequent mass edits involving the individually edited node will overwrite the old data!'));
-  $det_options = array(
-    'this' => t('Only the event being edited'),
-    'future' => t('The event being edited and all future occurrences'),
-    'all' => t('All occurrences of the event')
-  );
-  $form['eventrepeat_sequences']['eventrepeat_default_edit_type'] = array(
-    '#type' => 'radios',
-    '#title' => t('By default, apply edits to'),
-    '#default_value' => variable_get('eventrepeat_default_edit_type', 'future'),
-    '#options' => $det_options,
-    '#description' => t('Sets the default selection for how repeating events are edited. "All occurrences" will make the default to edit all events in the sequence after today\'s date. "The event being edited and all future occurrences" will make the default to edit events from the date of the selected node forward. "Only the event being edited" will make editing the one event the default and may remove the event from the sequence depending on the setting above.'),
-  );
-  
   // create a fieldset to turn on / off the advanced controls
-  $form['eventrepeat_advanced'] = array('#type' => 'fieldset', '#title' => t('Advanced Controls'), '#collapsible' => TRUE, '#collapsed' => FALSE);
+  $form['eventrepeat_advanced'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Advanced Controls'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE
+  );
   $advanced_options = array(
     'eventrepeat_INTERVAL' => t('Interval'),
     'eventrepeat_BYDAY' => t('By day of the week'),
@@ -2003,8 +1998,55 @@
     '#description' => t('These options will appear in the advanced fieldset of the repeat fieldset on nodes that use repeat events.'),
   );
 
+  // default edit type
+  $form['eventrepeat_behavior'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Repeat Sequence Behavior'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE
+  );
+  $form['eventrepeat_behavior']['eventrepeat_initial_render'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Initial render period'),
+    '#default_value' => variable_get('eventrepeat_initial_render', 90),
+    '#size' => 3,
+    '#maxlength' => 3,
+    '#description' => t('Initial period of time for which a repeat sequence is rendered upon it\'s creation--also the number of days from the current date that repeating nodes are automatically updated (events outside this range will only be rendered upon first viewing of a calendar period that contains them, up to the rendering support period). Default value is 90 days. Maximum allowed value is 730 days')
+  );
+  $form['eventrepeat_behavior']['eventrepeat_render_support'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Render support period'),
+    '#default_value' => variable_get('eventrepeat_render_support', 2000),
+    '#size' => 5,
+    '#maxlength' => 5,
+    '#description' => t('Number of days from current date that repeat rendering is supported. Default is 2000 days, and it\'s recommended that this value be kept. Maximum allowed value is 10000. Note that the database is refreshed with this many rows from todays date on the first cron run or if cron has not been run in a while. High values could, potentially, cause a cron or database timeout.')
+  );
+  $form['eventrepeat_behavior']['eventrepeat_single_edit_in_sequence'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Leave individual edits in sequence'),
+    '#default_value' => variable_get('eventrepeat_single_edit_in_sequence', FALSE),
+    '#description' => t('If selected, individually edited nodes will remain part of their repeat sequence<br>WARNING: Subsequent mass edits involving the individually edited node will overwrite the old data!')
+  );
+  $det_options = array(
+    'this' => t('Only the event being edited'),
+    'future' => t('The event being edited and all future occurrences'),
+    'all' => t('All occurrences of the event')
+  );
+  $form['eventrepeat_behavior']['eventrepeat_default_edit_type'] = array(
+    '#type' => 'radios',
+    '#title' => t('By default, apply edits to'),
+    '#default_value' => variable_get('eventrepeat_default_edit_type', 'future'),
+    '#options' => $det_options,
+    '#description' => t('Sets the default selection for how repeating events are edited. "All occurrences" will make the default to edit all events in the sequence after today\'s date. "The event being edited and all future occurrences" will make the default to edit events from the date of the selected node forward. "Only the event being edited" will make editing the one event the default and may remove the event from the sequence depending on the setting above.'),
+  );
+
   // order of date elements
-  $form['eventrepeat_dateform'] = array('#type' => 'fieldset', '#title' => t('Form Display'), '#collapsible' => TRUE, '#collapsed' => FALSE);
+  $form['eventrepeat_dateform'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Form Display'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE
+  );
   $order_options = array(
     'euro' => t('European (day month year)'),
     'us' => t('American (month day year)'),