float notices left

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

diff --git a/actions/showstream.php b/actions/showstream.php
index f64af63ec14ce9d884522298db7e18f697f178a5..eec54b68f9af8cee3ed9832553f07689e9d8c6be 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -55,6 +55,10 @@ class ShowstreamAction extends StreamAction {
                        $this->notice_form();
                }
 
+               $this->show_notices($profile);
+
+               common_element_start('div', 'sidebar width33 floatRight greenBg');
+
                $this->show_profile($profile);
 
                $this->show_last_notice($profile);
@@ -71,7 +75,7 @@ class ShowstreamAction extends StreamAction {
 
                $this->show_subscriptions($profile);
 
-               $this->show_notices($profile);
+               common_element_end('div');
 
                common_show_footer();
        }
@@ -83,10 +87,11 @@ class ShowstreamAction extends StreamAction {
        function notice_form() {
                common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
                                                                                   'action' => common_local_url('newnotice')));
-               common_element('textarea', array('rows' => 4, 'cols' => 80,
+               common_element('textarea', array('rows' => 3, 'cols' => 60,
                                                                                 'name' => 'content',
-                                                                                'id' => 'content'));
-               common_element('input', array('type' => 'submit', 'value' => 'Send'));
+                                                                                'id' => 'content'),
+                                          ' ');
+               common_submit('submit', _t('Send'));
                common_element_end('form');
        }
 
@@ -101,7 +106,7 @@ class ShowstreamAction extends StreamAction {
                                                                                'class' => 'avatar profile',
                                                                                'width' => AVATAR_PROFILE_SIZE,
                                                                                'height' => AVATAR_PROFILE_SIZE,
-                                                                               'title' => $profile->nickname));
+                                                                               'alt' => $profile->nickname));
                }
                if ($profile->fullname) {
                        if ($profile->homepage) {
@@ -118,6 +123,7 @@ class ShowstreamAction extends StreamAction {
                if ($profile->bio) {
                        common_element('div', 'bio', $profile->bio);
                }
+               common_element_end('div');
        }
 
        function show_subscribe_form($profile) {
@@ -160,15 +166,19 @@ class ShowstreamAction extends StreamAction {
                                        common_element_start('div', 'row');
                                }
 
-                               common_element_start('a', array('title' => $subs->fullname ||
+                               common_element_start('a', array('title' => ($subs->fullname) ?
+                                                                                               $subs->fullname :
                                                                                                $subs->nickname,
                                                                                                'href' => $subs->profileurl,
                                                                                                'class' => 'subscription'));
                                $avatar = $subs->getAvatar(AVATAR_MINI_SIZE);
                                common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_MINI_AVATAR),
                                                                                        'width' => AVATAR_MINI_SIZE,
-                                                                               'height' => AVATAR_MINI_SIZE,
-                                                                                       'class' => 'avatar mini'));
+                                                                                       'height' => AVATAR_MINI_SIZE,
+                                                                                       'class' => 'avatar mini',
+                                                                                       'alt' =>  ($subs->fullname) ?
+                                                                                               $subs->fullname :
+                                                                                               $subs->nickname));
                                common_element_end('a');
 
                                if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) {
@@ -245,7 +255,7 @@ class ShowstreamAction extends StreamAction {
 
                $notice->find();
 
-               common_element_start('div', 'notices');
+               common_element_start('div', 'notices width66 floatLeft');
                common_element('h2', 'notices', _t('Notices'));
 
                while ($notice->fetch()) {