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.module | |
| 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.module')
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 6cc346368..200f39525 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -234,30 +234,29 @@ function taxonomy_menu() { ); $items['admin/structure/taxonomy/%taxonomy_vocabulary'] = array( - 'title' => 'Vocabulary', // this is replaced by callback - 'page callback' => 'drupal_get_form', - 'page arguments' => array('taxonomy_form_vocabulary', 3), 'title callback' => 'taxonomy_admin_vocabulary_title_callback', 'title arguments' => array(3), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('taxonomy_overview_terms', 3), 'access arguments' => array('administer taxonomy'), - 'type' => MENU_CALLBACK, 'file' => 'taxonomy.admin.inc', ); - $items['admin/structure/taxonomy/%taxonomy_vocabulary/edit'] = array( - 'title' => 'Edit vocabulary', + $items['admin/structure/taxonomy/%taxonomy_vocabulary/list'] = array( + 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -20, ); - $items['admin/structure/taxonomy/%taxonomy_vocabulary/list'] = array( - 'title' => 'List terms', + $items['admin/structure/taxonomy/%taxonomy_vocabulary/edit'] = array( + 'title' => 'Edit', 'page callback' => 'drupal_get_form', - 'page arguments' => array('taxonomy_overview_terms', 3), + 'page arguments' => array('taxonomy_form_vocabulary', 3), 'access arguments' => array('administer taxonomy'), 'type' => MENU_LOCAL_TASK, 'weight' => -10, 'file' => 'taxonomy.admin.inc', ); - $items['admin/structure/taxonomy/%taxonomy_vocabulary/list/add'] = array( + + $items['admin/structure/taxonomy/%taxonomy_vocabulary/add'] = array( 'title' => 'Add term', 'page callback' => 'drupal_get_form', 'page arguments' => array('taxonomy_form_term', array(), 3), @@ -888,7 +887,7 @@ function taxonomy_help($path, $arg) { case 'admin/structure/taxonomy': $output = '<p>' . t('Configure the vocabularies and terms for your site.') . '</p>'; return $output; - case 'admin/structure/taxonomy/%/list': + case 'admin/structure/taxonomy/%': $vocabulary = taxonomy_vocabulary_load($arg[3]); switch ($vocabulary->hierarchy) { case 0: |