diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-03-28 03:58:55 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-03-28 03:58:55 +0000 |
| commit | 1c2033f0f88fd42fa30e86f4e03b27262fb49318 (patch) | |
| tree | c38d17734ebd49c8d7306fca3a96fd55edab393c /modules | |
| parent | 1c63e669b1b2c1f115ee46de901990cc1ee92a8c (diff) | |
| download | brdo-1c2033f0f88fd42fa30e86f4e03b27262fb49318.tar.gz brdo-1c2033f0f88fd42fa30e86f4e03b27262fb49318.tar.bz2 | |
- Patch #402226 by stompeers, catch et al: menu admin page uses inconsistent formatting.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/menu/menu.admin.inc | 24 | ||||
| -rw-r--r-- | modules/menu/menu.module | 4 |
2 files changed, 23 insertions, 5 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index 8c86033b5..09de75061 100644 --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -11,13 +11,27 @@ */ function menu_overview_page() { $result = db_query("SELECT * FROM {menu_custom} ORDER BY title"); - $content = array(); + $header = array(t('Title'), array('data' => t('Operations'), 'colspan' => '3')); + $rows = array(); while ($menu = db_fetch_array($result)) { - $menu['href'] = 'admin/build/menu-customize/' . $menu['menu_name']; - $menu['localized_options'] = array(); - $content[] = $menu; + $row = array(theme('menu_admin_overview', $menu['title'], $menu['menu_name'], $menu['description'])); + $row[] = array('data' => l(t('list items'), 'admin/build/menu-customize/' . $menu['menu_name'])); + $row[] = array('data' => l(t('edit menu'), 'admin/build/menu-customize/' . $menu['menu_name'] . '/edit')); + $row[] = array('data' => l(t('add item'), 'admin/build/menu-customize/' . $menu['menu_name'] . '/add')); + $rows[] = $row; } - return theme('admin_block_content', $content); + + return theme('table', $header, $rows); +} + +/** + * Theme the menu title and description for admin page + */ +function theme_menu_admin_overview($title, $name, $description) { + $output = check_plain($title); + $output .= '<div class="description">' . filter_xss_admin($description) . '</div>'; + + return $output; } /** diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 24db8e3c5..51f59df3b 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -144,6 +144,10 @@ function menu_theme() { 'file' => 'menu.admin.inc', 'arguments' => array('form' => NULL), ), + 'menu_admin_overview' => array( + 'file' => 'menu.admin.inc', + 'arguments' => array('title' => NULL, 'name' => NULL, 'description' => NULL), + ), ); } |