Index: contemplate/contemplate.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/contemplate/contemplate.module,v
retrieving revision 1.8
diff -u -r1.8 contemplate.module
--- contemplate/contemplate.module	12 Dec 2006 18:14:26 -0000	1.8
+++ contemplate/contemplate.module	23 Jan 2007 23:10:15 -0000
@@ -648,21 +648,41 @@
  * @return unknown
  */
 function theme_contemplate_field(&$field) {
+  
   $output = '';
 
-  $output .= '<div class="field field-type-'. strtr($field['type'], '_', '-') .' field-'. strtr($field['field_name'], '_', '-') .'">'."\n";
-
-  $output .= '  <h3 class="field-label">'. $field['widget']['label'] .'</h3>'."\n";
+  $label = isset($field['display_settings']['label']['format']) ? $field['display_settings']['label']['format'] : 'above';
 
-  $output .= '  <div class="field-items">'."\n";
-  $output .= "    <?php foreach ((array)\$". $field['field_name'] ." as \$item) { ?>"."\n";
-  $output .= '      <div class="field-item">'. "<?php print \$item['view'] ?>" .'</div>'."\n";
-  $output .= "    <?php } ?>"."\n";
-  $output .= '  </div>'."\n";
+  $output .= '<div class="field field-type-'. strtr($field['type'], '_', '-') .' field-'. strtr($field['field_name'], '_', '-') .'">'."\n";
+  $output .= "<?php \$items_output = '' ?> \n";
+  $output .= '    <?php foreach ((array)$'. $field['field_name'].' as $item) { ?>'."\n";
+  $output .= '       <?php if (!empty($item[\'view\']) || $item[\'view\'] === \'0\') {  ?>'."\n";
+  $output .= '          <?php $items_output .= \'<div class="field-item">\';  ?>'. "\n";
+  
+  if ($label == 'inline') {
+    $output .= '             <?php $items_output .= \'<div class="field-label-inline\'. ($delta ? \'\' : \'-first") .\'">\'; ?>'."\n";
+    $output .= '             <?php $items_output .= $field[\'widget\'][\'label\'] .\':</div>\' ; ?>'."\n";
+  }
+
+  $output .= '        <?php $items_output .= $item[\'view\'] .\'</div>\'; ?>'."\n";
+  $output .= '      <?php } ?>'."\n";
+  $output .= '    <?php } ?>'."\n";
+  $output .= '<?php $output = \'\'; ?>'."\n";
+  $output .= '<?php if (!empty($items_output)) { ?>'."\n";
+  $output .= '  <?php print \'<div class="field field-type-'. strtr($field['type'], '_', '-') .' field-'. strtr($field['field_name'], '_', '-') .'">\'; ?>'."\n";
+  
+  if ($label == 'above') {
+    $output .= '    <?php print \'<div class="field-label">'. $field['widget']['label'] .':</div>\'; ?>'."\n";
+  }
+  
+  $output .= '<?php print \'<div class="field-items">\'. $items_output .\'</div>\'; ?>'."\n";
+  $output .= '<?php print \'</div>\'; ?>'."\n";
+  $output .= '<?php } ?>'."\n";
 
   $output .= '</div>'."\n";
 
   return $output;
+
 }
 
 function contemplate_version(){