Commit 17ef869e authored by Kjartan's avatar Kjartan
Browse files

Applied 0007.almaw.home-link-using-l.patch

- Fix link_page to use l() to generate home link.

Applied 0058.kika.themeable-usermenu.patch
- Modifies user menu be themeable.
parent b22cd5d1
...@@ -997,14 +997,14 @@ function field_set($string, $name, $value) { ...@@ -997,14 +997,14 @@ function field_set($string, $name, $value) {
} }
function link_page() { function link_page() {
global $custom_links, $base_url; global $custom_links;
if (is_array($custom_links)) { if (0 && is_array($custom_links)) {
return $custom_links; return $custom_links;
} }
else { else {
$links = module_invoke_all("link", "page"); $links = module_invoke_all("link", "page");
array_unshift($links, "<a href=\"$base_url/\" title=\"". t("Return to the main page.") ."\">". t("home") ."</a>"); array_unshift($links, l(t("home"), "", array("title" => t("Return to the main page."))));
return $links; return $links;
} }
} }
......
...@@ -75,6 +75,7 @@ th { text-align: left; padding-right: 1em; border-bottom: ...@@ -75,6 +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-page-menu { text-align: center; }
.user-login-block, .user-information-block { white-space: nowrap; } .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; }
......
...@@ -1071,11 +1071,13 @@ function user_edit($edit = array()) { ...@@ -1071,11 +1071,13 @@ function user_edit($edit = array()) {
} }
function user_menu() { function user_menu() {
global $theme;
$links[] = l(t("view user information"), "user/view"); $links[] = l(t("view user information"), "user/view");
$links[] = l(t("edit user information"), "user/edit"); $links[] = l(t("edit user information"), "user/edit");
$links[] = l(t("delete account"), "user/delete"); $links[] = l(t("delete account"), "user/delete");
return "<div style=\"text-align: center;\">". implode(" &middot; ", $links) ."</div>"; return "<div class=\"user-page-menu\">". $theme->links($links) ."</div>";
} }
function user_view($uid = 0) { function user_view($uid = 0) {
......
...@@ -1071,11 +1071,13 @@ function user_edit($edit = array()) { ...@@ -1071,11 +1071,13 @@ function user_edit($edit = array()) {
} }
function user_menu() { function user_menu() {
global $theme;
$links[] = l(t("view user information"), "user/view"); $links[] = l(t("view user information"), "user/view");
$links[] = l(t("edit user information"), "user/edit"); $links[] = l(t("edit user information"), "user/edit");
$links[] = l(t("delete account"), "user/delete"); $links[] = l(t("delete account"), "user/delete");
return "<div style=\"text-align: center;\">". implode(" &middot; ", $links) ."</div>"; return "<div class=\"user-page-menu\">". $theme->links($links) ."</div>";
} }
function user_view($uid = 0) { function user_view($uid = 0) {
......
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