eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
This commit is contained in:
Shashi Gowda
2011-04-09 21:57:45 +05:30
parent a0ac51c22f 285c2ee72d
commit f47027abbe
206 changed files with 314 additions and 17667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lib/profileblock.php
View File

@@ -56,16 +56,33 @@ abstract class ProfileBlock extends Widget
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)) {
@@ -79,31 +96,35 @@ abstract class ProfileBlock extends Widget
}
$this->out->elementEnd('p');
}
}
function showDescription()
{
$description = $this->description();
if (!empty($description)) {
$this->out->element(
'p',
'profile_block_description',
$description
);
}
}
function showLocation()
{
$location = $this->location();
if (!empty($location)) {
$this->out->element('p', 'profile_block_location', $location);
}
}
$homepage = $this->homepage();
function showHomepage()
{
if (!empty($homepage)) {
$this->out->element('a', 'profile_block_homepage', $homepage);
}
$description = $this->description();
if (!empty($description)) {
$this->out->element('p',
'profile_block_description',
$description);
}
$this->showTags();
$this->showActions();
$this->out->elementEnd('div');
}
function avatarSize()