Index: term_fields.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/term_fields/term_fields.install,v
retrieving revision 1.1
diff -u -r1.1 term_fields.install
--- term_fields.install 28 Jan 2009 02:41:09 -0000 1.1
+++ term_fields.install 30 Oct 2009 23:31:25 -0000
@@ -28,42 +28,42 @@
'type' => 'varchar',
'length' => 32,
'not null' => TRUE,
- 'description' => t('The unique field identifier.')
+ 'description' => 'The unique field identifier.',
),
'vid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
- 'description' => t('The vocabulary id of which field values can be set.')
+ 'description' => 'The vocabulary id of which field values can be set.',
),
'title' => array(
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
- 'description' => t('The human readable name of this field.')
+ 'description' => 'The human readable name of this field.',
),
'description' => array(
'type' => 'text',
'size' => 'medium',
- 'description' => t('A description of the field for users.')
+ 'description' => 'A description of the field for users.',
),
'type' => array(
'type' => 'varchar',
'length' => 32,
'not null' => TRUE,
- 'description' => t('The type of field.')
+ 'description' => 'The type of field.',
),
'weight' => array(
'type' => 'int',
'size' => 'tiny',
'unsigned' => FALSE,
'not null' => TRUE,
- 'description' => t('The weight of the field.')
+ 'description' => 'The weight of the field.',
),
'options' => array(
'type' => 'text',
'size' => 'big',
- 'description' => t('Serialized array of options used for select type fields.')
+ 'description' => 'Serialized array of options used for select type fields.',
)
),
'indexes' => array(
Index: term_fields.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/term_fields/term_fields.module,v
retrieving revision 1.7.2.3
diff -u -r1.7.2.3 term_fields.module
--- term_fields.module 26 Oct 2009 17:40:50 -0000 1.7.2.3
+++ term_fields.module 30 Oct 2009 23:31:25 -0000
@@ -7,45 +7,45 @@
*/
function term_fields_menu() {
$items['admin/content/taxonomy/term_fields'] = array(
- 'title' => t('Fields'),
+ 'title' => 'Fields',
'page callback' => 'term_fields_admin',
- 'description' => t('An overview of term fields.'),
+ 'description' => 'An overview of term fields.',
'access arguments' => array('administer term fields'),
'type' => MENU_LOCAL_TASK,
'file' => 'term_fields.admin.inc'
);
$items['admin/content/taxonomy/term_fields/new'] = array(
- 'title' => t('New Field'),
+ 'title' => 'Add field',
'page callback' => 'drupal_get_form',
'page arguments' => array('term_fields_admin_new'),
- 'description' => t('Form used to create new term fields.'),
+ 'description' => 'Form used to create new term fields.',
'access arguments' => array('administer term fields'),
'type' => MENU_LOCAL_TASK,
'file' => 'term_fields.admin.inc'
);
$items['admin/content/taxonomy/term_fields/settings'] = array(
- 'title' => t('Settings'),
+ 'title' => 'Settings',
'page callback' => 'drupal_get_form',
'page arguments' => array('term_fields_admin_settings'),
- 'description' => t('Form used to change settings.'),
+ 'description' => 'Form used to change field settings.',
'access arguments' => array('administer term fields'),
'type' => MENU_LOCAL_TASK,
'file' => 'term_fields.admin.inc'
);
$items['admin/content/taxonomy/term_fields/edit/%fid'] = array(
- 'title' => t('Edit Field'),
+ 'title' => 'Edit field',
'page callback' => 'drupal_get_form',
'page arguments' => array('term_fields_admin_edit', 5),
- 'description' => t('Form used to edit term fields.'),
+ 'description' => 'Form used to edit term fields.',
'access arguments' => array('administer term fields'),
'type' => MENU_CALLBACK,
'file' => 'term_fields.admin.inc'
);
$items['admin/content/taxonomy/term_fields/delete/%fid'] = array(
- 'title' => t('Delete Field'),
+ 'title' => 'Delete field',
'page callback' => 'drupal_get_form',
'page arguments' => array('term_fields_admin_delete', 5),
- 'description' => t('Form used to delete term fields.'),
+ 'description' => 'Form used to delete term fields.',
'access arguments' => array('administer term fields'),
'type' => MENU_CALLBACK,
'file' => 'term_fields.admin.inc'
@@ -68,7 +68,7 @@
if (isset($_POST['op']) && $_POST['op'] == 'Delete') {
return;
}
-
+
if ($form_id == 'taxonomy_form_term') {
// shortcuts
$tid = $form['tid']['#value'];
@@ -77,12 +77,12 @@
// make the initial fieldset
$form['fields'] = array(
'#type' => 'fieldset',
- '#title' => 'Term Fields',
+ '#title' => 'Term fields',
'#collapsed' => TRUE,
'#collapsible' => TRUE,
'#weight' => 1
);
-
+
// get all fields for this vocabulary
$sql = 'SELECT * FROM {term_fields} WHERE vid = %d ORDER BY weight';
$result = db_query($sql, $vid);
@@ -98,7 +98,7 @@
foreach ($fields as $fid => $attribute) {
$sql = 'SELECT %s FROM {term_fields_term} WHERE tid = %d';
$value = db_result(db_query($sql, $fid, $tid));
-
+
// some values are going to be conditional based on the data type
switch ($attribute['type']) {
case 'textfield':
@@ -107,7 +107,7 @@
'#size' => 30,
'#max_length' => 100,
'#default_value' => $value ? $value : NULL,
- '#description' => $attribute['description']
+ '#description' => $attribute['description'],
);
break;
case 'textarea':
@@ -116,7 +116,7 @@
'#rows' => 5,
'#cols' => 60,
'#default_value' => $value ? $value : NULL,
- '#description' => $attribute['description']
+ '#description' => $attribute['description'],
);
break;
case 'numeric':
@@ -124,7 +124,7 @@
'#type' => 'textfield',
'#size' => 2,
'#default_value' => isset($value) ? $value : NULL,
- '#description' => $attribute['description']
+ '#description' => $attribute['description'],
);
break;
case 'select':
@@ -134,7 +134,7 @@
'#type' => 'select',
'#options' => $options,
'#default_value' => $value || $value == 0 ? $value : NULL,
- '#description' => $attribute['description']
+ '#description' => $attribute['description'],
);
break;
case 'date':
@@ -143,32 +143,32 @@
'#type' => $attribute['type'],
'#default_value' => $default_value ? $default_value : NULL,
'#element_validate' => array('term_fields_date_validate'),
- '#description' => $attribute['description']
+ '#description' => $attribute['description'],
);
case 'file':
$form['fields'][$fid] = array(
- '#type' => 'file'
+ '#type' => 'file',
);
$current_file_fid = db_result(db_query("SELECT %s FROM {term_fields_term} WHERE tid = %d", $fid, $tid));
if ($current_file_fid) {
$form['fields'][$fid . '_delete'] = array(
'#type' => 'checkbox',
- '#title' => t('Delete')
+ '#title' => t('Delete'),
);
}
$form['#attributes']['enctype'] = 'multipart/form-data';
break;
}
// these fields will always be the same
- $form['fields'][$fid]['#title'] = $attribute['title'] . ' (' . $fid . ')';
- $form['fields'][$fid]['#description'] = $attribute['description'];
-
+ $form['fields'][$fid]['#title'] = t('@title (@fid)', array('@title' => $attribute['title'], '@fid' => $fid));
+ $form['fields'][$fid]['#description'] = check_plain($attribute['description']);
+
// file fields are strange
if ($value && $attribute['type'] == 'file') {
$file = db_fetch_object(db_query("SELECT * FROM {files} WHERE fid = %d", $value));
- $form['fields'][$fid]['#description'] .= '
' . t('Current file') . ': ' . l($file->filename, $file->filepath);
+ $form['fields'][$fid]['#description'] .= '
' . t('Current file: @filename.', array('@filename' => $file->filename, '@filepath' => $file->filepath));
}
-
+
// we're going to make some alterations to any date fields that exist
$form['#after_build'] = array('term_fields_alter_date');
}
@@ -176,7 +176,7 @@
else {
$form['fields']['empty'] = array(
'#type' => 'item',
- '#value' => t('There are no fields defined for the vocabulary that this term is a part of.')
+ '#value' => t('There are no fields defined for the vocabulary that this term is a part of.'),
);
}
$form['submit']['#weight'] = 10;
@@ -191,7 +191,7 @@
// shortcuts
$tid = $form_values['tid'];
$vid = $form_values['vid'];
-
+
switch($type) {
case 'term':
// get all fields used by this vocabulary
@@ -204,7 +204,7 @@
return;
}
}
-
+
if (!empty($fields)) {
// map field values
$values = array();
@@ -223,7 +223,7 @@
db_query("DELETE FROM {files} WHERE fid = %d", $current_file_fid);
// remove from file system
file_delete($current_file->filepath);
-
+
$values[$field->fid] = 0;
} else {
$options = unserialize($field->options);
@@ -255,26 +255,26 @@
break;
}
}
-
+
// some simple clean up and validation
foreach ($values as $fid => $value) {
$type = $fields[$fid]->type;
switch ($type) {
case 'numeric':
if (!is_numeric($value) && $value != '') {
- drupal_set_message(t('!fid must be numeric. This field was not set.', array('!fid' => $fid)), 'error');
+ drupal_set_message(t('%fid must be numeric. This field was not set.', array('%fid' => $fid)), 'error');
unset($values[$fid]);
}
break;
}
}
-
+
// if there's no values to set then we need to get out of here
// the exception being if the term is being deleted
if ($op != 'delete' && count($values) == 0) {
break;
}
-
+
switch ($op) {
case 'insert':
term_fields_term_create_record($tid, $values);
@@ -328,7 +328,7 @@
$field_list = implode(',', $fids);
$sql = 'SELECT ' . $field_list . ' FROM {term_fields_term} WHERE tid = %d';
$result = db_query($sql, $term->tid);
-
+
return db_fetch_array($result);
}
@@ -339,7 +339,7 @@
$term = taxonomy_get_term($tid);
$fields = term_fields_get_fields($term);
$term->fields = $fields;
-
+
return $term;
}
@@ -368,7 +368,7 @@
while ($data = db_fetch_object($result)) {
$fields[] = $data->fid;
}
-
+
return $fields;
}
@@ -408,17 +408,17 @@
// create a comma separted list of fields to be used in the query
$fields = array_keys($values);
$field_list = implode(', ', $fields);
-
+
// create a list of place holders so db_query() can do it's thing
$placeholders = '';
foreach ($values as $value) {
$placeholders = $placeholders . (is_numeric($value) ? "%d, " : "'%s', ");
}
$placeholders = rtrim($placeholders, ', ');
-
+
// put the term id at the beginning of the array
array_unshift($values, $tid);
-
+
// go go go
$sql = 'INSERT INTO {term_fields_term} (tid, ' . $field_list . ') VALUES (%d, ' . $placeholders . ')';
db_query($sql, $values);
@@ -428,17 +428,17 @@
* Update an existing record in the term_fields_term table.
*/
function term_fields_term_update_record($tid, $values) {
-
+
// create a list of fields and their respective placeholders for db_query()
$placeholders = '';
foreach ($values as $fid => $value) {
$placeholders = $placeholders . $fid . ' = ' . (is_numeric($value) ? "%d, " : "'%s', ");
}
$placeholders = rtrim($placeholders, ', ');
-
+
// add the tid on to the end of the array
array_push($values, $tid);
-
+
// construct and execute
$sql = 'UPDATE {term_fields_term} SET ' . $placeholders . ' WHERE tid = %d';
db_query($sql, $values);
@@ -461,7 +461,7 @@
$form['fields'][$did]['year']['#options'] = $blank + $form['fields'][$did]['year']['#options'];
$form['fields'][$did]['month']['#options'] = $blank + $form['fields'][$did]['month']['#options'];
$form['fields'][$did]['day']['#options'] = $blank + $form['fields'][$did]['day']['#options'];
-
+
// give titles to each list
$form['fields'][$did]['year']['#title'] = t('Year');
$form['fields'][$did]['month']['#title'] = t('Month');
@@ -478,12 +478,12 @@
$year = $element['year']['#value'];
$month = $element['month']['#value'];
$day = $element['day']['#value'];
-
+
// we allow the user to unset date fields by leaving all fields (day, month AND year) blank
// they can only have either all 3 of them set, or all 3 of them unset
if (empty($year) || empty($month) || empty($day)) {
if (!(empty($year) && empty($month) && empty($day))) {
- form_set_error($element['#name'], t("A value must be specified for month, day and year. If you want to make this field blank, unset all three fields."));
+ form_set_error($element['#name'], t('A value must be specified for month, day and year. If you want to make this field blank, unset all three fields.'));
}
}
}
@@ -498,7 +498,7 @@
return $fid;
}
}
-
+
return FALSE;
}
@@ -530,12 +530,12 @@
function term_fields_fetch_fields($result) {
$rows = array();
while ($data = db_fetch_object($result)) {
- $rows[$data->fid]['title'] = $data->title . ' (' . $data->fid . ')';
- $rows[$data->fid]['vocab'] = $data->name;
- $rows[$data->fid]['desc'] = $data->description;
+ $rows[$data->fid]['title'] = t('@title (@fid)', array('@title' => $data->title, '@fid' => $data->fid));
+ $rows[$data->fid]['vocab'] = check_plain($data->name);
+ $rows[$data->fid]['desc'] = check_plain($data->description);
$rows[$data->fid]['edit'] = l(t('Edit'), 'admin/content/taxonomy/term_fields/edit/' . $data->fid);
}
-
+
return !empty($rows) ? $rows : 0;
}
Index: term_fields.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/term_fields/term_fields.admin.inc,v
retrieving revision 1.4.2.1
diff -u -r1.4.2.1 term_fields.admin.inc
--- term_fields.admin.inc 14 Oct 2009 09:18:20 -0000 1.4.2.1
+++ term_fields.admin.inc 30 Oct 2009 23:31:24 -0000
@@ -12,7 +12,7 @@
foreach ($vocabs as $vid => $vocab) {
$vocabularies[$vid] = $vocab->name;
}
-
+
$result = pager_query('SELECT tf.fid AS fid, tf.title AS title, tf.description AS description, v.name AS name
FROM {term_fields} tf
LEFT JOIN {vocabulary} v ON tf.vid = v.vid
@@ -38,66 +38,63 @@
foreach ($vocabs as $key => $value) {
$vocabs_select[$key] = $value->name;
}
-
+
$form['vid'] = array(
'#type' => 'select',
'#title' => t('Vocabulary'),
'#options' => $vocabs_select,
- '#description' => t('Choose a vocabulary to assign this field to. Only terms in this vocabulary will
- be able to use this field. Cannot be changed later.')
+ '#description' => t('Choose a vocabulary to assign this field to. Only terms in this vocabulary will be able to use this field. Cannot be changed later.'),
);
$form['fid'] = array(
'#type' => 'textfield',
'#title' => t('Field ID'),
- '#description' => t('An ID used by Drupal to identify this field. It must be unique. Only alphanumeric characters and underscores allowed. Cannot be changed later.'),
+ '#description' => t('The machine-readable name of the field. This name must contain only lowercase letters, numbers, and underscores. This name cannot be changed.'),
'#required' => TRUE,
- '#maxlength' => 32
+ '#maxlength' => 32,
);
$form['title'] = array(
'#type' => 'textfield',
'#title' => t('Title'),
- '#description' => t('The readable name of this field. Can be changed later.'),
+ '#description' => t('A human-readable name to be used as the label for this field.'),
'#required' => TRUE,
'#element_validate' => array('title_validate'),
- '#maxlength' => 50
+ '#maxlength' => 50,
);
$form['description'] = array(
'#type' => 'textfield',
'#title' => t('Description'),
- '#description' => t('Enter a short description of this field to explain what the field is used for. Can be changed later.'),
- '#maxlength' => 100
+ '#description' => t('Enter a short description of this field to explain what the field is used for.'),
+ '#maxlength' => 100,
);
$form['type'] = array(
'#type' => 'radios',
'#title' => t('Type'),
'#options' => array(
- 'textfield' => t('Single row textbox'),
- 'textarea' => t('Multi-row textarea'),
- 'numeric' => t('Numeric'),
- 'select' => t('Select box'),
- 'date' => t('Date'),
- 'file' => t('File')
+ 'date' => t('Date'),
+ 'file' => t('File'),
+ 'numeric' => t('Integer'),
+ 'select' => t('Select list'),
+ 'textarea' => t('Text area (multiple rows)'),
+ 'textfield' => t('Text field'),
),
- '#description' => t('Define what type of field to use. Single line textboxes should
- be used for fields such as names and dates, while multi line textareas
- should be used for longer fields, such as biographies. Cannot be changed later.'),
+ '#description' => t('Define what type of field to use. Single line textboxes should be used for fields such as names and dates, while multi line textareas should be used for longer fields, such as biographies. Cannot be changed later.'),
'#required' => TRUE
);
$form['weight'] = array(
'#type' => 'weight',
'#title' => t('Weight'),
'#default_value' => 0,
- '#description' => t('Heaveier weighted items get put at the bottom of lists. Can be changed later.')
+ '#description' => t('Heavier weighted items get put at the bottom of lists.')
);
$form['fields']['submit'] = array(
'#type' => 'submit',
- '#value' => t('Submit'),
+ '#value' => t('Save'),
);
}
else {
$form['empty'] = array(
'#type' => 'item',
- '#value' => t('You have to !add before you can add fields.', array('!add' => l('add a vocabulary', 'admin/content/taxonomy/add/vocabulary')))
+ '#value' => t('You have to add a vocabulary before you can add fields.', array('@add-vocabulary' => url('admin/content/taxonomy/add/vocabulary'))),
);
}
return $form;
@@ -109,7 +106,7 @@
function term_fields_admin_new_validate($form, &$form_state) {
$values = $form_state['values'];
if (! preg_match('~^[a-z]([_\w]*[a-z0-9]$|$)~', $values['fid'])) {
- form_set_error('fid', t('The Field ID must only only contain alphanumeric characters and underscores. It should also begin by an alphabetic character and cannot finish by an underscore.'));
+ form_set_error('fid', t('The field ID must contain only lowercase letters, numbers, and underscores. It should also begin by an alphabetic character and cannot finish by an underscore.'));
}
$bad_fids = array('name', 'description', 'numeric');
$fids = term_fields_get_fids();
@@ -117,7 +114,7 @@
$bad_fids = $bad_fids + $fids;
}
if (in_array(strtolower($values['fid']), $bad_fids)) {
- form_set_error('fid', t('The field ID !fid cannot be used. It is either already being used by another field, or is a reserved internal name.', array('!fid' => '' . $values['fid'] . '')));
+ form_set_error('fid', t('The field ID %fid cannot be used. It is either already being used by another field, or is a reserved internal name.', array('%fid' => $values['fid'])));
}
}
@@ -126,9 +123,9 @@
*/
function term_fields_admin_new_submit($form, &$form_state) {
$values = $form_state['values'];
-
+
$values['fid'] = strtolower($values['fid']);
-
+
// determine which data type to use for the new column
switch ($values['type']) {
case 'textfield':
@@ -143,10 +140,10 @@
case 'date':
$data_type = 'DATETIME';
}
-
+
// success
- drupal_set_message(t($values['title'] . ' (' . $values['fid'] . ') was successfully created.'));
-
+ drupal_set_message(t('The field %title (%fid) has been created.', array('%title' => $values['title'], '%fid' => $values['fid'])));
+
// make a new record in the term_fields table
// select type fields need a default value for the options column
if ($values['type'] != 'select') {
@@ -162,7 +159,7 @@
drupal_set_message(t('You should now specify some options for your select field.'));
$form_state['redirect'] = 'admin/content/taxonomy/term_fields/edit/' . $values['fid'];
}
-
+
// add the new column
$sql = "ALTER TABLE {term_fields_term} ADD %s %s";
db_query($sql, $values['fid'], $data_type);
@@ -179,35 +176,35 @@
'M j Y', 'j M Y', 'Y M j',
'M j Y', 'j M Y', 'Y M j'
);
-
+
$options = array();
foreach ($formats as $format) {
$options[$format] = format_date(time(), 'custom', $format);
}
$form['date_format'] = array(
'#type' => 'select',
- '#title' => t('Date Field Format'),
+ '#title' => t('Date field format'),
'#description' => t('The format to be used when displaying date fields.'),
'#default_value' => variable_get('term_fields_date_format', ''),
'#options' => $options
);
$form['custom'] = array(
'#type' => 'textfield',
- '#title' => t('Custom Date Format'),
+ '#title' => t('Custom date format'),
'#default_value' => variable_get('term_fields_date_format_custom', ''),
- '#description' => t('A user-defined date format. If set, it will be used instead of what is set in the Date Field Format field. Leave blank to disable. See the PHP manual for available options.', array('@url' => 'http://php.net/manual/function.date.php')),
+ '#description' => t('A user-defined date format. If set, it will be used instead of what is set in the Date field format field. Leave blank to disable. See the PHP manual for available options.', array('@url' => 'http://php.net/manual/function.date.php')),
'#size' => 5
);
$form['per_page'] = array(
'#type' => 'textfield',
- '#title' => t('Fields Per Page'),
- '#description' => t('How many fields to show per page on the fields administration page.'),
+ '#title' => t('Fields per page'),
+ '#description' => t('Number of fields to show per page on the fields administration page.'),
'#default_value' => variable_get('term_fields_per_page', 15),
'#size' => 3
);
$form['submit'] = array(
'#type' => 'submit',
- '#value' => t('Submit')
+ '#value' => t('Save')
);
return $form;
}
@@ -223,7 +220,7 @@
variable_set('term_fields_per_page', $values['per_page']);
}
else {
- form_set_error('per_page', t('The Fields Per Page value must be numeric.'));
+ form_set_error('per_page', t('The Fields per page value must be numeric.'));
}
}
@@ -242,58 +239,62 @@
'#description' => t('You can change the title of this field here.'),
'#required' => TRUE,
'#size' => 25,
- '#maxlength' => 50
+ '#maxlength' => 50,
);
$form['description'] = array(
'#type' => 'textfield',
'#title' => t('Description'),
'#default_value' => $field->description,
- '#description' => t('You can change the description of this field here.')
+ '#description' => t('You can change the description of this field here.'),
);
if ($field->type == 'select') {
$form['options'] = array(
'#type' => 'textarea',
- '#title' => t('Options (one per line)'),
- '#description' => t('This field is a select box, so you have to set the options for it here. One option per line.'),
- '#default_value' => $field->options ? implode("\n", unserialize($field->options)) : ''
+ '#title' => t('Allowed values list'),
+ '#description' => t('The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (text). The label is optional, and the key will be used as the label if no label is specified.'),
+ '#default_value' => $field->options ? implode("\n", unserialize($field->options)) : '',
);
}
elseif ($field->type == 'file') {
$options = unserialize($field->options);
- $form['file_max_size'] = array(
- '#type' => 'textfield',
- '#title' => t('Maximum file size'),
- '#description' => t('Maximum size of the file in megabytes. Default is 1 MB.'),
- '#default_value' => isset($options['file_max_size']) ? $options['file_max_size'] : 1,
- '#size' => 1,
- '#required' => TRUE
- );
$form['file_allowed_exts'] = array(
'#type' => 'textfield',
- '#title' => t('Allowed extensions'),
- '#description' => t('Specify the allowed file extensions for this field. Separate extensions by spaces, do not include leading dot.'),
+ '#title' => t('Permitted file extensions'),
+ '#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.'),
'#default_value' => isset($options['file_allowed_exts']) ? implode(' ', $options['file_allowed_exts']) : 'txt',
'#size' => 60,
- '#required' => TRUE
+ '#required' => TRUE,
);
+ $form['file_max_size'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Maximum file size per upload'),
+ '#description' => t('The maximum size of a file a user can upload.'),
+ '#default_value' => isset($options['file_max_size']) ? $options['file_max_size'] : 1,
+ '#size' => 1,
+ '#required' => TRUE,
+ '#field_suffix' => t('MB'),
+ );
+ $form['upload_max_size'] = array(
+ '#value' => ''. t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) . '
',
+ );
}
$form['weight'] = array(
'#type' => 'weight',
'#title' => t('Weight'),
'#default_value' => $field->weight,
- '#description' => t('Fields weighted heavier appear at the bottom of lists.')
+ '#description' => t('Fields weighted heavier appear at the bottom of lists.'),
);
$form['fid'] = array(
'#type' => 'hidden',
- '#value' => $fid
+ '#value' => $fid,
);
$form['submit'] = array(
'#type' => 'submit',
- '#value' => t('Submit')
+ '#value' => t('Save'),
);
$form['delete'] = array(
'#type' => 'submit',
- '#value' => t('Delete')
+ '#value' => t('Delete'),
);
drupal_set_title(drupal_get_title() . ' ' . $fid);
@@ -334,8 +335,8 @@
db_query($sql, $values['title'], $values['description'], $values['weight'], $values['fid']);
break;
}
-
- drupal_set_message(t('Field ' . $values['fid'] . ' was successfully updated.'));
+
+ drupal_set_message(t('The field %fid has been updated.', array('%fid' => $values['fid'])));
$form_state['redirect'] = 'admin/content/taxonomy/term_fields';
}
}
@@ -347,11 +348,11 @@
$form = array();
$form['fid'] = array(
'#type' => 'hidden',
- '#value' => $fid
+ '#value' => $fid,
);
- $question = t('Are you sure you want to delete !fid?', array('!fid' => $fid));
+ $question = t('Are you sure you want to delete %fid?', array('%fid' => $fid));
$path = 'admin/content/taxonomy/term_fields';
- $description = t('All instances of this field will be deleted. This action cannot be undone.');
+ $description = t('If you have any content left in this field, it will be lost. This action cannot be undone.');
return confirm_form($form, $question, $path, $description);
}
@@ -360,15 +361,15 @@
*/
function term_fields_admin_delete_submit($form, &$form_state) {
$fid = $form_state['values']['fid'];
-
+
// remove the record from term_fields
$sql = "DELETE FROM {term_fields} WHERE fid = '%s'";
db_query($sql, $fid);
-
+
// remove the column from term_fields_term
$sql = "ALTER TABLE {term_fields_term} DROP %s";
db_query($sql, $fid);
-
- drupal_set_message(t('Field ' . $fid . ' was deleted.'));
+
+ drupal_set_message(t('The field %fid has been deleted.', array('%fid' => $fid)));
$form_state['redirect'] = 'admin/content/taxonomy/term_fields';
}
\ No newline at end of file
Index: views/term_fields.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/term_fields/views/term_fields.views.inc,v
retrieving revision 1.4
diff -u -r1.4 term_fields.views.inc
--- views/term_fields.views.inc 11 Jun 2009 06:10:27 -0000 1.4
+++ views/term_fields.views.inc 30 Oct 2009 23:31:25 -0000
@@ -8,7 +8,7 @@
if (!empty($fields)) {
$data = array();
$data['term_fields_term']['table']['group'] = t('Term Fields');
-
+
$data['term_fields_term']['table']['join']['term_data'] = array(
'left_field' => 'tid',
'field' => 'tid'
@@ -99,12 +99,12 @@
)
);
}
-
+
// all fields get this
- $data['term_fields_term'][$fid]['title'] = $record->title . ' (' . $fid . ')';
- $data['term_fields_term'][$fid]['help'] = t('The value of !fid for this particular term.', array('!fid' => $fid));
+ $data['term_fields_term'][$fid]['title'] = t('@title (@fid)', array('@title' => $record->title, '@fid' => $fid));
+ $data['term_fields_term'][$fid]['help'] = t('The value of %fid for this particular term.', array('%fid' => $fid));
}
-
+
return $data;
}
}