protected $id_prefix = null;
protected $options = true;
protected $maxchars = 0; // if <= 0 it means use full posts
+ protected $item_tag = 'li';
+ protected $pa = null;
/**
* constructor
}
}
// string preferences
- foreach(array('id_prefix') as $key) {
+ foreach(array('id_prefix', 'item_tag') as $key) {
if (array_key_exists($key, $prefs)) {
$this->$key = $prefs[$key];
}
$this->elementStart('section', array('class'=>'notice-headers'));
$this->showNoticeTitle();
$this->showAuthor();
- if ($this->addressees) { $this->showAddressees(); }
+
+ if (!empty($this->notice->reply_to) || count($this->getProfileAddressees()) > 0) {
+ $this->elementStart('div', array('class' => 'parents'));
+ try {
+ $this->showParent();
+ } catch (NoParentNoticeException $e) {
+ // no parent notice
+ } catch (InvalidUrlException $e) {
+ // parent had an invalid URL so we can't show it
+ }
+ if ($this->addressees) { $this->showAddressees(); }
+ $this->elementEnd('div');
+ }
$this->elementEnd('section');
}
{
$this->elementStart('footer');
$this->showNoticeInfo();
- if ($this->attachments) { $this->showNoticeAttachments(); }
if ($this->options) { $this->showNoticeOptions(); }
+ if ($this->attachments) { $this->showNoticeAttachments(); }
$this->elementEnd('footer');
}
function showNoticeTitle()
{
if (Event::handle('StartShowNoticeTitle', array($this))) {
- $this->element('a', array('href' => $this->notice->getUrl(),
+ $this->element('a', array('href' => $this->notice->getUrl(true),
'class' => 'notice-title'),
$this->notice->getTitle());
Event::handle('EndShowNoticeTitle', array($this));
$this->showNoticeSource();
$this->showNoticeLocation();
$this->showPermalink();
- $this->showRepeat();
Event::handle('EndShowNoticeInfo', array($this));
}
}
$this->out->elementStart('div', 'notice-options');
if (Event::handle('StartShowNoticeOptionItems', array($this))) {
$this->showReplyLink();
- $this->showRepeatForm();
$this->showDeleteLink();
Event::handle('EndShowNoticeOptionItems', array($this));
}
$class .= ' notice-source-'.$this->notice->source;
}
$id_prefix = (strlen($this->id_prefix) ? $this->id_prefix . '-' : '');
- $this->out->elementStart('li', array('class' => $class,
+ $this->out->elementStart($this->item_tag, array('class' => $class,
'id' => "${id_prefix}notice-${id}"));
Event::handle('EndOpenNoticeListItemElement', array($this));
}
function showAuthor()
{
$attrs = array('href' => $this->profile->profileurl,
- 'class' => 'h-card p-author',
+ 'class' => 'h-card',
'title' => $this->profile->getNickname());
+ if(empty($this->repeat)) { $attrs['class'] .= ' p-author'; }
if (Event::handle('StartShowNoticeItemAuthor', array($this->profile, $this->out, &$attrs))) {
$this->out->elementStart('a', $attrs);
}
}
+ function showParent()
+ {
+ $this->out->element(
+ 'a',
+ array(
+ 'href' => $this->notice->getParent()->getUrl(),
+ 'class' => 'u-in-reply-to',
+ 'rel' => 'in-reply-to'
+ ),
+ 'in reply to'
+ );
+ }
+
function showAddressees()
{
$pa = $this->getProfileAddressees();
function getProfileAddressees()
{
- $pa = array();
+ if($this->pa) { return $this->pa; }
+ $this->pa = array();
- $attentions = $this->getReplyProfiles();
+ $attentions = $this->getAttentionProfiles();
foreach ($attentions as $attn) {
$class = $attn->isGroup() ? 'group' : 'account';
- $pa[] = array('href' => $attn->profileurl,
- 'title' => $attn->getNickname(),
- 'class' => "addressee {$class}",
- 'text' => $attn->getStreamName());
+ $this->pa[] = array('href' => $attn->profileurl,
+ 'title' => $attn->getNickname(),
+ 'class' => "addressee {$class}",
+ 'text' => $attn->getStreamName());
}
- return $pa;
+ return $this->pa;
}
- function getReplyProfiles()
+ function getAttentionProfiles()
{
- return $this->notice->getReplyProfiles();
+ return $this->notice->getAttentionProfiles();
}
/**
if (Event::handle('StartShowNoticeContent', array($this->notice, $this->out, $this->out->getScoped()))) {
if ($this->maxchars > 0 && mb_strlen($this->notice->content) > $this->maxchars) {
$this->out->text(mb_substr($this->notice->content, 0, $this->maxchars) . '[…]');
- } elseif ($this->notice->rendered) {
- $this->out->raw($this->notice->rendered);
} else {
- // XXX: may be some uncooked notices in the DB,
- // we cook them right now. This should probably disappear in future
- // versions (>> 0.4.x)
- $this->out->raw(common_render_content($this->notice->content, $this->notice));
+ $this->out->raw($this->notice->getRendered());
}
Event::handle('EndShowNoticeContent', array($this->notice, $this->out, $this->out->getScoped()));
}
'href' => Conversation::getUrlFromNotice($this->notice)));
$this->out->element('time', array('class' => 'dt-published',
'datetime' => common_date_iso8601($this->notice->created),
- // TRANS: Timestamp title (tooltip text) for NoticeListItem
'title' => common_exact_date($this->notice->created)),
common_date_string($this->notice->created));
$this->out->elementEnd('a');
*/
function showNoticeLocation()
{
- $id = $this->notice->id;
-
- $location = $this->notice->getLocation();
-
- if (empty($location)) {
+ return;
+ try {
+ $location = Notice_location::locFromStored($this->notice);
+ } catch (NoResultException $e) {
+ return;
+ } catch (ServerException $e) {
return;
}
$name = $location->getName();
- $lat = $this->notice->lat;
- $lon = $this->notice->lon;
+ $lat = $location->lat;
+ $lon = $location->lon;
$latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
if (empty($name)) {
if (!$this->notice->isLocal()) {
$class .= ' external';
}
+
+ try {
+ if($this->repeat) {
+ $this->out->element('a',
+ array('href' => $this->repeat->getUrl(),
+ 'class' => 'u-url'),
+ '');
+ $class = str_replace('u-url', 'u-repost-of', $class);
+ }
+ } catch (InvalidUrlException $e) {
+ // no permalink available
+ }
+
try {
$this->out->element('a',
- array('href' => $this->notice->getUrl(),
+ array('href' => $this->notice->getUrl(true),
'class' => $class),
// TRANS: Addition in notice list item for single-notice view.
_('permalink'));
}
}
- /**
- * show a link to the author of repeat
- *
- * @return void
- */
- function showRepeat()
- {
- if (!empty($this->repeat)) {
-
- $repeater = Profile::getKV('id', $this->repeat->profile_id);
-
- $attrs = array('href' => $repeater->profileurl,
- 'class' => 'h-card p-author',
- 'title' => $repeater->getFancyName());
-
- $this->out->elementStart('span', 'repeat h-entry');
-
- // TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
- $this->out->raw(_('Repeated by').' ');
-
- $this->out->element('a', $attrs, $repeater->getNickname());
-
- $this->out->elementEnd('span');
- }
- }
-
/**
* show a link to reply to the current notice
*
$deleteurl = common_local_url('deletenotice',
array('notice' => $todel->id));
$this->out->element('a', array('href' => $deleteurl,
- 'class' => 'notice_delete',
+ 'class' => 'notice_delete popup',
// TRANS: Link title in notice list item to delete a notice.
'title' => _('Delete this notice from the timeline.')),
// TRANS: Link text in notice list item to delete a notice.
}
}
- /**
- * show the form to repeat a notice
- *
- * @return void
- */
- function showRepeatForm()
- {
- if ($this->notice->scope == Notice::PUBLIC_SCOPE ||
- $this->notice->scope == Notice::SITE_SCOPE) {
- $user = common_current_user();
- if (!empty($user) &&
- $user->id != $this->notice->profile_id) {
- $this->out->text(' ');
- $profile = $user->getProfile();
- 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.')),
- // TRANS: Repeat form status in notice list when a notice has been repeated.
- _('Repeated'));
- } else {
- $rf = new RepeatForm($this->out, $this->notice);
- $rf->show();
- }
- }
- }
- }
-
/**
* finish the notice
*
projects / quix0rs-gnu-social.git / blobdiff