GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Group directory - fix group logo display

Browse Source
This commit is contained in:
Zach Copley 2011-04-13 15:52:44 -07:00
parent 055d61ef79
commit 3a3a53dfcc
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Directory/actions/groupdirectory.php
View File

@ -117,7 +117,7 @@ class GroupdirectoryAction extends Action
{
// TRANS: Page notice for groups directory.
// TRANS: %%site.name%% is the name of the StatusNet site.
// TRANS: %%%%action.newgroup%%%% is a URL. Do not change it.
// TRANS: %%action.newgroup%% is a URL. Do not change it.
// TRANS: This message contains Markdown links in the form [link text](link).
$instructions = <<< END_OF_INSTRUCTIONS
%%site.name%% groups let you find and talk with people of similar

30
plugins/Directory/lib/sortablegrouplist.php
View File

@ -166,21 +166,31 @@ class SortableGroupListItem extends SortableSubscriptionListItem
function showAvatar()
{
$avatar = $this->profile->stream_logo;
$aAttrs = $this->linkAttributes();
$this->out->elementStart('a', $aAttrs);
$logo = ($this->profile->stream_logo) ?
$this->profile->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
$this->out->elementStart(
'a',
array(
'href' => $this->profile->homeUrl(),
'class' => 'url entry-title',
'rel' => 'contact group'
)
);
$this->out->element(
'img',
array(
'src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
'img',
array(
'src' => $logo,
'class' => 'photo avatar',
'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE,
'alt' => ($this->profile->fullname) ? $this->profile->fullname : $this->profile->nickname
)
'alt' => ($this->profile->fullname)
? $this->profile->fullname : $this->profile->nickname
)
);
$this->out->text(' ');
$hasFN = (!empty($this->profile->fullname)) ? 'nickname' : 'fn nickname';
$hasFN = ($this->profile->fullname) ? 'nickname' : 'fn org nickname';
$this->out->elementStart('span', $hasFN);
$this->out->raw($this->highlight($this->profile->nickname));
$this->out->elementEnd('span');
@ -251,7 +261,7 @@ class SortableGroupListItem extends SortableSubscriptionListItem
{
$user = $this->owner;
if ($user) {
$this->out->elementStart('li', 'entity_subscribe');
// XXX: special-case for user looking at own
// subscriptions page