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

consolidate show_notice and show_reply

Browse Source 
darcs-hash:20080707064155-84dde-fb6209b36ff8066335249c0602b2e78961f90c55.gz
This commit is contained in:
Evan Prodromou 2008-07-07 02:41:55 -04:00
parent dcb6ee8544
commit 7b50acbc52
2 changed files with 9 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/replies.php
View File

@ -80,7 +80,7 @@ class RepliesAction extends StreamAction {
$cnt = $reply->find(); $cnt = $reply->find();
if ($cnt > 0) { if ($cnt > 0) {
common_element_start('ul', array('id' => 'replies')); common_element_start('ul', array('id' => 'notices'));
for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
if ($reply->fetch()) { if ($reply->fetch()) {
$notice = new Notice(); $notice = new Notice();
@ -89,7 +89,7 @@ class RepliesAction extends StreamAction {
if (!$result) { if (!$result) {
continue; continue;
} }
$this->show_reply($notice, $reply->replied_id); $this->show_notice($notice, $reply->replied_id);
} else { } else {
// shouldn't happen! // shouldn't happen!
break; break;

46
lib/stream.php
View File

@ -57,7 +57,7 @@ class StreamAction extends Action {
common_element_end('ul'); common_element_end('ul');
} }
function show_notice($notice) { function show_notice($notice, $replied_id=NULL) {
global $config; global $config;
$profile = $notice->getProfile(); $profile = $notice->getProfile();
# XXX: RDFa # XXX: RDFa
@ -86,44 +86,12 @@ class StreamAction extends Action {
'href' => $noticeurl, 'href' => $noticeurl,
'title' => common_exact_date($notice->created)), 'title' => common_exact_date($notice->created)),
common_date_string($notice->created)); common_date_string($notice->created));
common_element_end('p'); if ($replied_id) {
common_element_end('li'); $replyurl = common_local_url('shownotice', array('notice' => $replied_id));
} common_element('a', array('class' => 'inreplyto',
'href' => $replyurl),
# XXX: these are almost identical functions! " in reply to ".$profile->nickname );
}
function show_reply($notice, $replied_id) {
global $config;
$profile = $notice->getProfile();
# XXX: RDFa
common_element_start('li', array('class' => 'notice_single',
'id' => 'notice-' . $notice->id));
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
common_element_start('a', array('href' => $profile->profileurl));
common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
'class' => 'avatar stream',
'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE,
'alt' =>
($profile->fullname) ? $profile->fullname :
$profile->nickname));
common_element_end('a');
common_element('a', array('href' => $profile->profileurl,
'class' => 'nickname'),
$profile->nickname);
# FIXME: URL, image, video, audio
common_element_start('p', array('class' => 'content'));
common_raw(common_render_content($notice->content, $notice));
common_element_end('p');
$replyurl = common_local_url('shownotice', array('notice' => $replied_id));
$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
common_element_start('p', 'time');
common_element('a', array('class' => 'notice',
'href' => $noticeurl),
common_date_string($notice->created));
common_element('a', array('class' => 'inreplyto',
'href' => $replyurl),
" in reply to ".$profile->nickname );
common_element_end('p'); common_element_end('p');
common_element_end('li'); common_element_end('li');
} }