diff options
| author | Kjartan Mannes <kjartan@2.no-reply.drupal.org> | 2002-04-02 09:45:57 +0000 |
|---|---|---|
| committer | Kjartan Mannes <kjartan@2.no-reply.drupal.org> | 2002-04-02 09:45:57 +0000 |
| commit | 1e4308a939723529b665ac7e0e0356950a0507f7 (patch) | |
| tree | 335e3af799a8e203e4a502f814868d5778cfa48f /modules/user.module | |
| parent | 1e8c9d8192d0f8c17c64bcd09f34219f4832b368 (diff) | |
| download | brdo-1e4308a939723529b665ac7e0e0356950a0507f7.tar.gz brdo-1e4308a939723529b665ac7e0e0356950a0507f7.tar.bz2 | |
- made the user information block into two different blocks. One for
login and one for user information.
- added link to help in book module (post-patch, see below).
- applied various patches:
Patch by Greg Tyrelle <greg@tyrelle.net>
- tracker module now shows usernames next to comments.
Patch by Moshe Weitzman <moshe@wallaware.com>
- book module has a more complete help.
- added administrative link to export book to html
- fixed non book nodes not showing up in trees.
Patch by moshe weitzman <weitzman@tejasa.com>
- links can be defined in the configuration file.
Diffstat (limited to 'modules/user.module')
| -rw-r--r-- | modules/user.module | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/modules/user.module b/modules/user.module index 78c233300..e90c2e702 100644 --- a/modules/user.module +++ b/modules/user.module @@ -464,9 +464,10 @@ function user_block() { $output .= @implode("<br />\n", $links); $output .= "</div>"; + $block[0]["content"] = $output; } else { - $block[0]["subject"] = t("Log in"); + $block[1]["subject"] = t("Log in"); $output .= "<div align=\"center\">\n"; $output .= "<form action=\"module.php?mod=user&op=login\" method=\"post\">\n"; @@ -477,11 +478,15 @@ function user_block() { if (variable_get("account_register", 1)) $output .= " <a href=\"module.php?mod=user\" title=\"". t("Create a new user account.") ."\">". t("REGISTER") ."</a>\n"; $output .= "</form>\n"; $output .= "</div>\n"; + $block[1]["content"] = $output; } - $block[0]["content"] = $output; + $block[0]["info"] = t("User information"); $block[0]["link"] = "module.php?mod=user"; + $block[1]["info"] = t("Log in"); + $block[1]["link"] = "module.php?mod=user"; + // Who's online block $time = 60 * 60; // minutes * seconds $limit = 5; // List the X most recent people @@ -494,10 +499,10 @@ function user_block() { $output .= '<li><a href="module.php?mod=user&op=view&id='. $account->uid .'">'. (strlen($account->name) > 10 ? substr($account->name, 0, 10) . '...' : $account->name) .'</a></li>'; } $output .= "</ol>"; - $block[1]["content"] = $output; + $block[2]["content"] = $output; } - $block[1]["subject"] = t("Who's online"); - $block[1]["info"] = t("Who's online"); + $block[2]["subject"] = t("Who's online"); + $block[2]["info"] = t("Who's online"); return $block; } |