### Eclipse Workspace Patch 1.0
#P date
Index: date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/date/date.inc,v
retrieving revision 1.9.2.3
diff -u -r1.9.2.3 date.inc
--- date.inc	1 Sep 2006 20:39:34 -0000	1.9.2.3
+++ date.inc	4 Sep 2006 13:22:16 -0000
@@ -698,6 +698,8 @@
   $select_year   = $params['select_year'];
   $years_back    = $params['years_back'];
   $years_forward = $params['years_forward'];
+  $show_fieldset = $params['show_fieldset'];
+  $show_title    = $params['show_title'];
 
   if ($show_ampm) {
     $hours_format = t('h');
@@ -739,10 +741,17 @@
   } 
   
   // create the form values
-  $form['#type']   = 'fieldset';
-  $form['#title']  = t($label) . $title;
+  if ($show_fieldset) {
+	  $form['#type']   = 'fieldset';
+	  $form['#title']  = t($label) . $title;
+	  $form['#prefix'] = '<div class="container-inline-date">';
+  }
+  else {
+    $form['#type'] = 'date';
+    $form['#title']  = t($label) . $title;
+    $form['#process'] = array();
+  }	  
   $form['#weight'] = intval($weight);
-  $form['#prefix'] = '<div class="container-inline-date">';
   $form['#suffix'] = '</div>';
   
   $form['space0'] = array(
@@ -752,7 +761,7 @@
   if (in_array('M',$granularity)) {
     $form['mon'] = array(
     '#default_value' => $mon,
-    '#title' => t('month'),
+    '#title' => isset($show_title) ? '' : t('month'),
     '#required' => ($required && !in_array('mon', $opt_fields)) ? $required : 0,
     );
     if ($select_month) {
@@ -770,7 +779,7 @@
   if (in_array('D',$granularity)) {
     $form['mday'] = array(
     '#default_value' => $mday,
-    '#title' => t('day'),
+    '#title' => isset($show_title) ? '' : t('day'),
     '#required' => ($required && !in_array('mday', $opt_fields)) ? $required : 0,
     );
     if ($select_day) {
@@ -788,7 +797,7 @@
   if (in_array('Y',$granularity)) {
     $form['year'] = array(
     '#default_value' => $year,
-    '#title' => t('year'),
+    '#title' => isset($show_title) ? '' : t('year'),
     '#required' => ($required && !in_array('year', $opt_fields)) ? $required : 0,
     );
     if ($select_year) {
Index: date.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/date/date.module,v
retrieving revision 1.13.2.2
diff -u -r1.13.2.2 date.module
--- date.module	1 Sep 2006 20:39:34 -0000	1.13.2.2
+++ date.module	4 Sep 2006 13:22:16 -0000
@@ -63,6 +63,7 @@
       // need a way to identify the correct system timezone from an array of timezones with the same offset
       // save it as a system variable so it will default to the correct value after the first time it is set
       // aligns with system setting 'date_default_timezone'
+      
       $form['field_timezone'] = array(
         '#type' => 'select',
         '#title' => t('Site timezone'),
@@ -196,7 +197,7 @@
   switch ($op) {
     case 'form':
       
-        $form = array();
+        $form = array();   
         $form['input'] = array(
           '#type' => 'fieldset',
           '#title' => t('Input Options'),
@@ -278,12 +279,22 @@
             '#options' => array(1 => 1, 5 => 5, 10 => 10, 15 => 15, 30 => 30),
             '#description' => t('Increment the minute and second fields by this amount.'),
           );
+          $form['input']['select']['show_fieldset'] = array(
+            '#type' => 'checkbox',
+            '#title' => t('Show fields in a fieldset'),
+            '#default_value' => isset($widget['show_fieldset']) ? $widget['show_fieldset'] : 1,
+          );
+          $form['input']['select']['show_title'] = array(
+            '#type' => 'checkbox',
+            '#title' => t('Show title(year, month, day) foreach field'),
+            '#default_value' => isset($widget['show_title']) ? $widget['show_title'] : 1,
+          );
         }
 
        return $form;
 
     case 'save':
-      return array('ampm', 'increment', 'granularity', 'select_day', 'select_month', 'select_year', 'years_back', 'years_forward');
+      return array('ampm', 'increment', 'granularity', 'select_day', 'select_month', 'select_year', 'years_back', 'years_forward', 'show_fieldset', 'show_title');
   }
 }
 
@@ -328,6 +339,8 @@
           'select_year'   => $field['widget']['select_year'],
           'years_back'    => $field['widget']['years_back'],
           'years_forward' => $field['widget']['years_forward'],
+          'show_fieldset' => $field['widget']['show_fieldset'],
+          'show_title'    => $field['widget']['show_title'],
           );
         $params['required'] = ($field['required'] && $delta == 0) ? 1 : 0;