Index: imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.10
diff --unified=3 -r1.10 imagefield.module
--- imagefield.module	1 Sep 2006 20:19:56 -0000	1.10
+++ imagefield.module	6 Sep 2006 15:42:31 -0000
@@ -370,19 +370,18 @@
  
   $form = array(); 
   $form[$fieldname] = array(
-    '#type' => 'fieldset',
-    '#title' => t($field['widget']['label']),
+    '#type' => 'markup',
     '#weight' => $field['widget']['weight'],
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
-    '#tree' => TRUE,
+    '#prefix' => '<div class="form-item"><label>'. t($field['widget']['label']) . '</label>',
+	'#suffix' => '</div>',
+	'#tree' => TRUE,
   );
       
   // Seperate from tree becase of that silly things won't be 
   // displayed if they are a child of '#type' = form issue
   $form[$fieldname][$fieldname .'_upload'] = array(
     '#type'  => 'file',
-    '#description' => t('Attach an image'),
+    '#description' => $field['widget']['description'],
     '#tree' => FALSE,
     '#weight' => 9,
   );
@@ -422,7 +421,7 @@
         );
         $form[$fieldname][$delta]['alt'] = array(
           '#type' => 'textfield',
-          '#title' =>  t('alternate text'),
+          '#title' =>  t($field['widget']['label']) . ' ' . t('alternate text'),
           '#default_value' => $file['alt'],
           '#description' => t('Alternate text to be displayed if the image cannot be displayed.'),
           '#maxlength' => 255,
@@ -430,7 +429,7 @@
         );
         $form[$fieldname][$delta]['title'] = array(
           '#type' => 'textfield',
-          '#title' =>  t('title'),
+          '#title' =>  t($field['widget']['label']) . ' ' . t('title'),
           '#default_value' =>  $file['title'],
           '#description' => t('Text to be displayed on mouse overs.'),
           '#maxlength' => 255,