Commit 2323e572 authored by Dries's avatar Dries
Browse files

- Improvement: moved hard-coded CSS from user module to drupal.css.  Patch
  #57 by Kristjan.
parent f7a6c42e
...@@ -75,7 +75,7 @@ th { text-align: left; padding-right: 1em; border-bottom: ...@@ -75,7 +75,7 @@ th { text-align: left; padding-right: 1em; border-bottom:
.ok { color: #080; } .ok { color: #080; }
.user-login-block { text-align: center; } .user-login-block { text-align: center; }
.user-login-block, .user-information-block { white-space: nowrap; }
tr.dark { background-color: #ddd; } tr.dark { background-color: #ddd; }
tr.light { background-color: #eee; } tr.light { background-color: #eee; }
pre { white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -o-pre-wrap; white-space: -pre-wrap;} pre { white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -o-pre-wrap; white-space: -pre-wrap;}
......
...@@ -388,19 +388,21 @@ function user_block($op = "list", $delta = 0) { ...@@ -388,19 +388,21 @@ function user_block($op = "list", $delta = 0) {
$output .= theme("theme_item_list", $items); $output .= theme("theme_item_list", $items);
$block["subject"] = t("User login"); $block["subject"] = t("User login");
$block["content"] = "<div style=\"white-space: nowrap;\">$output</div>"; $block["content"] = $output;
return $block; return $block;
} }
break; break;
case 1: case 1:
if ($user->uid) { if ($user->uid) {
$output = "<div class=\"user-information-block\">\n";
$output .= theme("theme_menu_list", module_invoke_all("link", "menu.create")); $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.view"));
$output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings"));
$output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc"));
$output .= "</div>\n";
$block["subject"] = $user->name; $block["subject"] = $user->name;
$block["content"] = "<div style=\"white-space: nowrap;\">$output</div>"; $block["content"] = $output;
return $block; return $block;
} }
break; break;
......
...@@ -388,19 +388,21 @@ function user_block($op = "list", $delta = 0) { ...@@ -388,19 +388,21 @@ function user_block($op = "list", $delta = 0) {
$output .= theme("theme_item_list", $items); $output .= theme("theme_item_list", $items);
$block["subject"] = t("User login"); $block["subject"] = t("User login");
$block["content"] = "<div style=\"white-space: nowrap;\">$output</div>"; $block["content"] = $output;
return $block; return $block;
} }
break; break;
case 1: case 1:
if ($user->uid) { if ($user->uid) {
$output = "<div class=\"user-information-block\">\n";
$output .= theme("theme_menu_list", module_invoke_all("link", "menu.create")); $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.view"));
$output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings"));
$output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc")); $output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc"));
$output .= "</div>\n";
$block["subject"] = $user->name; $block["subject"] = $user->name;
$block["content"] = "<div style=\"white-space: nowrap;\">$output</div>"; $block["content"] = $output;
return $block; return $block;
} }
break; break;
......
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