Index: modules/dashboard/dashboard.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dashboard/dashboard.module,v
retrieving revision 1.6
diff -u -r1.6 dashboard.module
--- modules/dashboard/dashboard.module	28 Nov 2005 17:44:49 -0000	1.6
+++ modules/dashboard/dashboard.module	3 Dec 2005 06:20:19 -0000
@@ -27,8 +27,8 @@
 /**
  * Implementation of hook_node_name().
  */
-function dashboard_node_name($node) {
-  return t('dashboard');
+function dashboard_node_info() {
+  return array('dashboard' => array('name' => t('dashboard'), 'base' => 'dashboard'));
 }
 
 /**
@@ -70,18 +70,71 @@
  * Implementation of hook_form().
  */
 function dashboard_form(&$node) {
+  $form = array();
   if (function_exists('taxonomy_node_form')) {
-    $output .= implode('', taxonomy_node_form('page', $node));
+    $output = array_merge($form, taxonomy_node_form($node));
   }
 
-  $output .= form_textfield(t('Dashboard Name (for CSS)'), 'dashboard_name', $node->dashboard_name, 20, 60);
-  $output .= form_textarea(t('Top'), 'dashboard_top', $node->dashboard_top, 60, 20, '', NULL, TRUE);
-  $output .= form_textarea(t('Left'), 'dashboard_left', $node->dashboard_left, 60, 20, '', NULL, TRUE);
-  $output .= form_textarea(t('Right'), 'dashboard_right', $node->dashboard_right, 60, 20, '', NULL, TRUE);
-  $output .= form_textarea(t('Bottom'), 'dashboard_bottom', $node->dashboard_bottom, 60, 20, '', NULL, TRUE);
-  $output .= filter_form('format', $node->format);
+  $form['dashboard_name'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Dashboard Name (for CSS)'),
+    '#default_value' => $node->dashboard_name,
+    '#size' => 20,
+    '#maxlength' => 60,
+    '#weight' => -18,
+  );
+
+  $form['dashboard_top'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Top'),
+    '#default_value' => $node->dashboard_top,
+    '#cols' => 60,
+    '#rows' => 20,
+    '#description' => '',
+    '#attributes' => NULL,
+    '#required' => TRUE,
+    '#weight' => -17,
+  );
+
+  $form['dashboard_left'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Left'),
+    '#default_value' => $node->dashboard_left,
+    '#cols' => 60,
+    '#rows' => 20,
+    '#description' => '',
+    '#attributes' => NULL,
+    '#required' => TRUE,
+    '#weight' => -17,
+  );
+
+  $form['dashboard_right'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Right'),
+    '#default_value' => $node->dashboard_right,
+    '#cols' => 60,
+    '#rows' => 20,
+    '#description' => '',
+    '#attributes' => NULL,
+    '#required' => TRUE,
+    '#weight' => -17,
+  );
+
+  $form['dashboard_bottom'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Bottom'),
+    '#default_value' => $node->dashboard_bottom,
+    '#cols' => 60,
+    '#rows' => 20,
+    '#description' => '',
+    '#attributes' => NULL,
+    '#required' => TRUE,
+    '#weight' => -17,
+  );
 
-  return $output;
+  $form = array_merge($form, filter_form($node->format));
+
+  return $form;
 }
 
 function dashboard_delete($node) {
@@ -175,5 +228,3 @@
   return theme_dashboard_component($output, $title, $id);
 }
 
-
-?>