Commit e2c206da authored by Kjartan's avatar Kjartan

- Renamed User information block to Navigation.

- Fixed Navigation block header.
parent bcfa6dca
......@@ -365,7 +365,7 @@ function user_block($op = "list", $delta = 0) {
if ($op == "list") {
$blocks[0]["info"] = t("User login");
$blocks[1]["info"] = t("User information");
$blocks[1]["info"] = t("Navigation");
$blocks[2]["info"] = t("Who's new");
return $blocks;
......@@ -373,10 +373,7 @@ function user_block($op = "list", $delta = 0) {
else {
switch ($delta) {
case 0:
if ($user->uid) {
$block["subject"] = $user->name;
}
else {
if (!$user->uid) {
/*
** For usability's sake, avoid showing two login forms on one
** page.
......@@ -426,10 +423,11 @@ function user_block($op = "list", $delta = 0) {
$block["subject"] = t("User login");
$block["content"] = "<div class=\"user-login-link\">$output</div>";
}
$block["content"] .= "<div id=\"menu\">". menu_tree()."</div>";
return $block;
break;
case 1:
$block["subject"] = $user->uid ? $user->name : t("Navigation");
$block["content"] = "<div id=\"menu\">". menu_tree() ."</div>";
return $block;
case 2:
if (user_access("access content")) {
$result = db_query_range("SELECT uid, name FROM {users} WHERE status != '0' ORDER BY uid DESC", 0, 5);
......
......@@ -365,7 +365,7 @@ function user_block($op = "list", $delta = 0) {
if ($op == "list") {
$blocks[0]["info"] = t("User login");
$blocks[1]["info"] = t("User information");
$blocks[1]["info"] = t("Navigation");
$blocks[2]["info"] = t("Who's new");
return $blocks;
......@@ -373,10 +373,7 @@ function user_block($op = "list", $delta = 0) {
else {
switch ($delta) {
case 0:
if ($user->uid) {
$block["subject"] = $user->name;
}
else {
if (!$user->uid) {
/*
** For usability's sake, avoid showing two login forms on one
** page.
......@@ -426,10 +423,11 @@ function user_block($op = "list", $delta = 0) {
$block["subject"] = t("User login");
$block["content"] = "<div class=\"user-login-link\">$output</div>";
}
$block["content"] .= "<div id=\"menu\">". menu_tree()."</div>";
return $block;
break;
case 1:
$block["subject"] = $user->uid ? $user->name : t("Navigation");
$block["content"] = "<div id=\"menu\">". menu_tree() ."</div>";
return $block;
case 2:
if (user_access("access content")) {
$result = db_query_range("SELECT uid, name FROM {users} WHERE status != '0' ORDER BY uid DESC", 0, 5);
......
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