take out spans

darcs-hash:20080528174621-84dde-41b0575e8a937aa8504a67edde66a8fb84222304.gz
This commit is contained in:
Evan Prodromou 2008-05-28 13:46:21 -04:00
parent bf4ca7e302
commit fe66871f03

View File

@ -34,7 +34,6 @@ class StreamAction extends Action {
common_element_start('div', array('class' => 'notice', common_element_start('div', array('class' => 'notice',
'id' => 'notice-' . $notice->id)); 'id' => 'notice-' . $notice->id));
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
common_element_start('span', 'floatLeft width25');
common_element_start('a', array('href' => $profile->profileurl)); common_element_start('a', array('href' => $profile->profileurl));
common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE), common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
'class' => 'avatar stream floatLeft', 'class' => 'avatar stream floatLeft',
@ -44,18 +43,15 @@ class StreamAction extends Action {
($profile->fullname) ? $profile->fullname : ($profile->fullname) ? $profile->fullname :
$profile->nickname)); $profile->nickname));
common_element_end('a'); common_element_end('a');
common_element_end('span');
common_element_start('span', 'floatRight width75');
common_element('a', array('href' => $profile->profileurl, common_element('a', array('href' => $profile->profileurl,
'class' => 'nickname'), 'class' => 'nickname'),
$profile->nickname); $profile->nickname);
# FIXME: URL, image, video, audio # FIXME: URL, image, video, audio
common_element('span', array('class' => 'content'), $notice->content); common_element('span', array('class' => 'content'), common_render_content($notice->content));
$noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
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_end('span');
common_element_end('div'); common_element_end('div');
} }
} }