From: Shashi Gowda <connect2shashi@gmail.com>
Date: Sat, 9 Apr 2011 16:27:45 +0000 (+0530)
Subject: Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f47027abbefe35d17df50c67eec7cd1156a5e39a;p=quix0rs-gnu-social.git

Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
---

f47027abbefe35d17df50c67eec7cd1156a5e39a
diff --cc EVENTS.txt
index e66e925725,08a4273ec9..80708ed882
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@@ -1297,3 -1147,19 +1297,19 @@@ StartDefaultLocalNav: When showing the 
  EndDefaultLocalNav: When showing the default local nav
  - $menu: the menu
  - $user: current user
+ 
+ StartShowAccountProfileBlock: When showing the profile block for an account
+ - $out: XMLOutputter to append custom output
+ - $profile: the profile being shown
+ 
+ EndShowAccountProfileBlock: After showing the profile block for an account
+ - $out: XMLOutputter to append custom output
+ - $profile: the profile being shown
+ 
+ StartShowGroupProfileBlock: When showing the profile block for a group
+ - $out: XMLOutputter to append custom output
+ - $profile: the profile being shown
+ 
+ EndShowGroupProfileBlock: After showing showing the profile block for a group
+ - $out: XMLOutputter to append custom output
 -- $group: the group being shown
++- $group: the group being shown
diff --cc lib/profileblock.php
index 78b5dd3ec4,bf1ffd1443..3cea0474a4
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@@ -56,16 -56,32 +56,33 @@@ abstract class ProfileBlock extends Wid
  
      function show()
      {
-         $this->out->elementStart('div', 'profile_block section');
+         $this->showActions();
+         $this->showAvatar();
+         $this->showName();
+         $this->showLocation();
+         $this->showHomepage();
+         $this->showDescription();
++        $this->showTags();
+     }
  
+     function showAvatar()
+     {
          $size = $this->avatarSize();
  
-         $this->out->element('img', array('src' => $this->avatar(),
-                                          'class' => 'profile_block_avatar',
-                                          'alt' => $this->name(),
-                                          'width' => $size,
-                                          'height' => $size));
+         $this->out->element(
+             'img',
+             array(
+                 'src'  => $this->avatar(),
+                 'class'  => 'ur_face',
+                 'alt'    => $this->name(),
+                 'width'  => $size,
+                 'height' => $size
+             )
+         );
+     }
  
+     function showName()
+     {
          $name = $this->name();
  
          if (!empty($name)) {