From ce212c3903cfa7a81aa130dc8d1dff6ae890572e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 30 Mar 2009 09:58:28 -0400
Subject: [PATCH 1/5] full name in title and h1 of the personal profile

---
 actions/showstream.php | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 65482167e1..9b65362938 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -67,11 +67,17 @@ class ShowstreamAction extends Action
 
     function title()
     {
+        if (!empty($this->profile->fullname)) {
+            $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
+        } else {
+            $base = $this->user->nickname;
+        }
+
         if ($this->page == 1) {
-            return $this->user->nickname;
+            return $base;
         } else {
             return sprintf(_("%s, page %d"),
-                           $this->user->nickname,
+                           $base,
                            $this->page);
         }
     }
@@ -140,16 +146,6 @@ class ShowstreamAction extends Action
         $nav->show();
     }
 
-    function showPageTitle()
-    {
-        $user =& common_current_user();
-        if ($user && ($user->id == $this->profile->id)) {
-            $this->element('h1', NULL, _("Your profile"));
-        } else {
-            $this->element('h1', NULL, sprintf(_('%s\'s profile'), $this->profile->nickname));
-        }
-    }
-
     function showPageNoticeBlock()
     {
         return;

From 3af66807161628969395bfb65ada38f977c94edf Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 30 Mar 2009 10:17:10 -0400
Subject: [PATCH 2/5] add a title to attention notice links

---
 lib/util.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index a43666fa5c..7b2930914f 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -622,9 +622,13 @@ function common_at_link($sender_id, $nickname)
             $url = $recipient->profileurl;
         }
         $xs = new XMLStringer(false);
+        $attrs = array('href' => $url,
+                       'class' => 'url');
+        if (!empty($recipient->fullname)) {
+            $attrs['title'] = $recipient->fullname . ' (' . $recipient->nickname . ')';
+        }
         $xs->elementStart('span', 'vcard');
-        $xs->elementStart('a', array('href' => $url,
-                                     'class' => 'url'));
+        $xs->elementStart('a', $attrs);
         $xs->element('span', 'fn nickname', $nickname);
         $xs->elementEnd('a');
         $xs->elementEnd('span');

From d5ac986b800858348dec746d64c8b907043ba225 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 30 Mar 2009 10:26:36 -0400
Subject: [PATCH 3/5] add titles to group links in notices

---
 lib/util.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 7b2930914f..ef73adc364 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -643,10 +643,14 @@ function common_group_link($sender_id, $nickname)
     $sender = Profile::staticGet($sender_id);
     $group = User_group::staticGet('nickname', common_canonical_nickname($nickname));
     if ($group && $sender->isMember($group)) {
+        $attrs = array('href' => $group->permalink(),
+                       'class' => 'url');
+        if (!empty($group->fullname)) {
+            $attrs['title'] = $group->fullname . ' (' . $group->nickname . ')';
+        }
         $xs = new XMLStringer();
         $xs->elementStart('span', 'vcard');
-        $xs->elementStart('a', array('href' => $group->permalink(),
-                                     'class' => 'url'));
+        $xs->elementStart('a', $attrs);
         $xs->element('span', 'fn nickname', $nickname);
         $xs->elementEnd('a');
         $xs->elementEnd('span');

From 650a86d79aacb0657a562183e5b5e37ace6127f3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 30 Mar 2009 10:28:44 -0400
Subject: [PATCH 4/5] add fullname to title and h1 for groups

---
 actions/showgroup.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/actions/showgroup.php b/actions/showgroup.php
index b6022840bf..95d2914ba0 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -73,11 +73,17 @@ class ShowgroupAction extends Action
 
     function title()
     {
+        if (!empty($this->group->fullname)) {
+            $base = $this->group->fullname . ' (' . $this->group->nickname . ')';
+        } else {
+            $base = $this->group->nickname;
+        }
+
         if ($this->page == 1) {
-            return sprintf(_("%s group"), $this->group->nickname);
+            return sprintf(_("%s group"), $base);
         } else {
             return sprintf(_("%s group, page %d"),
-                           $this->group->nickname,
+                           $base,
                            $this->page);
         }
     }

From a68836acb4c43500dbff89be1faec19969bc34c2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 30 Mar 2009 10:38:26 -0400
Subject: [PATCH 5/5] add full name title to notice list link

---
 lib/noticelist.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 9fc0126b3e..8523f2e63e 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -258,8 +258,12 @@ class NoticeListItem extends Widget
     function showAuthor()
     {
         $this->out->elementStart('span', 'vcard author');
-        $this->out->elementStart('a', array('href' => $this->profile->profileurl,
-                                            'class' => 'url'));
+        $attrs = array('href' => $this->profile->profileurl,
+                       'class' => 'url');
+        if (!empty($this->profile->fullname)) {
+            $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
+        }
+        $this->out->elementStart('a', $attrs);
         $this->showAvatar();
         $this->showNickname();
         $this->out->elementEnd('a');