Index: mapi/mapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mapi/mapi.module,v
retrieving revision 1.4
diff -u -r1.4 mapi.module
--- mapi/mapi.module	4 Mar 2008 14:56:38 -0000	1.4
+++ mapi/mapi.module	4 Mar 2008 16:47:05 -0000
@@ -1,6 +1,8 @@
 <?php
 // $Id: mapi.module,v 1.4 2008/03/04 14:56:38 rhys Exp $
 
+define('MAPI_PATH', 'admin/media');
+
 $path = drupal_get_path('module', 'mapi') .'/includes';
 require_once($path .'/core.inc');
 require_once($path .'/file.inc');
@@ -35,19 +37,21 @@
   if ($may_cache) {
     // base for settings for media-related modules.
     $items[] = array(
-      'path' => 'admin/settings/media',
-      'title' => t('Media Settings'),
+      'path' => MAPI_PATH,
+      'title' => t('Media management'),
+      'description' => t("Manage your site's media."),
+      'position' => 'left',
+      'weight' => -9,
       'callback' => 'drupal_get_form',
       'callback arguments' => array("media_admin_form"),
-      'type' => MENU_NORMAL_ITEM,
-      'access' => user_access('administer media')
+      'access' => user_access('administer media'),
     );
     
     // admininstration menus
-    $items = array_merge($items, _media_add_menu_items(media_invoke_admin('menu'), 'admin/settings/media', user_access('administer media')));
+    $items = array_merge($items, _media_add_menu_items(media_invoke_admin('menu'), MAPI_PATH, user_access('administer media')));
   }
   else {
-    $items = _media_add_menu_items(media_invoke_admin('menu', true), 'admin/settings/media', user_access('administer media'));
+    $items = _media_add_menu_items(media_invoke_admin('menu', true), MAPI_PATH, user_access('administer media'));
   }
   
   return $items;
@@ -205,6 +209,7 @@
       $items[] = array(
         'path' => "{$path}/{$key}",
         'title' => ($title ? $title : drupal_ucfirst(t($parts[0]))),
+        'description' => $desc,
         'callback' => 'drupal_get_form',
         'callback arguments' => array($func),
         'type' => $type,
Index: mapi/includes/admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mapi/includes/admin.inc,v
retrieving revision 1.5
diff -u -r1.5 admin.inc
--- mapi/includes/admin.inc	4 Mar 2008 14:56:38 -0000	1.5
+++ mapi/includes/admin.inc	4 Mar 2008 16:47:06 -0000
@@ -20,7 +20,7 @@
 
     $title = ($title ? $title : drupal_ucfirst(t($key)));
 
-    $rows[] = array(l($title, 'admin/settings/media/'. $key), $desc);
+    $rows[] = array(l($title, MAPI_PATH .'/'. $key), $desc);
   }
 
   $headers = array(t('Section'), t('Description'));
@@ -133,7 +133,7 @@
     
     $form['footer'] = array(
       '#prefix' => '<div>',
-      '#value' => l(t('presenters'), 'admin/settings/media/presenters') .' | '. l(t('extensions'), 'admin/settings/media/extensions'),
+      '#value' => l(t('presenters'), MAPI_PATH .'/presenters') .' | '. l(t('extensions'), MAPI_PATH .'/extensions'),
       '#suffix' => '</div><p />',
     );
       
@@ -147,7 +147,7 @@
     // Theme the presenters in a way that allows it to handle multiple levels
     foreach ($exts as $ext) {
       // now setup the form entities
-      $form['ext'][$ext]['name'] = array('#value' => l($ext, 'admin/settings/media/extensions/'. $ext));
+      $form['ext'][$ext]['name'] = array('#value' => l($ext, MAPI_PATH .'/extensions/'. $ext));
       
       // default presenter
       $form['ext'][$ext]["media_ext_{$ext}_presenter"] = array('#value' => media_presenter_default($ext));
@@ -182,7 +182,7 @@
   foreach ($types as $type) {
     $rows[] = array(
       array('data' => t($type)),
-      array('data' => l(t('View Details'), 'admin/settings/media/types/'. $type))
+      array('data' => l(t('View Details'), MAPI_PATH .'/types/'. $type))
     );
   }
   $form['types'] = array('#value' => theme('table', array(t('Types'), ''), $rows));
@@ -245,7 +245,7 @@
     $rows = array();
     if (count($programs) > 0) {
       foreach (array_keys($programs) as $name) {
-        $rows[] = array(l($name, 'admin/settings/media/programs/'. $name));
+        $rows[] = array(l($name, MAPI_PATH .'/programs/'. $name));
       }
     }
     // no programs specified
@@ -291,7 +291,7 @@
     $pos = count($rows);
 
     foreach (array_keys($exts) as $ext) {
-      $form['presenter'][$presenter][$ext]['ext'] = array('#value' => l($ext, 'admin/settings/media/extensions/'. $ext));
+      $form['presenter'][$presenter][$ext]['ext'] = array('#value' => l($ext, MAPI_PATH .'/extensions/'. $ext));
       $form['presenter'][$presenter][$ext]['default'] = array('#value' => (media_presenter_default($ext) === $presenter ? t('yes') : ''));
     }
   }
@@ -321,7 +321,7 @@
     $list = media_type_extensions($type); 
   }
   foreach ($list as $ext) {
-    $exts[] = l($ext, 'admin/settings/media/extensions/'. $ext);
+    $exts[] = l($ext, MAPI_PATH .'/extensions/'. $ext);
   }
 
   $form['exts'] = array('#value' => theme('item_list', $exts, t('Associated Extensions')));