wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

Browse Source 
* '0.8.x' of git@gitorious.org:laconica/dev:
  Display more oembed info in attachment popup.
  order notices in a conversation
This commit is contained in:
Zach Copley 2009-06-18 10:52:40 -07:00
commit bde571728d
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/conversation.php
View File

@ -217,6 +217,8 @@ class ConversationTree extends NoticeList
$this->out->elementStart('ol', array('class' => 'notices'));
sort($children);
foreach ($children as $child) {
$this->showNoticePlus($child);
}

36
lib/attachmentlist.php
View File

@ -243,6 +243,42 @@ class AttachmentListItem extends Widget
class Attachment extends AttachmentListItem
{
function showLink() {
$this->out->elementStart('a', $this->linkAttr());
$this->out->element('span', null, $this->linkTitle());
$this->showRepresentation();
$this->out->elementEnd('a');
if (empty($this->oembed->author_name) && empty($this->oembed->provider)) {
return;
}
$this->out->elementStart('dl', 'oembed_info');
if (!empty($this->oembed->author_name)) {
$this->out->element('dt', null, _('Author:'));
$this->out->elementStart('dd');
if (empty($this->oembed->author_url)) {
$this->out->text($this->oembed->author_name);
} else {
$this->out->element('a', array('href' => $this->oembed->author_url), $this->oembed->author_name);
}
$this->out->elementEnd('dd');
}
if (!empty($this->oembed->provider)) {
$this->out->element('dt', null, _('Provider:'));
$this->out->elementStart('dd');
if (empty($this->oembed->provider_url)) {
$this->out->text($this->oembed->provider);
} else {
$this->out->element('a', array('href' => $this->oembed->provider_url), $this->oembed->provider);
}
$this->out->elementEnd('dd');
}
$this->out->elementEnd('dl');
}
function show() {
$this->showNoticeAttachment();
}

6
theme/base/css/display.css
View File

@ -1284,3 +1284,9 @@ display:none;
.guide {
clear:both;
}
dl.oembed_info dt,
dl.oembed_info dd {
display: inline;
}