Commit 3607a2b0 authored by Dries's avatar Dries

- Patch #44373 by m3avrck: improved generated HTML/CSS.

parent 79cdc915
......@@ -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
------------------------
......
......@@ -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";
}
}
......
......@@ -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;
}
......
......@@ -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;
}
}
......
......@@ -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;
}
}
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment