Index: field_address.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/flexinode/contrib/field_address.inc,v retrieving revision 1.1 diff -u -F^f -r1.1 field_address.inc --- field_address.inc 26 Dec 2005 20:51:31 -0000 1.1 +++ field_address.inc 21 Jun 2006 16:19:18 -0000 @@ -14,45 +14,39 @@ function flexinode_field_address_form($f $form['address']['#weight'] = $field->weight; $form['address']['#collapsible'] = TRUE; $form['address']['#collapsed'] = FALSE; - $form['address'][$fieldname .'_address_1'] = array( - '#type' => 'textfield', - '#default_value' => $values['address_1'] - ); - $form['address'][$fieldname .'_address_2'] = array( - '#type' => 'textfield', - '#default_value' => $values['address_2'] - ); - $form['address'][$fieldname .'_address_3'] = array( - '#type' => 'textfield', - '#default_value' => $values['address_3'] + $form['address'][$fieldname .'_address'] = array( + '#title' => t('address'), + '#type' => 'textarea', + '#default_value' => $values['address'], + '#rows' => 4, ); $form['address'][$fieldname .'_city'] = array( + '#title' => t('city'), '#type' => 'textfield', '#prefix' => '
', '#size' => 20, '#default_value' => $values['city'], - '#description' => t('city') ); $form['address'][$fieldname .'_state'] = array( + '#title' => t('state'), '#type' => 'textfield', '#size' => 2, '#default_value' => $values['state'], - '#description' => t('state') ); $form['address'][$fieldname .'_postal_code'] = array( + '#title' => t('postal code'), '#type' => 'textfield', '#suffix' => '
', '#size' => 10, '#default_value' => $values['postal_code'], - '#description' => t('postal code') ); $form['address'][$fieldname .'_country'] = array( + '#title' => t('country'), '#type' => 'textfield', '#prefix' => '
', '#suffix' => '
', '#size' => 20, '#default_value' => $values['country'], - '#description' => t('country') ); return $form; } @@ -74,9 +68,7 @@ function flexinode_field_address_db_sort function flexinode_field_address_insert($field, $node) { $fieldname = 'flexinode_'. $field->field_id; - $address['address_1'] = $node->{$fieldname . '_address_1'}; - $address['address_2'] = $node->{$fieldname . '_address_2'}; - $address['address_3'] = $node->{$fieldname . '_address_3'}; + $address['address'] = $node->{$fieldname . '_address'}; $address['city'] = $node->{$fieldname . '_city'}; $address['state'] = $node->{$fieldname . '_state'}; $address['postal_code'] = $node->{$fieldname . '_postal_code'}; @@ -112,9 +104,7 @@ function flexinode_field_address_format( * The value that the user entered for the field as pre-formatted by the module. */ function theme_flexinode_address($field_id, $label, $value, $formatted_value) { - $output = '
' . $formatted_value['address_1'] . "
\n"; - $output .= '
' . $formatted_value['address_2'] . "
\n"; - $output .= '
' . $formatted_value['address_3'] . "
\n"; + $output = '
' . $formatted_value['address'] . "
\n"; $output .= '
'; $output .= '
' . $formatted_value['city'] . '
';