X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=c66718cfe86ea3e672491b3a68c80d06dcea91e1;hb=182aa9a101f31d476e4e1528f611778ef7f628dc;hp=fff7c9f56c50bc64981a141293503b563c0ce107;hpb=2e07d5cf01320d19e051a65d6ffd59a218c3ea0d;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index fff7c9f56c..c66718cfe8 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -47,18 +47,47 @@ class ShowstreamAction extends StreamAction {
 
 		# Looks like we're good; show the header
 
-		common_show_header($profile->nickname);
+		common_show_header($profile->nickname, array($this, 'show_header'), $user);
 
 		$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 show_header($user) {
+		common_element('link', array('rel' => 'alternate',
+									 'href' => common_local_url('userrss', array('nickname' =>
+																			   $user->nickname)),
+									 'type' => 'application/rss+xml',
+									 'title' => _t('Notice feed for ') . $user->nickname));
+		# for remote subscriptions etc.
+		common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+									 'content' => common_local_url('xrds', array('nickname' =>
+																			   $user->nickname))));
+	}
+	
+	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);
 
+		$cur = common_current_user();
+
 		if ($cur && $cur->id != $profile->id) {
 			if ($cur->isSubscribed($profile)) {
 				$this->show_unsubscribe_form($profile);
@@ -71,54 +100,37 @@ 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_start_element('textarea', array('rows' => 4, 'cols' => 80,
-											   'name' => 'content',
-											   'id' => 'content'));
-		common_end_element('textarea');
-		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');
 
-		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));
 		}
 		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);
 		}
+		common_element_end('div');
 	}
 
 	function show_subscribe_form($profile) {
@@ -128,7 +140,9 @@ class ShowstreamAction extends StreamAction {
 									  'name' => 'subscribeto',
 									  'type' => 'hidden',
 									  'value' => $profile->nickname));
-		common_element('input', array('type' => 'submit', 'value' => _t('Subscribe')));
+		common_element('input', array('type' => 'submit',
+									  'class' => 'button',
+									  'value' => _t('Subscribe')));
 		common_element_end('form');
 	}
 
@@ -139,47 +153,66 @@ 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',
+									  'class' => 'button',
+									  'value' => _t('Unsubscribe')));
 		common_element_end('form');
 	}
 
 	function show_subscriptions($profile) {
-
+		global $config;
+		
 		# XXX: add a limit
-		$subs = $profile->getLink('id', 'subscription', 'subscriber');
+		$subs = DB_DataObject::factory('subscription');
+		$subs->subscriber = $profile->id;
+
+		# We ask for an extra one to know if we need to do another page
+
+		$subs->limit(0, SUBSCRIPTIONS);
+
+		$subs_count = $subs->find();
 
 		common_element_start('div', 'subscriptions');
 
 		common_element('h2', 'subscriptions', _t('Subscriptions'));
 
-		$cnt = 0;
-
-		if ($subs) {
-			while ($subs->fetch()) {
-				$cnt++;
-				if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) {
-					common_element_start('div', 'row');
-				}
-
-				common_element_start('a', array('title' => $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'));
-				common_element_end('a');
-
-				if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) {
-					common_element_end('div');
-				}
-
-				if ($cnt == SUBSCRIPTIONS) {
-					break;
-				}
+		$idx = 0;
+
+		while ($subs->fetch()) {
+			$idx++;
+			if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
+				common_element_start('div', 'row');
+			}
+			
+			$other = Profile::staticGet($subs->subscribed);
+			
+			common_element_start('a', array('title' => ($other->fullname) ?
+											$other->fullname :
+											$other->nickname,
+											'href' => $other->profileurl,
+											'class' => 'subscription'));
+			$avatar = $other->getAvatar(AVATAR_MINI_SIZE);
+			common_element('img', array('src' => (($avatar) ? $avatar->url :  common_default_avatar(AVATAR_MINI_SIZE)),
+										'width' => AVATAR_MINI_SIZE,
+										'height' => AVATAR_MINI_SIZE,
+										'class' => 'avatar mini',
+										'alt' =>  ($other->fullname) ?
+										$other->fullname :
+										$other->nickname));
+			common_element_end('a');
+			
+			if ($idx % SUBSCRIPTIONS_PER_ROW == 0) {
+				common_element_end('div');
 			}
+			
+			if ($idx == SUBSCRIPTIONS) {
+				break;
+			}
+		}
+
+		# close any unclosed row
+		if ($idx % SUBSCRIPTIONS_PER_ROW != 0) {
+			common_element_end('div');
 		}
 
 		common_element('a', array('href' => common_local_url('subscriptions',
@@ -195,27 +228,15 @@ class ShowstreamAction extends StreamAction {
 		// XXX: WORM cache this
 		$subs = DB_DataObject::factory('subscription');
 		$subs->subscriber = $profile->id;
-		$subs_count = $subs->count();
-
-		if (!$subs_count) {
-			$subs_count = 0;
-		}
+		$subs_count = (int) $subs->count();
 
 		$subbed = DB_DataObject::factory('subscription');
 		$subbed->subscribed = $profile->id;
-		$subbed_count = $subbed->count();
-
-		if (!$subbed_count) {
-			$subbed_count = 0;
-		}
+		$subbed_count = (int) $subbed->count();
 
 		$notices = DB_DataObject::factory('notice');
 		$notices->profile_id = $profile->id;
-		$notice_count = $notices->count();
-
-		if (!$notice_count) {
-			$notice_count = 0;
-		}
+		$notice_count = (int) $notices->count();
 
 		common_element_start('div', 'statistics');
 		common_element('h2', 'statistics', _t('Statistics'));
@@ -240,18 +261,47 @@ class ShowstreamAction extends StreamAction {
 
 		$notice->orderBy('created DESC');
 
-		$page = $this->arg('page') || 1;
+		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE);
+		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-		$notice->find();
+		$cnt = $notice->find();
 
-		common_element_start('div', 'notices');
-		common_element('h2', 'notices', _t('Notices'));
+		common_element_start('div', 'notices width66 floatLeft');
 
-		while ($notice->fetch()) {
-			$this->show_notice($notice);
+		common_element_start('ul', 'bigLinks');
+
+		for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+			if ($notice->fetch()) {
+				$this->show_notice($notice);
+			} else {
+				// shouldn't happen!
+				break;
+			}
 		}
+		
+		common_element_end('ul');
+
+		if ($page > 1) {
+			common_element_start('span', 'floatLeft width25');
+			common_element('a', array('href' => common_local_url('showstream', 
+																 array('nickname' => $profile->nickname,
+																	   'page' => $page-1)),
+									  'class' => 'newer'),
+						   _t('Newer'));
+			common_element_end('span');
+		}
+		
+		if ($cnt > NOTICES_PER_PAGE) {
+			common_element_start('span', 'floatRight width25');
+			common_element('a', array('href' => common_local_url('showstream', 
+																 array('nickname' => $profile->nickname,
+																	   'page' => $page+1)),
+									  'class' => 'older'),
+						   _t('Older'));
+			common_element_end('span');
+		}
+		
 		# XXX: show a link for the next page
 		common_element_end('div');
 	}
@@ -270,10 +320,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');
+	}
 }