diff -pr editview-6.x-1.x-dev/includes/editview.views.inc editview.ttb_110910/includes/editview.views.inc
*** editview-6.x-1.x-dev/includes/editview.views.inc	Thu Feb 24 19:07:08 2011
--- editview.ttb_110910/includes/editview.views.inc	Sat Sep 10 21:20:38 2011
*************** define('EDITVIEW_NEW_BELOW', 1);
*** 25,30 ****
--- 25,33 ----
   */
  define('EDITVIEW_NEW_NONE', 2);
  
+ define('EDITVIEW_HORIZONTAL', 0);
+ define('EDITVIEW_VERTICAL',   1);
+ 
  /**
   * Implementation of hook_views_plugins().
   */
*************** function editview_js() {
*** 72,78 ****
  
      // Build the view so all necessary classes will be defined.
      $view = views_get_view($_POST['editview_view']);
!     $view->build();
  
      // Fast path is to get the form out of the cache. But if minimum cache
      // lifetimes have been specified, on post of a form all cached forms
--- 75,82 ----
  
      // Build the view so all necessary classes will be defined.
      $view = views_get_view($_POST['editview_view']);
!     $view->set_arguments(unserialize($_POST['editview_args']));
!     $view->build($_POST['editview_display']);
  
      // Fast path is to get the form out of the cache. But if minimum cache
      // lifetimes have been specified, on post of a form all cached forms
*************** function editview_node_form(&$form_state
*** 146,152 ****
    // from the form cache. Also, we add a hidden field which will be filled
    // with all ids used in this form. Javascript will get them from the
    // Drupal.settings.
!   $form['editview_view'] = array('#type' => 'hidden', '#value' => $view->name); 
    $form['editview_nid'] = array('#type' => 'hidden', '#value' => $node->nid); 
    $form['editview_order'] = array('#type' => 'hidden', '#value' => $order); 
    $form['editview_uri'] = array('#type' => 'hidden', '#value' => $uri); 
--- 150,160 ----
    // from the form cache. Also, we add a hidden field which will be filled
    // with all ids used in this form. Javascript will get them from the
    // Drupal.settings.
!   $form['editview_view'] = array('#type' => 'hidden', '#value' => $view->name);
!   $form['editview_display'] = array('#type' => 'hidden',
!       '#value' => $view->current_display);
!   $form['editview_args'] = array('#type' => 'hidden',
!       '#value' => serialize($view->args));
    $form['editview_nid'] = array('#type' => 'hidden', '#value' => $node->nid); 
    $form['editview_order'] = array('#type' => 'hidden', '#value' => $order); 
    $form['editview_uri'] = array('#type' => 'hidden', '#value' => $uri); 
diff -pr editview-6.x-1.x-dev/includes/editview_plugin_style_node_add.inc editview.ttb_110910/includes/editview_plugin_style_node_add.inc
*** editview-6.x-1.x-dev/includes/editview_plugin_style_node_add.inc	Thu Feb 24 19:07:08 2011
--- editview.ttb_110910/includes/editview_plugin_style_node_add.inc	Sat Sep 10 21:20:38 2011
*************** class editview_plugin_style_node_add ext
*** 34,39 ****
--- 34,40 ----
      $options = parent::option_definition();
      $options['editview_node_type'] = array();
      $options['editview_node_position'] = array('default' => EDITVIEW_NEW_ABOVE);
+     $options['editview_orientation'] = array('default' => EDITVIEW_HORIZONTAL);
      return $options;
    }
  
*************** class editview_plugin_style_node_add ext
*** 56,61 ****
--- 57,69 ----
        '#options' => array(t('Above'), t('Below'), t('None')),
        '#description' => t('Specify whether a new node form should be above or below existing records or not displayed at all.'),
      );
+     $form['editview_orientation'] = array(
+       '#type' => 'radios',
+       '#title' => t('Field display'),
+       '#default_value' => $this->options['editview_orientation'],
+       '#options' => array(t('Horizontal'), t('Vertical')),
+       '#description' => t('Specify orientation of fields in the display.'),
+     );
      parent::options_form($form, $form_state);
    }
  
diff -pr editview-6.x-1.x-dev/theme/editview.theme.inc editview.ttb_110910/theme/editview.theme.inc
*** editview-6.x-1.x-dev/theme/editview.theme.inc	Thu Feb 24 19:07:08 2011
--- editview.ttb_110910/theme/editview.theme.inc	Sat Sep 10 21:20:38 2011
*************** function template_preprocess_editview_vi
*** 57,63 ****
  function theme_editview_node_form($form) {
    $view = $form['#parameters'][3];
    $header = array();
!   $row = array();
    // Add selected fields to table as form fields.
    foreach ($view->field as $field) {
      // If auto_nodetitle module is enabled and the title field is to be overridden don't display it.
--- 57,70 ----
  function theme_editview_node_form($form) {
    $view = $form['#parameters'][3];
    $header = array();
!   $rows = array();
!   $options  = $view->style_plugin->options;
! 
!   $horizontal = True;
!   if ($options['editview_orientation'] == EDITVIEW_VERTICAL) {
!     $horizontal = False;
!   }
! 
    // Add selected fields to table as form fields.
    foreach ($view->field as $field) {
      // If auto_nodetitle module is enabled and the title field is to be overridden don't display it.
*************** function theme_editview_node_form($form)
*** 67,73 ****
        }
      }
  
!     $header[] = $field->label();
      $classes = array();
      $cell = array('data' => '');
      foreach (module_implements('field_form_render') as $module) {
--- 74,84 ----
        }
      }
  
!     if ($horizontal) {
! // TBMark! This call was hanging for inscrutable reasons. Replaced with paraphrase of field::label() contents from /include/views.inc.
! //      $header[] = $field->label();
!       $header[] = isset($field->options['label']) ? $field->options['label'] : "";
!     }
      $classes = array();
      $cell = array('data' => '');
      foreach (module_implements('field_form_render') as $module) {
*************** function theme_editview_node_form($form)
*** 76,81 ****
--- 87,97 ----
        foreach ($result as $key => $value) {
          switch ($key) {
            case 'data':
+             if (!$horizontal) {
+ //              $cell['data'] .= "<label>".$field->label()."</label>";
+ // TBMark! See comment above.
+               $cell['data'] .= "<label>".(isset($field->options['label']) ? $field->options['label'] : "")."</label>";
+             }
              $cell['data'] .= $value;
              break;
            case 'class':
*************** function theme_editview_node_form($form)
*** 88,98 ****
        }
      }
      $cell['class'] = implode(' ', $classes);
!     $row[] = $cell;
    }
    $buttons = drupal_render($form['buttons']['submit']);
!   $buttons .= drupal_render($form['buttons']['delete']) .'<div style="display: none;">'. drupal_render($form) .'</div>'."\n";
!   return theme('table', $header, array($row), array('class' => 'editview-row')) . $buttons;
  }
  
  /**
--- 104,119 ----
        }
      }
      $cell['class'] = implode(' ', $classes);
!     if ($horizontal) {
!       $rows[0][] = $cell;
!     } else {
!       $rows[] = array($cell);
!     }
    }
+ 
    $buttons = drupal_render($form['buttons']['submit']);
!   $buttons .= drupal_render($form['buttons']['delete']) .'<span style="display: none;">'. drupal_render($form) .'</span>'."\n";
!   return theme('table', $header, $rows, array('class' => 'editview-row')) . $buttons;
  }
  
  /**
