### Eclipse Workspace Patch 1.0
#P addresses
Index: addresses.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/addresses/addresses.module,v
retrieving revision 1.57
diff -u -r1.57 addresses.module
--- addresses.module 17 Nov 2008 16:01:56 -0000 1.57
+++ addresses.module 28 Nov 2008 15:38:24 -0000
@@ -28,9 +28,11 @@
'type' => 'varchar',
'length' => 75,
'description' => t('The nickname of this address, like "Home", "Office", "Anna\'s appartment"'),
- 'display' => ADDRESSES_FIELD_NONE,
+ 'display' => ADDRESSES_FIELD_SHOW,
'title' => t('Address Name'),
- 'theme' => array('aname'),
+ 'theme' => array(
+ 'aname' => t('Address Name')
+ ),
'token' => 'addresses_general',
),
'street' => array(
@@ -40,7 +42,7 @@
'display' => ADDRESSES_FIELD_SHOW,
'title' => t('Street'),
'theme' => array(
- 'street' => t('Street and number.'),
+ 'street' => t('Street and number'),
),
'token' => 'addresses_adr',
),
@@ -50,7 +52,9 @@
'description' => t('More info like appartment block, number or address reference'),
'display' => ADDRESSES_FIELD_SHOW,
'title' => t('Additional'),
- 'theme' => array('additional'),
+ 'theme' => array(
+ 'additional' => t('Additional')
+ ),
'token' => 'addresses_adr',
),
'city' => array(
@@ -71,8 +75,8 @@
'display' => ADDRESSES_FIELD_SHOW,
'title' => t('Province'),
'theme' => array(
- 'province_name' => t('State/Province name.'),
- 'province_code' => t('State/Province code.'),
+ 'province_name' => t('State/Province name'),
+ 'province_code' => t('State/Province code'),
),
'token' => 'addresses_adr',
),
@@ -83,9 +87,9 @@
'display' => ADDRESSES_FIELD_SHOW,
'title' => t('Country'),
'theme' => array(
- 'country_name' => t('Country name.'),
- 'country_code2' => t('Country 2-digits code.'),
- 'country_code3' => t('Country 3-digits code.'),
+ 'country_name' => t('Country name'),
+ 'country_code2' => t('Country 2-digits code'),
+ 'country_code3' => t('Country 3-digits code'),
),
'token' => 'addresses_adr',
),
@@ -96,7 +100,7 @@
'display' => ADDRESSES_FIELD_SHOW,
'title' => t('Postal code'),
'theme' => array(
- 'postal_code' => t('Postal code.'),
+ 'postal_code' => t('Postal code'),
),
'token' => 'addresses_adr',
),
@@ -106,7 +110,7 @@
'default' => 0,
'description' => t('Mark it as the primary address or not (default is not)'),
'display' => ADDRESSES_FIELD_NONE,
- 'title' => t('Primary Address Checkbox'),
+ 'title' => t('Primary Address'),
'token' => 'addresses_general',
)
);
@@ -237,6 +241,10 @@
'file' => 'addresses.settings.inc',
),
// Shows address fields
+ 'addresses_field_aname' => array(
+ 'arguments' => array('form'),
+ 'file' => 'addresses.inc',
+ ),
'addresses_field_city' => array(
'arguments' => array('form'),
'file' => 'addresses.inc',
@@ -274,7 +282,12 @@
'file' => 'addresses.inc',
),
// Shows addresses using a single line
- 'addresses_address_singleline' => array(
+ 'addresses_singleline' => array(
+ 'arguments' => array('addresses'),
+ 'file' => 'addresses.inc',
+ ),
+ // Shows addresses using a single line
+ 'addresses_city_aname' => array(
'arguments' => array('addresses'),
'file' => 'addresses.inc',
),
Index: addresses.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/addresses/addresses.inc,v
retrieving revision 1.56
diff -u -r1.56 addresses.inc
--- addresses.inc 17 Nov 2008 16:01:56 -0000 1.56
+++ addresses.inc 28 Nov 2008 15:38:24 -0000
@@ -684,6 +684,17 @@
}
/**
+ * Print the field Address name.
+ *
+ * @param $afields
+ * Array. All field values
+ * @ingroup themeable
+ */
+function theme_addresses_field_aname($afields) {
+ return ''. t('Address Name') .': '. $afields['aname'] .'';
+}
+
+/**
* Print the field City.
*
* @param $afields
Index: addresses_cck/addresses_cck.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/addresses/addresses_cck/addresses_cck.inc,v
retrieving revision 1.4
diff -u -r1.4 addresses_cck.inc
--- addresses_cck/addresses_cck.inc 17 Nov 2008 16:01:57 -0000 1.4
+++ addresses_cck/addresses_cck.inc 28 Nov 2008 15:38:24 -0000
@@ -22,10 +22,27 @@
* Show the Address using the Single Line view.
* @ingroup themable
*/
-function theme_addresses_cck_formatter_single_line($element) {
+function theme_addresses_cck_formatter_singleline($element) {
// Include the important .inc file
module_load_include('inc', 'addresses');
// Print the address using the one-line only theme
return theme('addresses_singleline', $element['#item']);
}
+
+/**
+ * Show City and Address Name in one line.
+ * @ingroup themable
+ */
+function theme_addresses_cck_formatter_city_aname($element) {
+ return $element['#item']['city'] . ': ' . $element['#item']['aname'];
+}
+
+/**
+ * Show a single field of the address.
+ * @ingroup themable
+ */
+function theme_addresses_cck_formatter_field($element) {
+ $ftype = drupal_substr($element['#formatter'], 6);
+ return $element['#item'][$ftype];
+}
Index: addresses_cck/addresses_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/addresses/addresses_cck/addresses_cck.module,v
retrieving revision 1.15
diff -u -r1.15 addresses_cck.module
--- addresses_cck/addresses_cck.module 17 Nov 2008 16:01:57 -0000 1.15
+++ addresses_cck/addresses_cck.module 28 Nov 2008 15:38:24 -0000
@@ -48,7 +48,7 @@
}
/**
- * Implementation of hook_formatter_info().
+ * Implementation of hook_field_formatter_info().
*
* Its a CCK hook to declare information about a formatter.
*
@@ -62,34 +62,22 @@
function addresses_cck_field_formatter_info() {
$default = array(
'arguments' => array('element'),
- 'multiple values' => CONTENT_HANDLE_CORE,
'field types' => array('addresses_cck'),
+ 'multiple values' => CONTENT_HANDLE_CORE,
);
- $formatters = array(
- 'default' => array(
- 'label' => t('Default'),
- 'arguments' => array('element'),
- 'multiple values' => CONTENT_HANDLE_CORE,
- 'field types' => array('addresses_cck'),
- ),
-// 'single_line' => array(
-// 'label' => t('Single Line'),
-// 'arguments' => array('element'),
-// 'multiple values' => CONTENT_HANDLE_CORE,
-// 'field types' => array('addresses_cck'),
-// ),
- );
-
+ $formatters = array();
+ $formatters['default'] = array('label' => t('Default')) + $default;
+ $formatters['singleline'] = array('label' => t('Single Line')) + $default;
+ $formatters['city_aname'] = array('label' => t('City and Address name')) + $default;
+
$afields = module_invoke_all('addressesfieldapi', 'fields');
foreach ($afields as $ftype => $field) {
if (!empty($field['theme'])) {
foreach ($field['theme'] as $theme => $description) {
- $formatters['addresses_field_'. $theme] = $default;
- $formatters['addresses_field_'. $theme]['label'] = $description;
+ $formatters["field_$theme"] = array('label' => $description) + $default;
}
}
}
-
return $formatters;
}
@@ -172,11 +160,12 @@
$ftypes = module_invoke_all('addressesfieldapi', 'fields');
foreach ($ftypes as $ftype => $field_data) {
$field_cck = $cck_default;
- $field_cck['title'] .= ' '. $field_data['title'];
+ $field_cck['title'] = $field_data['title'] . ' (' . $field['field_name'] . '_' . $ftype . ')';
+ $field_cck['title_short'] = $field_data['title'];
+ $field_cck['filter']['title'] = $field_data['title'];
$field_cck['field']['field'] = $field['field_name'] .'_'. $ftype;
- $field_cck['filter']['title'] .= ' '. $field_data['title'];
-
-// unset($field_cck['field']['additional fields']);
+ $field_cck['field']['click sortable'] = TRUE;
+ $field_cck['group'] = t('Addresses');
$data[$table_alias][$field['field_name'] .'_'. $ftype] = $field_cck;
}
@@ -203,18 +192,28 @@
* Implementation of hook_theme().
*/
function addresses_cck_theme() {
- return array(
- // Shows address in the default view: Multilines
- 'addresses_cck_formatter_default' => array(
- 'arguments' => array('element'),
- 'file' => 'addresses_cck.inc',
- ),
- // Shows address in only one line
- 'addresses_cck_formatter_single_line' => array(
- 'arguments' => array('element'),
- 'file' => 'addresses_cck.inc',
- ),
+ $default = array(
+ 'arguments' => array('element'),
+ 'file' => 'addresses_cck.inc',
);
+
+ $theme = array();
+
+ // Shows address in the default view: Multilines
+ $theme['addresses_cck_formatter_default'] = $default;
+
+ // Shows address in only one line
+ $theme['addresses_cck_formatter_singleline'] = $default;
+
+ // Shows city and aname in one line
+ $theme['addresses_cck_formatter_city_aname'] = $default;
+
+ // Shows a single field
+ $afields = module_invoke_all('addressesfieldapi', 'fields');
+ foreach (array_keys($afields) as $ftype) {
+ $theme["addresses_cck_formatter_field_$ftype"] = array('function' => 'theme_addresses_cck_formatter_field') + $default;
+ }
+ return $theme;
}
/**