Resaved.
This commit is contained in:
parent
1b66ac64b7
commit
901b2acc9f
|
@ -179,7 +179,7 @@ class NoticeListItem
|
||||||
{
|
{
|
||||||
$this->elementStart('div', 'entry-title');
|
$this->elementStart('div', 'entry-title');
|
||||||
$this->showAuthor();
|
$this->showAuthor();
|
||||||
$this->showNoticeContent();
|
$this->showContent();
|
||||||
$this->elementEnd('div');
|
$this->elementEnd('div');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,6 +201,7 @@ class NoticeListItem
|
||||||
$this->elementEnd('div');
|
$this->elementEnd('div');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* start a single notice.
|
* start a single notice.
|
||||||
*
|
*
|
||||||
|
@ -243,13 +244,13 @@ class NoticeListItem
|
||||||
|
|
||||||
function showAuthor()
|
function showAuthor()
|
||||||
{
|
{
|
||||||
common_element_start('span', 'vcard author');
|
$this->elementStart('span', 'vcard author');
|
||||||
common_element_start('a', array('href' => $this->profile->profileurl,
|
$this->elementStart('a', array('href' => $this->profile->profileurl,
|
||||||
'class' => 'url'));
|
'class' => 'url'));
|
||||||
$this->showAvatar();
|
$this->showAvatar();
|
||||||
$this->showNickname();
|
$this->showNickname();
|
||||||
common_element_end('a');
|
$this->elementEnd('a');
|
||||||
common_element_end('span');
|
$this->elementEnd('span');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -265,7 +266,7 @@ class NoticeListItem
|
||||||
{
|
{
|
||||||
$avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
|
$avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
|
||||||
|
|
||||||
common_element('img', array('src' => ($avatar) ?
|
$this->element('img', array('src' => ($avatar) ?
|
||||||
common_avatar_display_url($avatar) :
|
common_avatar_display_url($avatar) :
|
||||||
common_default_avatar(AVATAR_STREAM_SIZE),
|
common_default_avatar(AVATAR_STREAM_SIZE),
|
||||||
'class' => 'avatar photo',
|
'class' => 'avatar photo',
|
||||||
|
@ -287,7 +288,7 @@ class NoticeListItem
|
||||||
|
|
||||||
function showNickname()
|
function showNickname()
|
||||||
{
|
{
|
||||||
common_element('span', array('class' => 'nickname fn'),
|
$this->element('span', array('class' => 'nickname fn'),
|
||||||
$this->profile->nickname);
|
$this->profile->nickname);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -304,7 +305,7 @@ class NoticeListItem
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
// FIXME: URL, image, video, audio
|
// FIXME: URL, image, video, audio
|
||||||
common_element_start('p', array('class' => 'content entry-title'));
|
common_element_start('p', array('class' => 'entry-content'));
|
||||||
if ($this->notice->rendered) {
|
if ($this->notice->rendered) {
|
||||||
common_raw($this->notice->rendered);
|
common_raw($this->notice->rendered);
|
||||||
} else {
|
} else {
|
||||||
|
@ -316,21 +317,6 @@ class NoticeListItem
|
||||||
common_element_end('p');
|
common_element_end('p');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* show the "time" section of a notice
|
|
||||||
*
|
|
||||||
* This is the greyed-out section that appears beneath the content, including
|
|
||||||
* links to delete or reply to the notice. Probably should be called something
|
|
||||||
* else.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
|
|
||||||
function startTimeSection()
|
|
||||||
{
|
|
||||||
common_element_start('p', 'time');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* show the link to the main page for the notice
|
* show the link to the main page for the notice
|
||||||
*
|
*
|
||||||
|
@ -474,17 +460,6 @@ class NoticeListItem
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* end the time section
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
|
|
||||||
function endTimeSection()
|
|
||||||
{
|
|
||||||
common_element_end('p');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* finish the notice
|
* finish the notice
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue
Block a user