summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-07-07 02:41:55 -0400
committerEvan Prodromou <evan@prodromou.name>2008-07-07 02:41:55 -0400
commit7b50acbc524159ed13c56dd28706f5c359c0073d (patch)
tree17b423f741147c5106eb8bd01e400dbc8b7a3210
parentdcb6ee85448c555c43d8a0260d85f901a662df7b (diff)
consolidate show_notice and show_reply
darcs-hash:20080707064155-84dde-fb6209b36ff8066335249c0602b2e78961f90c55.gz
-rw-r--r--actions/replies.php4
-rw-r--r--lib/stream.php46
2 files changed, 9 insertions, 41 deletions
diff --git a/actions/replies.php b/actions/replies.php
index a371f3787..463d9e338 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -80,7 +80,7 @@ class RepliesAction extends StreamAction {
$cnt = $reply->find();
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++) {
if ($reply->fetch()) {
$notice = new Notice();
@@ -89,7 +89,7 @@ class RepliesAction extends StreamAction {
if (!$result) {
continue;
}
- $this->show_reply($notice, $reply->replied_id);
+ $this->show_notice($notice, $reply->replied_id);
} else {
// shouldn't happen!
break;
diff --git a/lib/stream.php b/lib/stream.php
index e29b64c60..6c83c1656 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -57,7 +57,7 @@ class StreamAction extends Action {
common_element_end('ul');
}
- function show_notice($notice) {
+ function show_notice($notice, $replied_id=NULL) {
global $config;
$profile = $notice->getProfile();
# XXX: RDFa
@@ -86,44 +86,12 @@ class StreamAction extends Action {
'href' => $noticeurl,
'title' => common_exact_date($notice->created)),
common_date_string($notice->created));
- common_element_end('p');
- common_element_end('li');
- }
-
- # XXX: these are almost identical functions!
-
- 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 );
+ if ($replied_id) {
+ $replyurl = common_local_url('shownotice', array('notice' => $replied_id));
+ common_element('a', array('class' => 'inreplyto',
+ 'href' => $replyurl),
+ " in reply to ".$profile->nickname );
+ }
common_element_end('p');
common_element_end('li');
}