{
parent::__construct($out);
if (!empty($notice->repeat_of)) {
- $original = Notice::staticGet('id', $notice->repeat_of);
+ $original = Notice::getKV('id', $notice->repeat_of);
if (empty($original)) { // could have been deleted
$this->notice = $notice;
} else {
$user = common_current_user();
if ($user) {
$this->out->elementStart('div', 'notice-options');
- $this->showFaveForm();
- $this->showReplyLink();
- $this->showRepeatForm();
- $this->showDeleteLink();
+ if (Event::handle('StartShowNoticeOptionItems', array($this))) {
+ $this->showFaveForm();
+ $this->showReplyLink();
+ $this->showRepeatForm();
+ $this->showDeleteLink();
+ Event::handle('EndShowNoticeOptionItems', array($this));
+ }
$this->out->elementEnd('div');
}
Event::handle('EndShowNoticeOptions', array($this));
if ($this->notice->scope != 0 && $this->notice->scope != 1) {
$class .= ' limited-scope';
}
+ if (!empty($this->notice->source)) {
+ $class .= ' notice-source-'.$this->notice->source;
+ }
$this->out->elementStart('li', array('class' => $class,
'id' => 'notice-' . $id));
Event::handle('EndOpenNoticeListItemElement', array($this));
$this->out->elementStart('a', $attrs);
$this->showAvatar();
$this->out->text(' ');
- $this->out->element('span',array('class' => 'nickname fn'),
- $this->profile->getBestName());
+ $user = common_current_user();
+ if (!empty($user) && $user->streamNicknames()) {
+ $this->out->element('span',array('class' => 'fn'),
+ $this->profile->nickname);
+ } else {
+ $this->out->element('span',array('class' => 'fn'),
+ $this->profile->getBestName());
+ }
$this->out->elementEnd('a');
$this->out->elementEnd('span');
function showAddressees()
{
- $this->out->elementStart('span', 'addressees');
-
- $cnt = $this->showGroupAddressees(true);
- $cnt = $this->showProfileAddressees($cnt == 0);
-
- $this->out->elementEnd('span', 'addressees');
+ $ga = $this->getGroupAddressees();
+ $pa = $this->getProfileAddressees();
+
+ $a = array_merge($ga, $pa);
+
+ if (!empty($a)) {
+ $this->out->elementStart('span', 'addressees');
+ $first = true;
+ foreach ($a as $addr) {
+ if (!$first) {
+ // TRANS: Separator in profile addressees list.
+ $this->out->text(_m('SEPARATOR',', '));
+ } else {
+ // Start of profile addressees list.
+ $first = false;
+ }
+ $text = $addr['text'];
+ unset($addr['text']);
+ $this->out->element('a', $addr, $text);
+ }
+ $this->out->elementEnd('span', 'addressees');
+ }
}
- function showGroupAddressees($first)
+ function getGroupAddressees()
{
+ $ga = array();
+
$groups = $this->getGroups();
+ $user = common_current_user();
+
+ $streamNicknames = !empty($user) && $user->streamNicknames();
+
foreach ($groups as $group) {
- if (!$first) {
- $this->out->text(', ');
- } else {
- $this->out->text(' ▶ ');
- $first = false;
- }
- $this->out->element('a', array('href' => $group->homeUrl(),
- 'title' => $group->nickname,
- 'class' => 'addressee group'),
- $group->getBestName());
+ $ga[] = array('href' => $group->homeUrl(),
+ 'title' => $group->nickname,
+ 'class' => 'addressee group',
+ 'text' => ($streamNicknames) ? $group->nickname : $group->getBestName());
}
- return count($groups);
+ return $ga;
}
function getGroups()
return $this->notice->getGroups();
}
- function showProfileAddressees($first)
+ function getProfileAddressees()
{
+ $pa = array();
+
$replies = $this->getReplyProfiles();
+ $user = common_current_user();
+
+ $streamNicknames = !empty($user) && $user->streamNicknames();
+
foreach ($replies as $reply) {
- if (!$first) {
- $this->out->text(', ');
- } else {
- $first = false;
- }
- $this->out->element('a', array('href' => $reply->profileurl,
- 'title' => $reply->nickname,
- 'class' => 'addressee account'),
- $reply->getBestName());
+ $pa[] = array('href' => $reply->profileurl,
+ 'title' => $reply->nickname,
+ 'class' => 'addressee account',
+ 'text' => ($streamNicknames) ? $reply->nickname : $reply->getBestName());
}
- return count($replies);
+ return $pa;
}
function getReplyProfiles()
{
$avatar_size = $this->avatarSize();
- $avatar = $this->profile->getAvatar($avatar_size);
+ $avatarUrl = $this->profile->avatarUrl($avatar_size);
- $this->out->element('img', array('src' => ($avatar) ?
- $avatar->displayUrl() :
- Avatar::defaultImage($avatar_size),
+ $this->out->element('img', array('src' => $avatarUrl,
'class' => 'avatar photo',
'width' => $avatar_size,
'height' => $avatar_size,
$source_name = (empty($ns->name)) ? ($ns->code ? _($ns->code) : _m('SOURCE','web')) : _($ns->name);
$this->out->text(' ');
$this->out->elementStart('span', 'source');
- // FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
+ // @todo FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
// TRANS: Followed by notice source.
$this->out->text(_('from'));
$this->out->text(' ');
function showContext()
{
if ($this->notice->hasConversation()) {
- $conv = Conversation::staticGet(
+ $conv = Conversation::getKV(
'id',
$this->notice->conversation
);
{
if (!empty($this->repeat)) {
- $repeater = Profile::staticGet('id', $this->repeat->profile_id);
+ $repeater = Profile::getKV('id', $this->repeat->profile_id);
$attrs = array('href' => $repeater->profileurl,
'class' => 'url');
// TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
$this->out->raw(_('Repeated by'));
+ $this->out->raw(' ');
$this->out->elementStart('a', $attrs);
$this->out->element('span', 'fn nickname', $repeater->nickname);
$this->out->elementStart('a', array('href' => $reply_url,
'class' => 'notice_reply',
// TRANS: Link title in notice list item to reply to a notice.
- 'title' => _('Reply to this notice')));
+ 'title' => _('Reply to this notice.')));
// TRANS: Link text in notice list item to reply to a notice.
$this->out->text(_('Reply'));
$this->out->text(' ');
$this->out->element('a', array('href' => $deleteurl,
'class' => 'notice_delete',
// TRANS: Link title in notice list item to delete a notice.
- 'title' => _('Delete this notice')),
+ 'title' => _('Delete this notice from the timeline.')),
// TRANS: Link text in notice list item to delete a notice.
_('Delete'));
}
$user->id != $this->notice->profile_id) {
$this->out->text(' ');
$profile = $user->getProfile();
- if ($profile->hasRepeated($this->notice->id)) {
+ if ($profile->hasRepeated($this->notice)) {
$this->out->element('span', array('class' => 'repeated',
// TRANS: Title for repeat form status in notice list when a notice has been repeated.
'title' => _('Notice repeated.')),
Event::handle('EndCloseNoticeListItemElement', array($this));
}
}
+
+ /**
+ * Get the notice in question
+ *
+ * For hooks, etc., this may be useful
+ *
+ * @return Notice The notice we're showing
+ */
+
+ function getNotice()
+ {
+ return $this->notice;
+ }
}
projects / quix0rs-gnu-social.git / blobdiff