diff options
-rw-r--r-- | CHANGELOG.txt | 2 | ||||
-rw-r--r-- | includes/menu.inc | 2 | ||||
-rw-r--r-- | misc/drupal.css | 10 | ||||
-rw-r--r-- | modules/menu.module | 2 | ||||
-rw-r--r-- | modules/menu/menu.module | 2 | ||||
-rw-r--r-- | modules/user.module | 2 | ||||
-rw-r--r-- | modules/user/user.module | 2 |
7 files changed, 12 insertions, 10 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 85ffd71bf..b5a07e4fc 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -57,6 +57,8 @@ Drupal x.x.x, xxxx-xx-xx (development version) * removed dependency on PL/pgSQL procedural language. - menu system: * added support for external URLs. +- queue module: + * removed from core. Drupal 4.6.5, 2005-12-12 ------------------------ diff --git a/includes/menu.inc b/includes/menu.inc index b47328c43..b6d330319 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -579,7 +579,7 @@ function menu_rebuild() { */ function theme_menu_tree($pid = 1) { if ($tree = menu_tree($pid)) { - return "\n<ul>\n". $tree ."\n</ul>\n"; + return "\n<ul class=\"menu\">\n". $tree ."\n</ul>\n"; } } diff --git a/misc/drupal.css b/misc/drupal.css index 840b37c8d..793fdb5b8 100644 --- a/misc/drupal.css +++ b/misc/drupal.css @@ -43,15 +43,15 @@ td.active { /* ** Menu styles */ -.menu { - padding: 0 0 0 0.5em; -} -.menu ul { +ul.menu { list-style: none; border: none; text-align:left; } -.menu li a { +ul.menu li { + margin: 0 0 0 0.5em; +} +ul.menu li a { width: 100%; text-decoration: none; } diff --git a/modules/menu.module b/modules/menu.module index 7358d14ec..3cea9bb5b 100644 --- a/modules/menu.module +++ b/modules/menu.module @@ -179,7 +179,7 @@ function menu_block($op = 'list', $delta = 0) { } else if ($op == 'view') { $data['subject'] = $menu['items'][$delta]['title']; - $data['content'] = '<div class="menu">'. theme('menu_tree', $delta) .'</div>' ; + $data['content'] = theme('menu_tree', $delta); return $data; } } diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 7358d14ec..3cea9bb5b 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -179,7 +179,7 @@ function menu_block($op = 'list', $delta = 0) { } else if ($op == 'view') { $data['subject'] = $menu['items'][$delta]['title']; - $data['content'] = '<div class="menu">'. theme('menu_tree', $delta) .'</div>' ; + $data['content'] = theme('menu_tree', $delta); return $data; } } diff --git a/modules/user.module b/modules/user.module index dbaae5b0c..d9036d8c9 100644 --- a/modules/user.module +++ b/modules/user.module @@ -543,7 +543,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) { case 1: if ($menu = theme('menu_tree')) { $block['subject'] = $user->uid ? $user->name : t('Navigation'); - $block['content'] = '<div class="menu">'. $menu .'</div>'; + $block['content'] = $menu; } return $block; diff --git a/modules/user/user.module b/modules/user/user.module index dbaae5b0c..d9036d8c9 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -543,7 +543,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) { case 1: if ($menu = theme('menu_tree')) { $block['subject'] = $user->uid ? $user->name : t('Navigation'); - $block['content'] = '<div class="menu">'. $menu .'</div>'; + $block['content'] = $menu; } return $block; |