Index: casetracker.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/casetracker/casetracker.module,v
retrieving revision 1.68
diff -u -F^f -r1.68 casetracker.module
--- casetracker.module	15 Aug 2006 20:48:06 -0000	1.68
+++ casetracker.module	16 Aug 2006 22:31:44 -0000
@@ -21,7 +21,8 @@ function casetracker_help($section) {
       return t('Enter the keyword "case" to search for cases');
     /* case 'node/add#casetracker_project':
        return t('Create a project that you can then place cases under.'); */
-
+    case 'admin/settings/casetracker':
+      return t('This sets overall settings for the casetracker module. If you would like to customize the various workflow options for case status, priority, and type, use the %link page', array('%link' => l('case status settings', 'admin/case')));
     case 'node/add#casetracker_case':
       return t('Open a new case.');
 
@@ -99,14 +100,10 @@ function casetracker_menu($may_cache) {
       'callback' => 'casetracker_comment_form',
       'access' => $access,
       'type' => MENU_CALLBACK);
+/* ##########################  NEW UI FOR ADMINISTERING CASE FIELDS ##################################*/
     $items[] = array(
       'path' => 'admin/case',
-      'title' => t('case'),
-      'callback' => 'casetracker_case_detail');
-    /* ##########################  NEW UI FOR ADMINISTERING CASE FIELDS ##################################*/
-    $items[] = array(
-      'path' => 'admin/case/states',
-      'title' => t('Administer case fields'),
+      'title' => t('casetracker states'),
       'callback' => 'casetracker_administer_case_fields');
     $items[] = array(
       'path' => 'admin/case/states/edit',
@@ -282,8 +279,9 @@ function casetracker_cases_table($argume
    global $user;
    theme_add_style(drupal_get_path('module', 'casetracker') .'/casetracker.css');
    $status_arr = casetracker_case_state_option('status');
-   $status_id_arr = array_keys($status_arr);
-   $classes = array($status_id_arr[0] => 'opened',$status_id_arr[1]=>'closed',$status_id_arr[2]=>'resolvedstaging',$status_id_arr[3]=>'resolvedproduction',$status_id_arr[4]=>'tested_staging',$status_id_arr[5]=>'resolved');
+   foreach ($status_arr as $key => $value) {
+     $classes[$key] = preg_replace('/\W/', '', strtolower($value));
+   }
    $headers = array(
    array('data' => t('Case ID'), 'field' => 'cs.case_id'),
    array('data' => t('Title'), 'field' => 'n.title'),
@@ -438,8 +436,6 @@ function casetracker_cases_table($argume
 function casetracker_projects_table($argument = null) {
   global $user;
   theme_add_style(drupal_get_path('module', 'casetracker') .'/casetracker.css');
-  $classes = array(1 => 'opened','closed','resolvedstaging','resolvedproduction','tested_staging','resolved');
-
   $headers = array(
     array('data' => t('Project ID'), 'field' => 'cp.project_no'),
     array('data' => t('Title'), 'field' => 'n.title'),
@@ -1963,8 +1959,9 @@ function casetracker_search($op = 'searc
 function casetracker_search_page($results) {
    theme_add_style(drupal_get_path('module', 'casetracker') .'/casetracker.css');
    $status_arr = casetracker_case_state_option('status');
-   $status_id_arr = array_keys($status_arr);
-   $classes = array($status_id_arr[0] => 'opened',$status_id_arr[1]=>'closed',$status_id_arr[2]=>'resolvedstaging',$status_id_arr[3]=>'resolvedproduction',$status_id_arr[4]=>'tested_staging',$status_id_arr[5]=>'resolved');
+   foreach ($status_arr as $key => $value) {
+     $classes[$key] = preg_replace('/\W/', '', strtolower($value));
+   }
    if (count($results)) {
     $rows = array();
     foreach ($results as $entry) {
@@ -2556,10 +2553,9 @@ function casetracker_case_state_option($
 
 function casetracker_administer_case_fields() {
   $headers = array(
-  array('data' => t('Case state id')),
   array('data' => t('Case state name')),
   array('data' => t('Case state realm')));
-  $result = db_query("SELECT * FROM {casetracker_case_states}");
+  $result = db_query("SELECT * FROM {casetracker_case_states} order by case_state_realm");
   $result1 = db_query("select distinct case_state_realm from {casetracker_case_states}");
   while ($row1 = mysql_fetch_array($result1)) {
     $field_values[$row1['case_state_realm']] = $row1['case_state_realm'];
@@ -2613,10 +2609,10 @@ function casetracker_administer_case_fie
 function theme_casetracker_administer_case_fields1($form) {
   foreach ($form['case_state_name'] as $key => $element) {
     if (is_array($element) && element_child($key)) {
-      $rows[] = array(check_plain($key),form_render($form['case_state_name'][$key]), form_render($form['case_state_realm'][$key]),l(t('delete'), 'admin/case/states/delete/'.$key));
+      $rows[] = array(form_render($form['case_state_name'][$key]), form_render($form['case_state_realm'][$key]),l(t('delete'), 'admin/case/states/delete/'.$key));
     }
   }
-  $header = array(array('data' => t('Case state id')), array('data' => t('Case state name')), array('data' => t('Case state realm')), array('data' => t('Operation')));
+  $header = array(array('data' => t('Case state name')), array('data' => t('Case state realm')), array('data' => t('Operation')));
   $output = theme('table', $header, $rows);
   $output .= form_render($form);
   return $output;