add w3dtf date to rss 1.0 items

[quix0rs-gnu-social.git] / actions / showstream.php

diff --git a/actions/showstream.php b/actions/showstream.php
index b758761692328d654887f3bf8e4826fc29056853..7e887a9d9ec00dd07698b792dc21d7863d8d06f8 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -55,10 +55,10 @@ class ShowstreamAction extends StreamAction {
                        common_notice_form();
                }
 
-               $this->show_notices($profile);
-
                $this->show_sidebar($profile);
                
+               $this->show_notices($profile);
+               
                common_show_footer();
        }
 
@@ -92,8 +92,6 @@ class ShowstreamAction extends StreamAction {
        function show_profile($profile) {
                common_element_start('div', 'profile');
 
-               common_element('h2', 'nickname', $profile->nickname);
-
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
                if ($avatar) {
                        common_element('img', array('src' => $avatar->url,
@@ -103,16 +101,17 @@ class ShowstreamAction extends StreamAction {
                                                                                'alt' => $profile->nickname));
                }
                if ($profile->fullname) {
+                       common_element_start('div', 'fullname');
                        if ($profile->homepage) {
-                               common_element('a', array('href' => $profile->homepage,
-                                                                                 'class' => 'fullname'),
+                               common_element('a', array('href' => $profile->homepage),
                                                           $profile->fullname);
                        } else {
-                               common_element('span', 'fullname', $profile->fullname);
+                               common_text($profile->fullname);
                        }
+                       common_element_end('div');
                }
                if ($profile->location) {
-                       common_element('span', 'location', $profile->location);
+                       common_element('div', 'location', $profile->location);
                }
                if ($profile->bio) {
                        common_element('div', 'bio', $profile->bio);
@@ -143,7 +142,8 @@ class ShowstreamAction extends StreamAction {
        }
 
        function show_subscriptions($profile) {
-
+               global $config;
+               
                # XXX: add a limit
                $subs = $profile->getLink('id', 'subscription', 'subscriber');
 
@@ -166,7 +166,7 @@ class ShowstreamAction extends StreamAction {
                                                                                                'href' => $subs->profileurl,
                                                                                                'class' => 'subscription'));
                                $avatar = $subs->getAvatar(AVATAR_MINI_SIZE);
-                               common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_MINI_AVATAR),
+                               common_element('img', array('src' => (($avatar) ? $avatar->url : $config['avatar']['default']['mini']),
                                                                                        'width' => AVATAR_MINI_SIZE,
                                                                                        'height' => AVATAR_MINI_SIZE,
                                                                                        'class' => 'avatar mini',
@@ -293,6 +293,7 @@ class ShowstreamAction extends StreamAction {
                                                                  'href' => $noticeurl));
                common_element('span', 'title', common_date_string($notice->created));
                common_element('span', 'desc', $notice->content);
+               common_element_end('a');
                common_element_end('li');
        }
 }