Index: modules/watchdog/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog/watchdog.module,v
retrieving revision 1.147
diff -u -F^f -r1.147 watchdog.module
--- modules/watchdog/watchdog.module	10 Aug 2006 15:42:33 -0000	1.147
+++ modules/watchdog/watchdog.module	11 Aug 2006 00:51:05 -0000
@@ -168,27 +168,49 @@ function watchdog_event($id) {
   $output = '';
   $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
   if ($watchdog = db_fetch_object($result)) {
-    $header = array(t('Type'), t('Date'), t('User'), t('Location'), t('Referrer'), t('Message'), t('Severity'), t('Hostname'));
-    $data = array(t($watchdog->type), format_date($watchdog->timestamp, 'large'), theme('username', $watchdog), l($watchdog->location, $watchdog->location), l($watchdog->referer, $watchdog->referer), $watchdog->message, $severity[$watchdog->severity], $watchdog->hostname);
-    $output = theme('watchdog_event', $header, $data);
+    $header = array(
+      array('colspan' => 2)
+    );
+    $rows = array(
+      array( 
+        array('data' => t('Type'), 'header' => TRUE),
+        array('data' => t($watchdog->type))
+      ),
+      array(
+        array('data' => t('Date'), 'header' => TRUE),
+        array('data' => format_date($watchdog->timestamp, 'large'))
+      ),
+      array(
+        array('data' => t('User'), 'header' => TRUE),
+        array('data' => theme('username', $watchdog))
+      ),
+      array(
+        array('data' => t('Location'), 'header' => TRUE),
+        array('data' => l($watchdog->location, $watchdog->location))
+      ),
+      array(
+        array('data' => t('Referrer'), 'header' => TRUE),
+        array('data' => l($watchdog->referer, $watchdog->referer))
+      ),
+      array(
+        array('data' => t('Message'), 'header' => TRUE),
+        array('data' => $watchdog->message)
+      ),
+      array(
+        array('data' => t('Severity'), 'header' => TRUE),
+        array('data' => $severity[$watchdog->severity])
+      ),
+      array(
+        array('data' => t('Hostname'), 'header' => TRUE),
+        array('data' => $watchdog->hostname)
+      )
+    );	
+    $attributes = array('class' => 'watchdog-event');
+    $output = theme('table', $header, $rows, $attributes);
   }
   return $output;
 }
 
-function theme_watchdog_event($header, $data) {
-  $output = '';
-  $output .= '<table class="watchdog-event">';
-
-  $n = count($header);
-  for ($i = 0; $i < $n; $i++) {
-    $output .= '<tr class="' . ($i % 2 == 0 ? 'even' : 'odd') . '"><th>' . $header[$i] . '</th><td>' . $data[$i] . '</td></tr>';
-  }
-
-  $output .= '</table>';
-
-  return $output;
-}
-
 function _watchdog_get_message_types() {
   $types = array();