reformat showstream

darcs-hash:20080529164411-84dde-1a54ecf1e6acec0e9a6105b8a7e68af2d1c18846.gz
This commit is contained in:
Evan Prodromou 2008-05-29 12:44:11 -04:00
parent 066f6843fe
commit 6cbd424030

View File

@ -269,8 +269,6 @@ class ShowstreamAction extends StreamAction {
common_element_start('div', 'notices width66 floatLeft'); common_element_start('div', 'notices width66 floatLeft');
common_element_start('ul', 'notices');
for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
if ($notice->fetch()) { if ($notice->fetch()) {
$this->show_notice($notice); $this->show_notice($notice);
@ -280,8 +278,6 @@ class ShowstreamAction extends StreamAction {
} }
} }
common_element_end('ul');
if ($page > 1) { if ($page > 1) {
common_element_start('span', 'floatLeft width25'); common_element_start('span', 'floatLeft width25');
common_element('a', array('href' => common_local_url('showstream', common_element('a', array('href' => common_local_url('showstream',
@ -329,16 +325,16 @@ class ShowstreamAction extends StreamAction {
function show_notice($notice) { function show_notice($notice) {
$profile = $notice->getProfile(); $profile = $notice->getProfile();
# XXX: RDFa # XXX: RDFa
common_element_start('li', array('class' => 'notice', common_element_start('div', array('class' => 'notice',
'id' => 'notice-' . $notice->id)); 'id' => 'notice-' . $notice->id));
$noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
# FIXME: URL, image, video, audio # FIXME: URL, image, video, audio
common_element_start('span', array('class' => 'content'));
common_raw(common_render_content($notice->content));
common_element_end('span');
common_element('a', array('class' => 'notice', common_element('a', array('class' => 'notice',
'href' => $noticeurl), 'href' => $noticeurl),
common_date_string($notice->created)); common_date_string($notice->created));
common_element_start('span', array('class' => 'desc')); common_element_end('div');
common_raw(common_render_content($notice->content));
common_element_end('span');
common_element_end('li');
} }
} }