correctly show the blog content for blog entries

This commit is contained in:
Evan Prodromou 2011-08-24 14:57:05 -04:00
parent 8e2a9bfa5b
commit b5c5d8d393
1 changed files with 22 additions and 6 deletions

View File

@ -71,15 +71,31 @@ class BlogEntryListItem extends NoticeListItemAdapter
$out->element('a', array('href' => $notice->bestUrl()), $entry->title); $out->element('a', array('href' => $notice->bestUrl()), $entry->title);
$out->elementEnd('h4'); $out->elementEnd('h4');
if (!empty($entry->summary)) { // XXX: kind of a hack
$out->elementStart('div', 'blog-entry-summary');
$out->raw($entry->summary); $actionName = $out->trimmed('action');
$out->elementEnd('div');
} else { if ($actionName == 'shownotice' ||
// XXX: hide content initially; click More... for full text. $actionName == 'showblogentry' ||
$actionName == 'conversation') {
$out->elementStart('div', 'blog-entry-content'); $out->elementStart('div', 'blog-entry-content');
$out->raw($entry->content); $out->raw($entry->content);
$out->elementEnd('div'); $out->elementEnd('div');
} else {
if (!empty($entry->summary)) {
$out->elementStart('div', 'blog-entry-summary');
$out->raw($entry->summary);
$out->elementEnd('div');
}
$url = ($entry->url) ? $entry->url : $notice->bestUrl();
$out->element('a',
array('href' => $url,
'class' => 'blog-entry-link'),
_('More...'));
} }
} }
} }