diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-11-08 11:19:02 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-11-08 11:19:02 +0000 |
| commit | 2bc18b615540ca4ba41cf79a27fd900835bea989 (patch) | |
| tree | a4f546d1ce61e61bf597e914293583277f509a45 /modules/taxonomy/taxonomy.admin.inc | |
| parent | 953463666885d78c4ab97f857c5a0ee63725515f (diff) | |
| download | brdo-2bc18b615540ca4ba41cf79a27fd900835bea989.tar.gz brdo-2bc18b615540ca4ba41cf79a27fd900835bea989.tar.bz2 | |
#553326 by sun: Provide consistency to the way field UI is presented for taxonomy.
Diffstat (limited to 'modules/taxonomy/taxonomy.admin.inc')
| -rw-r--r-- | modules/taxonomy/taxonomy.admin.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc index cf5ece294..bccb1a8d0 100644 --- a/modules/taxonomy/taxonomy.admin.inc +++ b/modules/taxonomy/taxonomy.admin.inc @@ -20,9 +20,9 @@ function taxonomy_overview_vocabularies($form) { $form[$vocabulary->vid]['#vocabulary'] = $vocabulary; $form[$vocabulary->vid]['name'] = array('#markup' => check_plain($vocabulary->name)); $form[$vocabulary->vid]['weight'] = array('#type' => 'weight', '#delta' => 10, '#default_value' => $vocabulary->weight); - $form[$vocabulary->vid]['edit'] = array('#type' => 'link', '#title' => t('edit vocabulary'), '#href' => "admin/structure/taxonomy/$vocabulary->vid"); - $form[$vocabulary->vid]['list'] = array('#type' => 'link', '#title' => t('list terms'), '#href' => "admin/structure/taxonomy/$vocabulary->vid/list"); - $form[$vocabulary->vid]['add'] = array('#type' => 'link', '#title' => t('add terms'), '#href' => "admin/structure/taxonomy/$vocabulary->vid/list/add"); + $form[$vocabulary->vid]['edit'] = array('#type' => 'link', '#title' => t('edit vocabulary'), '#href' => "admin/structure/taxonomy/$vocabulary->vid/edit"); + $form[$vocabulary->vid]['list'] = array('#type' => 'link', '#title' => t('list terms'), '#href' => "admin/structure/taxonomy/$vocabulary->vid"); + $form[$vocabulary->vid]['add'] = array('#type' => 'link', '#title' => t('add terms'), '#href' => "admin/structure/taxonomy/$vocabulary->vid/add"); } // Only make this form include a submit button and weight if more than one @@ -212,17 +212,17 @@ function taxonomy_form_vocabulary_submit($form, &$form_state) { switch (taxonomy_vocabulary_save($vocabulary)) { case SAVED_NEW: drupal_set_message(t('Created new vocabulary %name.', array('%name' => $vocabulary->name))); - watchdog('taxonomy', 'Created new vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->vid)); + watchdog('taxonomy', 'Created new vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->vid . '/edit')); break; + case SAVED_UPDATED: drupal_set_message(t('Updated vocabulary %name.', array('%name' => $vocabulary->name))); - watchdog('taxonomy', 'Updated vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->vid)); + watchdog('taxonomy', 'Updated vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->vid . '/edit')); break; } $form_state['vid'] = $vocabulary->vid; $form_state['redirect'] = 'admin/structure/taxonomy'; - return; } /** @@ -380,7 +380,7 @@ function taxonomy_overview_terms($form, &$form_state, $vocabulary) { $form['#page_entries'] = $page_entries; $form['#back_peddle'] = $back_peddle; $form['#forward_peddle'] = $forward_peddle; - $form['#empty_text'] = t('No terms available. <a href="@link">Add term</a>.', array('@link' => url('admin/structure/taxonomy/' . $vocabulary->vid . '/list/add'))); + $form['#empty_text'] = t('No terms available. <a href="@link">Add term</a>.', array('@link' => url('admin/structure/taxonomy/' . $vocabulary->vid . '/add'))); if ($vocabulary->hierarchy < 2 && count($tree) > 1) { $form['submit'] = array( |