diff options
Diffstat (limited to 'includes')
-rw-r--r-- | includes/common.inc | 4 | ||||
-rw-r--r-- | includes/theme.inc | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/includes/common.inc b/includes/common.inc index 35af870e2..80d842c03 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -427,7 +427,7 @@ function drupal_goto($url) { /* ** The "Location" header sends a REDIRECT status code to the http - ** deamon. In some cases this can go wrong, so we make sure none + ** daemon. In some cases this can go wrong, so we make sure none ** of the code /below/ gets executed when we redirect. */ @@ -773,7 +773,7 @@ function form($form, $method = "post", $action = 0, $options = 0) { } function form_item($title, $value, $description = 0) { - return "<p>". ($title ? "<b>$title:</b><br />" : "") . $value . ($description ? "<br /><small><i>$description</i></small>" : "") ."</p>\n"; + return "<div class=\"form-item\">". ($title ? "<div class=\"title\">$title:</div>" : "") . $value . ($description ? "<div class=\"description\">$description</div>" : "") ."</div>\n"; } function form_radio($title, $name, $value = 1, $checked = 0, $description = 0) { diff --git a/includes/theme.inc b/includes/theme.inc index 2f1569b44..f85412621 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -99,17 +99,19 @@ function theme_item_list($items = array(), $title = NULL) { /* ** Return a formatted array of items. */ - + $output .= "<div class=\"item-list\">"; if (isset($title)) { - $output .= "<b>$title</b><br />"; + $output .= "<div class=\"title\">$title</div>"; } if (isset($items)) { + $output .= "<ul>"; foreach ($items as $item) { - $output .= "- $item<br />"; + $output .= "<li>$item</li>"; } + $output .= "</ul>"; } - + $output .= "</div>"; return $output; } @@ -141,8 +143,14 @@ function theme_list($refresh = 0) { } function theme_head($main = 0) { + global $base_url; $head = module_invoke_all("head", $main); - return implode($head, "\n"); + $output .= "<base href=\"$base_url/\" />\n"; + $output .= "<style type=\"text/css\">\n"; + $output .= "@import url(misc/drupal.css);\n"; + $output .= "</style>\n"; + $output .= implode($head, "\n"); + return $output; } /* |