Index: modules/project/project.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project/project.module,v
retrieving revision 1.211
diff -u -r1.211 project.module
--- modules/project/project.module	5 Oct 2005 16:59:31 -0000	1.211
+++ modules/project/project.module	13 Oct 2005 11:49:08 -0000
@@ -116,11 +116,14 @@
 
   $versions = array(-1 => t('all')) + project_releases_list();
 
-  $output = form_textfield(t('Release directory'), 'project_release_directory', variable_get('project_release_directory', ''), 50, 255, t('Leave this blank if project maintainers are to create their own release packages. This is useful if releases are generated by an external tool.'));
-  $output .= form_radios(t('Unmoderate projects with releases'), 'project_release_unmoderate', variable_get('project_release_unmoderate', 0), array('Disabled', 'Enabled'));
-  $output .= form_checkbox(t('Browse projects by releases'), 'project_browse_releases', 1, variable_get('project_browse_releases', 1), t('Checking this box will cause the project browsing page to have version subtabs.'));
-  $output .= form_radios(t('Default release overview'), 'project_release_overview', variable_get('project_release_overview', -1), $versions, t('Default release version to list on the overview page'));
-  $output .= form_textfield(t('Issue directory'), 'project_directory_issues', variable_get('project_directory_issues', 'issues'), 30, 255, t("Subdirectory in the directory '%dir' where attachment to issues will be stored.", array('%dir' => variable_get('file_directory_path', 'files') .'/')));
+  $form['project_releases'] = array('#type' => 'fieldset', '#title' => t('Project Releases'));
+  $form['project_releases']['project_release_directory']  = array('#type' => 'textfield', '#title' => t('Release directory'), '#default_value' => variable_get('project_release_directory', ''), '#size' => 50, '#maxlength' => 255, '#description' => t('Leave this blank if project maintainers are to create their own release packages. This is useful if releases are generated by an external tool.'));
+  $form['project_releases']['project_release_unmoderate'] = array('#type' => 'radios', '#title' => t('Unmoderate projects with releases'), '#default_value' => variable_get('project_release_unmoderate', 0), '#options' => array('Disabled', 'Enabled'));
+  $form['project_releases']['project_browse_releases']    = array('#type' => 'checkbox', '#title' => t('Browse projects by releases'), '#default_value' => variable_get('project_browse_releases', TRUE), '#description' => t('Checking this box will cause the project browsing page to have version subtabs.'));
+  $form['project_releases']['project_release_overview'] = array('#type' => 'radios', '#title' => t('Default release overview'), '#default_value' => variable_get('project_release_overview', -1), '#options' => $versions, '#description' => t('Default release version to list on the overview page'));
+
+  $form['project_issues'] = array('#type' => 'fieldset', '#title' => t('Project Issues'));
+  $form['project_issues']['project_directory_issues']  = array('#type' => 'textfield', '#title' => t('Issue directory'), '#default_value' => variable_get('project_directory_issues', 'issues'), '#size' => 30, '#maxlength' => 255, '#description' => t("Subdirectory in the directory '%dir' where attachment to issues will be stored.", array('%dir' => variable_get('file_directory_path', 'files') . '/')));
 
   if (module_exist('mailhandler')) {
     // TODO: move this stuff to mailhandler.module ?
@@ -130,10 +133,10 @@
       $items[$mail] = $mail;
     }
 
-    $output .= form_select(t('Reply-to address on e-mail notifications'), 'project_reply_to', variable_get('project_reply_to', ''), $items);
+    $form['project_reply_to'] = array('#type' => 'select', '#title' => t('Reply-to address on e-mail notifications'), '#default_value' => variable_get('project_reply_to', ''), '#options' => $items);
   }
 
-  return $output;
+  return $form;
 }
 
 function project_cron() {
@@ -245,7 +248,7 @@
                            'type' => $i == 0 ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
                            'weight' => $term->weight,
                            'callback arguments' => array($term->name));
-  
+
           if ($releases) {
             $j = 0;
             if (variable_get('project_release_overview', -1) == -1) {
@@ -493,7 +496,7 @@
  *
  * $project has the following fields:
  * - title: Title
- * - nid: Node id 
+ * - nid: Node id
  * - body: Filtered description
  * - term: String with the selected term name
  * - version: String with the version