X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fshowstream.php;h=eec54b68f9af8cee3ed9832553f07689e9d8c6be;hb=778fba1a24712c85b525a65d3e4c0862e0833cdd;hp=5c49832229facb47907c0f9917fb1920a74a8475;hpb=f94352ec2617757d692de49cf78cbdf890df200e;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index 5c49832229..eec54b68f9 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -35,12 +35,14 @@ class ShowstreamAction extends StreamAction {
 
 		if (!$user) {
 			$this->no_such_user();
+			return;
 		}
 
 		$profile = $user->getProfile();
 
 		if (!$profile) {
 			common_server_error(_t('User record exists without profile.'));
+			return;
 		}
 
 		# Looks like we're good; show the header
@@ -53,11 +55,15 @@ 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);
 
-		if ($cur) {
+		if ($cur && $cur->id != $profile->id) {
 			if ($cur->isSubscribed($profile)) {
 				$this->show_unsubscribe_form($profile);
 			} else {
@@ -69,7 +75,7 @@ class ShowstreamAction extends StreamAction {
 
 		$this->show_subscriptions($profile);
 
-		$this->show_notices($profile);
+		common_element_end('div');
 
 		common_show_footer();
 	}
@@ -81,22 +87,27 @@ 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, 'id' => 'content'));
-		common_element('input', array('type' => 'submit', 'value' => 'Send'));
+		common_element('textarea', array('rows' => 3, 'cols' => 60,
+										 'name' => 'content',
+										 'id' => 'content'),
+					   ' ');
+		common_submit('submit', _t('Send'));
 		common_element_end('form');
 	}
 
 	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,
 										'class' => 'avatar profile',
 										'width' => AVATAR_PROFILE_SIZE,
 										'height' => AVATAR_PROFILE_SIZE,
-										'title' => $profile->nickname));
+										'alt' => $profile->nickname));
 		}
-		common_element('span', 'nickname', $profile->nickname);
 		if ($profile->fullname) {
 			if ($profile->homepage) {
 				common_element('a', array('href' => $profile->homepage,
@@ -112,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) {
@@ -121,7 +133,7 @@ class ShowstreamAction extends StreamAction {
 									  'name' => 'subscribeto',
 									  'type' => 'hidden',
 									  'value' => $profile->nickname));
-		common_element('input', array('type' => 'submit'), _t('subscribe'));
+		common_element('input', array('type' => 'submit', 'value' => _t('Subscribe')));
 		common_element_end('form');
 	}
 
@@ -132,7 +144,7 @@ class ShowstreamAction extends StreamAction {
 									  'name' => 'unsubscribeto',
 									  'type' => 'hidden',
 									  'value' => $profile->nickname));
-		common_element('input', array('type' => 'submit'), _t('unsubscribe'));
+		common_element('input', array('type' => 'submit'), _t('Unsubscribe'));
 		common_element_end('form');
 	}
 
@@ -143,6 +155,8 @@ class ShowstreamAction extends StreamAction {
 
 		common_element_start('div', 'subscriptions');
 
+		common_element('h2', 'subscriptions', _t('Subscriptions'));
+
 		$cnt = 0;
 
 		if ($subs) {
@@ -152,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) {
@@ -188,23 +206,40 @@ class ShowstreamAction extends StreamAction {
 		$subs->subscriber = $profile->id;
 		$subs_count = $subs->count();
 
+		if (!$subs_count) {
+			$subs_count = 0;
+		}
+
 		$subbed = DB_DataObject::factory('subscription');
 		$subbed->subscribed = $profile->id;
 		$subbed_count = $subbed->count();
 
+		if (!$subbed_count) {
+			$subbed_count = 0;
+		}
+
 		$notices = DB_DataObject::factory('notice');
 		$notices->profile_id = $profile->id;
 		$notice_count = $notices->count();
 
+		if (!$notice_count) {
+			$notice_count = 0;
+		}
+
+		common_element_start('div', 'statistics');
+		common_element('h2', 'statistics', _t('Statistics'));
+
 		# Other stats...?
 		common_element_start('dl', 'statistics');
-		common_element('dt', _t('Subscriptions'));
-		common_element('dd', $subs_count);
-		common_element('dt', _t('Subscribers'));
-		common_element('dd', $subbed_count);
-		common_element('dt', _t('Notices'));
-		common_element('dd', $notice_count);
+		common_element('dt', 'subscriptions', _t('Subscriptions'));
+		common_element('dd', 'subscriptions', $subs_count);
+		common_element('dt', 'subscribers', _t('Subscribers'));
+		common_element('dd', 'subscribers', $subbed_count);
+		common_element('dt', 'notices', _t('Notices'));
+		common_element('dd', 'notices', $notice_count);
 		common_element_end('dl');
+
+		common_element_end('div');
 	}
 
 	function show_notices($profile) {
@@ -216,32 +251,38 @@ class ShowstreamAction extends StreamAction {
 
 		$page = $this->arg('page') || 1;
 
-		$notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE);
+		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE);
 
 		$notice->find();
 
-		common_element_start('div', 'notices');
+		common_element_start('div', 'notices width66 floatLeft');
+		common_element('h2', 'notices', _t('Notices'));
 
 		while ($notice->fetch()) {
 			$this->show_notice($notice);
 		}
-
+		# XXX: show a link for the next page
 		common_element_end('div');
 	}
 
 	function show_last_notice($profile) {
+
+		common_element_start('div', 'lastnotice');
+		common_element('h2', 'lastnotice', _t('Currently'));
+
 		$notice = DB_DataObject::factory('notice');
 		$notice->profile_id = $profile->id;
 		$notice->orderBy('created DESC');
-		$notice->limit(1, 1);
-		$notice->find();
+		$notice->limit(0, 1);
 
-		while ($notice->fetch()) {
+		if ($notice->find(true)) {
 			# 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');
 	}
 }