? files
? generate-content.php
? t.patch
? modules/devel
? modules/project
? modules/timesheet
? modules/tinymce
? modules/znode_tabs
? themes/spreadfirefox
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.54
diff -u -r1.54 form.inc
--- includes/form.inc	19 Jan 2006 17:53:53 -0000	1.54
+++ includes/form.inc	20 Jan 2006 05:38:25 -0000
@@ -538,13 +538,22 @@
   $output = '<input type="radio" ';
   $output .= 'class="'. _form_get_class('form-radio', $element['#required'], form_get_error($element)) .'" ';
   $output .= 'name="' . $element['#name'] .'" ';
+  if (isset($element['#id'])) {
+    $output .= 'id="'. $element['#id'] .'" ';
+  }
   $output .= 'value="'. $element['#return_value'] .'" ';
   $output .= ($element['#value'] == $element['#return_value']) ? ' checked="checked" ' : ' ';
   $output .= drupal_attributes($element['#attributes']) .' />';
   if (!is_null($element['#title'])) {
-    $output = '<label class="option">'. $output .' '. $element['#title'] .'</label>';
+    $output .= '<label for="'. $element['#id'] .'" class="option">'. $element['#title'] .'</label>';
+  }
+
+  if (isset($element['#spawned'])) {
+    return '<li>'. $output .'</li>';
+  }
+  else {
+    return theme('form_element', NULL, $output, $element['#description'], $element['#name'], $element['#required'], form_get_error($element));
   }
-  return theme('form_element', NULL, $output, $element['#description'], $element['#name'], $element['#required'], form_get_error($element));
 }
 
 /**
@@ -558,10 +567,10 @@
  */
 function theme_radios($element) {
   if ($element['#title'] || $element['#description']) {
-    return theme('form_element', $element['#title'], $element['#children'], $element['#description'], $element['#id'], $element['#required'], form_get_error($element));
+    return theme('form_element', $element['#title'], '<ul class="form-radios">'. $element['#children'] .'</ul>', $element['#description'], $element['#id'], $element['#required'], form_get_error($element));
   }
   else {
-    return $element['#children'];
+    return '<ul class="form-radios">'. $element['#children'] .'</ul>';
   }
 }
 
@@ -685,7 +694,7 @@
   if (count($element['#options']) > 0) {
     foreach ($element['#options'] as $key => $choice) {
       if (!$element[$key]) {
-        $element[$key] = array('#type' => 'radio', '#title' => $choice, '#return_value' => $key, '#default_value' => $element['#default_value'], '#attributes' => $element['#attributes'], '#parents' => $element['#parents'], '#spawned' => TRUE);
+        $element[$key] = array('#type' => 'radio', '#title' => $choice, '#return_value' => $key, '#default_value' => $element['#default_value'], '#attributes' => $element['#attributes'], '#parents' => $element['#parents'], '#id' => $element['#id'] .'-'. $key, '#spawned' => TRUE);
       }
     }
   }
@@ -725,10 +734,15 @@
   $checkbox .= drupal_attributes($element['#attributes']) . ' />';
 
   if (!is_null($element['#title'])) {
-    $checkbox = '<label class="option">'. $checkbox .' '. $element['#title'] .'</label>';
+    $checkbox .= '<label for="'. $element['#id'] .'" class="option">'. $element['#title'] .'</label>';
   }
 
-  return theme('form_element', NULL, $checkbox, $element['#description'], $element['#name'], $element['#required'], form_get_error($element));
+  if (isset($element['#spawned'])) {
+    return '<li>'. $checkbox .'</li>';
+  }
+  else {
+    return theme('form_element', NULL, $checkbox, $element['#description'], $element['#name'], $element['#required'], form_get_error($element));
+  }
 }
 
 /**
@@ -741,10 +755,10 @@
  */
 function theme_checkboxes($element) {
   if ($element['#title'] || $element['#description']) {
-    return theme('form_element', $element['#title'], $element['#children'], $element['#description'], 'edit-'. $element['#name'], $element['#required'], form_get_error($element));
+    return theme('form_element', $element['#title'], '<ul class="form-checkboxes">'. $element['#children'] .'</ul>', $element['#description'], 'edit-'. $element['#name'], $element['#required'], form_get_error($element));
   }
   else {
-    return $element['#children'];
+    return '<ul class="form-checkboxes">'. $element['#children'] .'</ul>';
   }
 }
 
@@ -757,7 +771,7 @@
     }
     foreach ($element['#options'] as $key => $choice) {
       if (!isset($element[$key])) {
-        $element[$key] = array('#type' => 'checkbox', '#processed' => TRUE, '#title' => $choice, '#return_value' => $key, '#default_value' => isset($value[$key]), '#attributes' => $element['#attributes']);
+        $element[$key] = array('#type' => 'checkbox', '#processed' => TRUE, '#title' => $choice, '#return_value' => $key, '#default_value' => isset($value[$key]), '#attributes' => $element['#attributes'], '#spawned' => TRUE);
       }
     }
   }
Index: misc/drupal.css
===================================================================
RCS file: /cvs/drupal/drupal/misc/drupal.css,v
retrieving revision 1.134
diff -u -r1.134 drupal.css
--- misc/drupal.css	17 Jan 2006 21:19:43 -0000	1.134
+++ misc/drupal.css	20 Jan 2006 05:54:06 -0000
@@ -148,8 +148,14 @@
   font-weight: bold;
 }
 .form-item label.option {
+  display: inline;
   font-weight: normal;
 }
+ul.form-radios, ul.form-checkboxes {
+  margin: 0.5em 0 0 0;
+  padding: 0;
+  list-style-type: none;
+}
 .marker, .form-required {
   color: #f00;
 }