From f0ef6140ef84e6f3e4098dd50ac993e2b2c40b56 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 25 Feb 2011 19:10:36 +0000
Subject: [PATCH] - user web:     - in friend request notification, link to
 user page     - in user page, show ID     - remove "Account data for " in
 page title

svn path=/trunk/boinc/; revision=23112
---
 checkin_notes           | 12 ++++++++++++
 html/inc/friend.inc     |  2 +-
 html/inc/user.inc       |  1 +
 html/user/show_user.php |  2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index bb1892d28d..c8f792e84b 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1162,3 +1162,15 @@ Charlie 24 Feb 2011
         boinc.xcodeproj/
             project.pbxproj
 
+David  25 Feb 2011
+    - user web:
+        - in friend request notification, link to user page
+        - in user page, show ID
+        - remove "Account data for " in page title
+
+    html/
+        inc/
+            user.inc
+            friend.in
+        user/
+            show_user.php
diff --git a/html/inc/friend.inc b/html/inc/friend.inc
index 16d7d24f76..66ec14922b 100644
--- a/html/inc/friend.inc
+++ b/html/inc/friend.inc
@@ -36,7 +36,7 @@ function friend_notify_accept_email_line($notify) {
 function friend_notify_req_web_line($notify) {
     $user = BoincUser::lookup_id($notify->opaque);
     return "
-        <a href=friend.php?action=query&userid=$notify->opaque>Friendship request</a> from $user->name
+        <a href=friend.php?action=query&userid=$notify->opaque>Friendship request</a> from <a href=show_user.php?userid=$user->id>$user->name</a>
     ";
 }
 
diff --git a/html/inc/user.inc b/html/inc/user.inc
index 178b47ba18..90f4d218c2 100644
--- a/html/inc/user.inc
+++ b/html/inc/user.inc
@@ -311,6 +311,7 @@ function show_community_private($user) {
 //
 function show_user_summary_public($user) {
     global $g_logged_in_user;
+    row2(tra("User ID"), $g_logged_in_user->id);
     row2(tra("%1 member since", PROJECT), date_str($user->create_time));
     row2(tra("Country"), $user->country);
     if (strlen($user->url)) {
diff --git a/html/user/show_user.php b/html/user/show_user.php
index eeca64b5c5..ef1f8f349c 100644
--- a/html/user/show_user.php
+++ b/html/user/show_user.php
@@ -87,7 +87,7 @@ if ($format=="xml"){
 
     $logged_in_user = get_logged_in_user(false);
 
-    page_head(tra("Account data for %1", $user->name));
+    page_head($user->name);
     start_table();
     echo "<tr><td valign=top>";
     start_table();