From 2323e5723395dd9c793b301650b69bdd0a37e273 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 26 Jun 2003 19:30:20 +0000 Subject: [PATCH] - Improvement: moved hard-coded CSS from user module to drupal.css. Patch #57 by Kristjan. --- misc/drupal.css | 2 +- modules/user.module | 6 ++++-- modules/user/user.module | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/misc/drupal.css b/misc/drupal.css index be9923a6b88..160c7a7049e 100644 --- a/misc/drupal.css +++ b/misc/drupal.css @@ -75,7 +75,7 @@ th { text-align: left; padding-right: 1em; border-bottom: .ok { color: #080; } .user-login-block { text-align: center; } - +.user-login-block, .user-information-block { white-space: nowrap; } tr.dark { background-color: #ddd; } tr.light { background-color: #eee; } pre { white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -o-pre-wrap; white-space: -pre-wrap;} diff --git a/modules/user.module b/modules/user.module index 0e03f6e8173..fbba36e143e 100644 --- a/modules/user.module +++ b/modules/user.module @@ -388,19 +388,21 @@ function user_block($op = "list", $delta = 0) { $output .= theme("theme_item_list", $items); $block["subject"] = t("User login"); - $block["content"] = "
$output
"; + $block["content"] = $output; return $block; } break; case 1: if ($user->uid) { + $output = "
\n"; $output .= theme("theme_menu_list", module_invoke_all("link", "menu.create")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.view")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc")); + $output .= "
\n"; $block["subject"] = $user->name; - $block["content"] = "
$output
"; + $block["content"] = $output; return $block; } break; diff --git a/modules/user/user.module b/modules/user/user.module index 0e03f6e8173..fbba36e143e 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -388,19 +388,21 @@ function user_block($op = "list", $delta = 0) { $output .= theme("theme_item_list", $items); $block["subject"] = t("User login"); - $block["content"] = "
$output
"; + $block["content"] = $output; return $block; } break; case 1: if ($user->uid) { + $output = "
\n"; $output .= theme("theme_menu_list", module_invoke_all("link", "menu.create")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.view")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc")); + $output .= "
\n"; $block["subject"] = $user->name; - $block["content"] = "
$output
"; + $block["content"] = $output; return $block; } break;