Binary files date/.DS_Store and date_new/.DS_Store differ
diff -u'rNF^function' date/date.css date_new/date.css
--- date/date.css	2006-09-30 18:30:34.000000000 +0200
+++ date_new/date.css	2006-09-30 19:37:19.000000000 +0200
@@ -1,23 +1,12 @@
-.container-inline-date .form-item, .container-inline-date .form-item input {
+.form-item .clear-block .form-item, .form-item .clear-block .form-item input {
   width: auto;
 }
-.container-inline-date .form-item, .date-date, .date-time, .date-timezone, .date-space {
+.form-item .clear-block .form-item {
   float:left;
+  margin-right:1em;
 }
-.container-inline-date .form-item input, .container-inline-date .form-item select {
-  margin-right:10px;
-}
-fieldset, #main .container-inline-date .description {
-  clear:both;
-  width:auto;
-}
-.date-clearing {
-  height:1px;
-  line-height:1px;
-  clear:both;
-  margin:0;
-  padding:0;
-}
+.form-item .clear-block label {font-weight: normal;}
+
 a.help, acronym {
   cursor: help;
   border-bottom: 1px dotted #080;
@@ -27,4 +16,29 @@
   display:inline;
 }
 
+/*
+** Markup free clearing
+** Details: http://www.positioniseverything.net/easyclearing.html
+** this will be on drupal 5.0 so we can get rid of the styling below when the module will be updated
+*/
+.clear-block:after {
+  content: "."; 
+  display: block; 
+  height: 0; 
+  clear: both; 
+  visibility: hidden;
+ }
+
+.clear-block {
+  display: inline-block;
+ }
+
+/* Hides from IE-mac \*/
+* html .clear-block {
+  height: 1%;
+ }
 
+.clear-block {
+  display: block;
+ }
+/* End hide from IE-mac */
\ No newline at end of file
diff -u'rNF^function' date/date.inc date_new/date.inc
--- date/date.inc	2006-09-30 18:30:46.000000000 +0200
+++ date_new/date.inc	2006-09-30 19:32:45.000000000 +0200
@@ -741,11 +741,11 @@ function date_select_input($params) {
   } 
   
   // create the form values
-  $form['#type']   = 'fieldset';
-  $form['#title']  = t($label) . $title;
+  $form['#type']   = 'markup';
+  $form['#process'] = array();
   $form['#weight'] = intval($weight);
-  $form['#prefix'] = '<div class="container-inline-date">';
-  $form['#suffix'] = '</div>';
+  $form['#prefix'] = '<div class="form-item"><label>'. t($label) . '</label><div class="clear-block">';
+  $form['#suffix'] = '</div>' . ($description > '' ? '<div class="description">'.$description.'</div>' : '') . '</div>';
   
   if (in_array('D',$granularity)) {
     $form['mday'] = array(
@@ -808,11 +808,6 @@ function date_select_input($params) {
     }
   }
 
-  $form['space1'] = array(
-    '#type' => 'markup',
-    '#value' => ' <div class="date-space">&nbsp;</div>',
-    '#weight' => 3,
-    );
 
   if (in_array('H',$granularity)) {
     $form['hours'] = array(
@@ -849,11 +844,6 @@ function date_select_input($params) {
   if ($formats['input']['am_pm']) {
     $options = array('am' => t('am'), 'pm' => t('pm'));
     if (!$required || in_array('hours', $opt_fields) || $blank_default) array_unshift($options, '');
-    $form['space2'] = array(
-      '#type' => 'markup',
-      '#value' => '<div class="date-space">&nbsp;</div>',
-      '#weight' => 7,
-    );
     $form['ampm'] = array(
       '#type' => 'select',
       '#default_value' => $ampm,
@@ -870,8 +860,6 @@ function date_select_input($params) {
       '#options' => date_timezone_options(),
       '#required' => ($required && !in_array('timezone', $opt_fields)) ? $required : 0,
       '#title' => t('timezone'),
-      '#prefix' => '<div class="date-timezone">',
-      '#suffix' => '</div>',
       '#weight' => 10,
     );
   } else {
@@ -880,11 +868,7 @@ function date_select_input($params) {
       '#value' => $timezone_out,
     );
   }
-  $form[] = array(
-    '#type' => 'markup',
-    '#value' => '<div class="date-clearing"> </div>'. ($description > '' ? '<div class="form-item description">'.$description.'</div>' : ''),
-    '#weight' => 11,
-  );
+
   return $form;
 }
 
@@ -953,8 +937,9 @@ function date_text_input($params) {
   
   // if date-specific timezone handling was selected, provide a way for the user to enter the timezone
   if (in_array('T', $granularity)) {
-    $form['#type'] = 'fieldset';
-    $form['#title'] = $label;
+    $form['#type'] = 'markup';
+	 $form['#prefix'] = '<div class="form-item"><label>'. t($label) . '</label><div class="clear-block">';
+	 $form['#suffix'] = '</div></div>';
     $form['#weight'] = $weight;
             
     $form['value'] = array(
@@ -981,7 +966,7 @@ function date_text_input($params) {
 
     $form[] = array(
       '#type' => 'markup',
-      '#value' => '<div class="form-item"><div class="description">'.$description.'</div></div>',
+      '#value' => '<div class="description">'.$description.'</div>',
     );
 
   } else {