change measurement of updated profiles

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 6db475a3157f0ce5f78dae7a72b4abaf8856388a..30930de25a64351ce052b62f6cd192f12bbe06ed 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();
        }
 
@@ -68,7 +68,7 @@ class ShowstreamAction extends StreamAction {
 
        function show_sidebar($profile) {
 
-               common_element_start('div', 'sidebar width25 floatRight greenBg');
+               common_element_start('div', 'sidebar width33 floatRight greenBg');
 
                $this->show_profile($profile);
 
@@ -143,7 +143,8 @@ class ShowstreamAction extends StreamAction {
        }
 
        function show_subscriptions($profile) {
-
+               global $config;
+               
                # XXX: add a limit
                $subs = $profile->getLink('id', 'subscription', 'subscriber');
 
@@ -166,7 +167,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',
@@ -249,7 +250,7 @@ class ShowstreamAction extends StreamAction {
 
                $notice->find();
 
-               common_element_start('div', 'notices width75 floatLeft');
+               common_element_start('div', 'notices width66 floatLeft');
 
                common_element_start('ul', 'bigLinks');
                
@@ -293,6 +294,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');
        }
 }