diff -urNp /home/lordrich/york/drupal-current/modules/taxonomy_block/taxonomy_block.info drupal-5.0-rc1/modules/taxonomy_block/taxonomy_block.info --- /home/lordrich/york/drupal-current/modules/taxonomy_block/taxonomy_block.info 1970-01-01 01:00:00.000000000 +0100 +++ drupal-5.0-rc1/modules/taxonomy_block/taxonomy_block.info 2006-12-18 19:31:58.000000000 +0000 @@ -0,0 +1,3 @@ +; $Id$ +name = Taxonomy Block +description = This is a simple module to create blocks based on taxonomy. It displays listings of recently posted nodes based on taxonomy definitions. You can create as many blocks as you like. diff -urNp /home/lordrich/york/drupal-current/modules/taxonomy_block/taxonomy_block.module drupal-5.0-rc1/modules/taxonomy_block/taxonomy_block.module --- /home/lordrich/york/drupal-current/modules/taxonomy_block/taxonomy_block.module 2006-06-16 13:16:43.000000000 +0100 +++ drupal-5.0-rc1/modules/taxonomy_block/taxonomy_block.module 2006-12-18 19:31:58.000000000 +0000 @@ -26,8 +26,8 @@ function taxonomy_block_menu($may_cache) $items = array(); if ($may_cache) { - $items[] = array('path' => 'admin/block/taxonomy_block', 'title' => t('taxonomy block'), 'callback' => 'taxonomy_block_admin', 'access' => user_access('administer taxonomy blocks')); - $items[] = array('path' => 'admin/block/taxonomy_block/edit', 'title' => t('edit taxonomy block'), 'callback' => 'taxonomy_block_form', 'access' => user_access('administer taxonomy blocks'), 'type' => MENU_CALLBACK); + $items[] = array('path' => 'admin/build/block/taxonomy_block', 'title' => t('Taxonomy Block'), 'callback' => 'taxonomy_block_admin', 'access' => user_access('Administer Taxonomy Blocks')); + $items[] = array('path' => 'admin/build/block/taxonomy_block/edit', 'title' => t('Edit Taxonomy Block'), 'callback' => 'taxonomy_block_form', 'access' => user_access('Administer Taxonomy Blocks'), 'type' => MENU_CALLBACK); } return $items; @@ -57,7 +57,7 @@ function taxonomy_block_admin($op = NULL '#type' => 'hidden', '#value' => $bid, ); - $output = confirm_form('taxonomy_block_delete_form', $form, t('Are you sure you want to delete the taxonomy block?'), 'admin/block/taxonomy_block'); + $output = confirm_form('taxonomy_block_delete_form', $form, t('Are you sure you want to delete the taxonomy block?'), 'admin/build/block/taxonomy_block'); break; default: $output = taxonomy_block_blocks(); @@ -193,13 +193,13 @@ function taxonomy_block_form_submit($for elseif($op == t('Edit Block')) { taxonomy_block_update($edit); } - drupal_goto('admin/block/taxonomy_block'); + drupal_goto('admin/build/block/taxonomy_block'); } function taxonomy_block_delete_form_submit($form_id, $edit) { taxonomy_block_delete($edit['bid']); drupal_set_message(t('The block has been deleted.')); - drupal_goto('admin/block/taxonomy_block'); + drupal_goto('admin/build/block/taxonomy_block'); } /** @@ -209,8 +209,8 @@ function taxonomy_block_blocks() { $result = db_query('SELECT * FROM {taxonomy_block}'); while ($block = db_fetch_object($result)) { $links = array(); - $links[] = l(t('edit'), 'admin/block/taxonomy_block/edit/'. $block->bid, array('title'=>t('edit block')));; - $links[] = l(t('delete'), 'admin/block/taxonomy_block/delete/'. $block->bid, array('title'=>t('delete block')));; + $links[] = l(t('edit'), 'admin/build/block/taxonomy_block/edit/'. $block->bid, array('title'=>t('edit block')));; + $links[] = l(t('delete'), 'admin/build/block/taxonomy_block/delete/'. $block->bid, array('title'=>t('delete block')));; $blocks[] = $block->description .' - '. theme('links', $links); }