X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=30930de25a64351ce052b62f6cd192f12bbe06ed;hb=53eeee70e7eaba81b44f35d787b218f8ebaa69e6;hp=5e8802cd7297723c9d1d4736847bcb5ad081ad51;hpb=e70b7d3a6c82358e38a65eade5753b5ba33ab51a;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index 5e8802cd72..30930de25a 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -52,9 +52,24 @@ class ShowstreamAction extends StreamAction {
 		$cur = common_current_user();
 
 		if ($cur && $profile->id == $cur->id) {
-			$this->notice_form();
+			common_notice_form();
 		}
 
+		$this->show_sidebar($profile);
+		
+		$this->show_notices($profile);
+		
+		common_show_footer();
+	}
+
+	function no_such_user() {
+		common_user_error('No such user');
+	}
+
+	function show_sidebar($profile) {
+
+		common_element_start('div', 'sidebar width33 floatRight greenBg');
+
 		$this->show_profile($profile);
 
 		$this->show_last_notice($profile);
@@ -71,26 +86,9 @@ class ShowstreamAction extends StreamAction {
 
 		$this->show_subscriptions($profile);
 
-		$this->show_notices($profile);
-
-		common_show_footer();
-	}
-
-	function no_such_user() {
-		common_user_error('No such user');
-	}
-
-	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,
-										 'name' => 'content',
-										 'id' => 'content'),
-					   ' ');
-		common_element('input', array('type' => 'submit', 'value' => 'Send'));
-		common_element_end('form');
+		common_element_end('div');
 	}
-
+	
 	function show_profile($profile) {
 		common_element_start('div', 'profile');
 
@@ -102,7 +100,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) {
@@ -119,6 +117,7 @@ class ShowstreamAction extends StreamAction {
 		if ($profile->bio) {
 			common_element('div', 'bio', $profile->bio);
 		}
+		common_element_end('div');
 	}
 
 	function show_subscribe_form($profile) {
@@ -144,7 +143,8 @@ class ShowstreamAction extends StreamAction {
 	}
 
 	function show_subscriptions($profile) {
-
+		global $config;
+		
 		# XXX: add a limit
 		$subs = $profile->getLink('id', 'subscription', 'subscriber');
 
@@ -161,15 +161,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),
+				common_element('img', array('src' => (($avatar) ? $avatar->url : $config['avatar']['default']['mini']),
 											'width' => AVATAR_MINI_SIZE,
 											'height' => AVATAR_MINI_SIZE,
-											'class' => 'avatar mini'));
+											'class' => 'avatar mini',
+											'alt' =>  ($subs->fullname) ?
+												$subs->fullname :
+												$subs->nickname));
 				common_element_end('a');
 
 				if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) {
@@ -246,12 +250,16 @@ class ShowstreamAction extends StreamAction {
 
 		$notice->find();
 
-		common_element_start('div', 'notices');
-		common_element('h2', 'notices', _t('Notices'));
+		common_element_start('div', 'notices width66 floatLeft');
 
+		common_element_start('ul', 'bigLinks');
+		
 		while ($notice->fetch()) {
 			$this->show_notice($notice);
 		}
+		
+		common_element_end('ul');
+		
 		# XXX: show a link for the next page
 		common_element_end('div');
 	}
@@ -270,10 +278,23 @@ class ShowstreamAction extends StreamAction {
 			# FIXME: URL, image, video, audio
 			common_element('span', array('class' => 'content'),
 						   $notice->content);
-			common_element('span', array('class' => 'date'),
-						   common_date_string($notice->created));
 		}
 
 		common_element_end('div');
 	}
+	
+	function show_notice($notice) {
+		$profile = $notice->getProfile();
+		# XXX: RDFa
+		common_element_start('li', array('class' => 'notice',
+										 'id' => 'notice-' . $notice->id));
+		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+		# FIXME: URL, image, video, audio
+		common_element_start('a', array('class' => 'notice',
+								  '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');
+	}
 }