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

use a subclass for single notice items to show attachments

This commit is contained in:
Evan Prodromou 2009-06-23 07:25:18 -07:00
parent 7bcaa858af
commit e2becdb251
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
actions/shownotice.php
View File

@ -209,7 +209,7 @@ class ShownoticeAction extends Action
function showContent()
{
$this->elementStart('ol', array('class' => 'notices xoxo'));
$nli = new NoticeListItem($this->notice, $this);
$nli = new SingleNoticeItem($this->notice, $this);
$nli->show();
$this->elementEnd('ol');
}
@ -264,3 +264,29 @@ class ShownoticeAction extends Action
}
}
}
class SingleNoticeItem extends NoticeListItem
{
/**
* recipe function for displaying a single notice.
*
* We overload to show attachments.
*
* @return void
*/
function show()
{
$this->showStart();
$this->showNotice();
$this->showNoticeAttachments();
$this->showNoticeInfo();
$this->showNoticeOptions();
$this->showEnd();
}
function showNoticeAttachments() {
$al = new AttachmentList($this->notice, $this->out);
$al->show();
}
}

13
lib/noticelist.php
View File

@ -179,7 +179,6 @@ class NoticeListItem extends Widget
{
$this->showStart();
$this->showNotice();
$this->showNoticeAttachments();
$this->showNoticeInfo();
$this->showNoticeOptions();
$this->showEnd();
@ -193,18 +192,6 @@ class NoticeListItem extends Widget
$this->out->elementEnd('div');
}
function showNoticeAttachments() {
if ($this->isUsedInList()) {
return;
}
$al = new AttachmentList($this->notice, $this->out);
$al->show();
}
function isUsedInList() {
return 'shownotice' !== $this->out->args['action'];
}
function showNoticeInfo()
{
$this->out->elementStart('div', 'entry-content');