X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=actions%2Fshowstream.php;h=7ccdc894ff82c12e2ce9f09316e83971a89fa989;hb=50c7e4c722a39582c185eafe452f0b321dd39e7e;hp=b54aad855789616212ec9e3a7789e526ef9be422;hpb=cb0dfba149358f1adcf8ec283d2646e3f11495b4;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index b54aad8557..7ccdc894ff 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -52,27 +52,39 @@ class ShowstreamAction extends StreamAction {
 		header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
 																   $user->nickname)));
 
-		common_show_header($profile->nickname, array($this, 'show_header'), $user);
+		common_show_header($profile->nickname, 
+						   array($this, 'show_header'), $user,
+						   array($this, 'show_top'));
 
-		$cur = common_current_user();
-
-		if ($cur && $profile->id == $cur->id) {
-			common_notice_form();
-		}
-
-		$this->show_sidebar($profile);
+		$this->show_profile($profile);
 
 		$this->show_notices($profile);
 
 		common_show_footer();
 	}
 
+	function show_top($user) {
+		
+		$cur = common_current_user();
+		
+		if ($cur && $cur->id == $user->id) {
+			common_notice_form('showstream');
+		}
+		
+		$this->views_menu();
+	}
+	
 	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));
+		common_element('link', array('rel' => 'meta',
+									 'href' => common_local_url('foaf', array('nickname' =>
+																			  $user->nickname)),
+									 'type' => 'application/rdf+xml',
+									 'title' => 'FOAF'));
 		# for remote subscriptions etc.
 		common_element('meta', array('http-equiv' => 'X-XRDS-Location',
 									 'content' => common_local_url('xrds', array('nickname' =>
@@ -83,16 +95,31 @@ class ShowstreamAction extends StreamAction {
 		common_user_error('No such user');
 	}
 
-	function show_sidebar($profile) {
+	function show_profile($profile) {
 
-		common_element_start('div', 'sidebar width33 floatRight greenBg');
+		common_element_start('div', array('id' => 'profile'));
 
-		$this->show_profile($profile);
+		$this->show_personal($profile);
 
 		$this->show_last_notice($profile);
 
 		$cur = common_current_user();
 
+		$this->show_subscriptions($profile);
+
+		common_element_end('div');
+	}
+
+	function show_personal($profile) {
+
+		$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+		common_element_start('div', array('id' => 'profile_avatar'));
+		common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_PROFILE_SIZE),
+									'class' => 'avatar profile',
+									'width' => AVATAR_PROFILE_SIZE,
+									'height' => AVATAR_PROFILE_SIZE,
+									'alt' => $profile->nickname));
+		$cur = common_current_user();
 		if ($cur) {
 			if ($cur->id != $profile->id) {
 				if ($cur->isSubscribed($profile)) {
@@ -104,41 +131,28 @@ class ShowstreamAction extends StreamAction {
 		} else {
 			$this->show_remote_subscribe_form($profile);
 		}
-
-		$this->show_statistics($profile);
-
-		$this->show_subscriptions($profile);
-
 		common_element_end('div');
-	}
 
-	function show_profile($profile) {
-		common_element_start('div', 'profile');
-
-		$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,
-										'alt' => $profile->nickname));
-		}
+		common_element_start('div', array('id' => 'profile_information'));
+		
 		if ($profile->fullname) {
-			common_element_start('div', 'fullname');
-			if ($profile->homepage) {
-				common_element('a', array('href' => $profile->homepage),
-							   $profile->fullname);
-			} else {
-				common_text($profile->fullname);
-			}
-			common_element_end('div');
+			common_element('h1', NULL, $profile->fullname);
 		}
 		if ($profile->location) {
-			common_element('div', 'location', $profile->location);
+			common_element('p', 'location', $profile->location);
 		}
 		if ($profile->bio) {
-			common_element('div', 'bio', $profile->bio);
+			common_element('p', 'description', htmlspecialchars($profile->bio));
+		}
+		if ($profile->homepage) {
+			common_element_start('p', 'website');
+			common_element('a', array('href' => $profile->homepage),
+						   $profile->homepage);
+			common_element_end('p');
 		}
+		
+		$this->show_statistics($profile);
+
 		common_element_end('div');
 	}
 
@@ -150,7 +164,7 @@ class ShowstreamAction extends StreamAction {
 									  'type' => 'hidden',
 									  'value' => $profile->nickname));
 		common_element('input', array('type' => 'submit',
-									  'class' => 'button',
+									  'class' => 'submit',
 									  'value' => _t('Subscribe')));
 		common_element_end('form');
 	}
@@ -160,15 +174,15 @@ class ShowstreamAction extends StreamAction {
 										   'method' => 'POST',
 										   'action' => common_local_url('remotesubscribe')));
 		common_hidden('nickname', $profile->nickname);
-		common_element('input', array('name' => 'profile',
+		common_element('input', array('name' => 'profile_url',
 									  'type' => 'text',
-									  'id' => 'profile',
+									  'id' => 'profile_url',
 									  'size' => '15'));
 		common_element('input', array('type' => 'submit',
 									  'id' => 'submit',
 									  'name' => 'submit',
 									  'value' => _t('Subscribe'),
-									  'class' => 'button'));
+									  'class' => 'submit'));
 		common_element_end('form');
 	}
 
@@ -180,7 +194,7 @@ class ShowstreamAction extends StreamAction {
 									  'type' => 'hidden',
 									  'value' => $profile->nickname));
 		common_element('input', array('type' => 'submit',
-									  'class' => 'button',
+									  'class' => 'submit',
 									  'value' => _t('Unsubscribe')));
 		common_element_end('form');
 	}
@@ -188,64 +202,64 @@ class ShowstreamAction extends StreamAction {
 	function show_subscriptions($profile) {
 		global $config;
 
-		# XXX: add a limit
 		$subs = DB_DataObject::factory('subscription');
 		$subs->subscriber = $profile->id;
-
+		$subs->orderBy('created DESC');
+		
 		# We ask for an extra one to know if we need to do another page
 
-		$subs->limit(0, SUBSCRIPTIONS);
+		$subs->limit(0, SUBSCRIPTIONS + 1);
 
 		$subs_count = $subs->find();
 
-		common_element_start('div', 'subscriptions');
-
-		common_element('h2', 'subscriptions', _t('Subscriptions'));
-
-		$idx = 0;
+		common_element_start('div', array('id' => 'subscriptions'));
 
-		while ($subs->fetch()) {
-			$idx++;
-			if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
-				common_element_start('div', 'row');
-			}
+		common_element('h2', NULL, _t('Subscriptions'));
 
-			$other = Profile::staticGet($subs->subscribed);
+		if ($subs_count > 0) {
+			
+			common_element_start('ul', array('id' => 'subscriptions_avatars'));
+			
+			for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
+				
+				if (!$subs->fetch()) {
+					common_debug('Weirdly, broke out of subscriptions loop early', __FILE__);
+					break;
+				}
 
-			common_element_start('a', array('title' => ($other->fullname) ?
+				$other = Profile::staticGet($subs->subscribed);
+
+				common_element_start('li');
+				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,
-											'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;
+											$other->nickname));
+				common_element_end('a');
+				common_element_end('li');
 			}
+			
+			common_element_end('ul');
 		}
 
-		# close any unclosed row
-		if ($idx % SUBSCRIPTIONS_PER_ROW != 0) {
-			common_element_end('div');
+		if ($subs_count > SUBSCRIPTIONS) {
+			common_element_start('p', array('id' => 'subscriptions_viewall'));
+			
+			common_element('a', array('href' => common_local_url('subscriptions',
+																 array('nickname' => $profile->nickname)),
+									  'class' => 'moresubscriptions'),
+						   _t('All subscriptions'));
+			common_element_end('p');
 		}
-
-		common_element('a', array('href' => common_local_url('subscriptions',
-															 array('nickname' => $profile->nickname)),
-								  'class' => 'moresubscriptions'),
-					   _t('All subscriptions'));
-
+		
 		common_element_end('div');
 	}
 
@@ -269,9 +283,17 @@ class ShowstreamAction extends StreamAction {
 
 		# Other stats...?
 		common_element_start('dl', 'statistics');
-		common_element('dt', 'subscriptions', _t('Subscriptions'));
+		common_element_start('dt', 'subscriptions');
+		common_element('a', array('href' => common_local_url('subscriptions',
+															 array('nickname' => $profile->nickname))),
+					   _t('Subscriptions'));
+		common_element_end('dt');
 		common_element('dd', 'subscriptions', $subs_count);
-		common_element('dt', 'subscribers', _t('Subscribers'));
+		common_element_start('dt', 'subscribers');
+		common_element('a', array('href' => common_local_url('subscribers',
+															 array('nickname' => $profile->nickname))),
+					   _t('Subscribers'));
+		common_element_end('dt');
 		common_element('dd', 'subscribers', $subbed_count);
 		common_element('dt', 'notices', _t('Notices'));
 		common_element('dd', 'notices', $notice_count);
@@ -293,45 +315,27 @@ class ShowstreamAction extends StreamAction {
 
 		$cnt = $notice->find();
 
-		common_element_start('div', 'notices width66 floatLeft');
-
-		for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-			if ($notice->fetch()) {
-				$this->show_notice($notice);
-			} else {
-				// shouldn't happen!
-				break;
+		if ($cnt > 0) {
+			common_element_start('ul', array('id' => 'notices'));
+			
+			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');
+		common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,
+						  'showstream', array('nickname' => $profile->nickname));
 	}
 
 	function show_last_notice($profile) {
 
-		common_element_start('div', 'lastnotice');
-		common_element('h2', 'lastnotice', _t('Currently'));
+		common_element('h2', NULL, _t('Currently'));
 
 		$notice = DB_DataObject::factory('notice');
 		$notice->profile_id = $profile->id;
@@ -340,27 +344,27 @@ class ShowstreamAction extends StreamAction {
 
 		if ($notice->find(true)) {
 			# FIXME: URL, image, video, audio
-			common_element_start('span', array('class' => 'content'));
+			common_element_start('p', array('class' => 'notice_current'));
 			common_raw(common_render_content($notice->content, $notice));
-			common_element_end('span');
+			common_element_end('p');
 		}
-
-		common_element_end('div');
 	}
 
 	function show_notice($notice) {
 		$profile = $notice->getProfile();
 		# XXX: RDFa
-		common_element_start('div', array('class' => 'notice',
-										  'id' => 'notice-' . $notice->id));
+		common_element_start('li', array('class' => 'notice_single',
+										 'id' => 'notice-' . $notice->id));
 		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
 		# FIXME: URL, image, video, audio
-		common_element_start('span', array('class' => 'content'));
+		common_element_start('p');
 		common_raw(common_render_content($notice->content, $notice));
-		common_element_end('span');
+		common_element_end('p');
+		common_element_start('p', array('class' => 'time'));
 		common_element('a', array('class' => 'notice',
 								  'href' => $noticeurl),
 					   common_date_string($notice->created));
-		common_element_end('div');
+		common_element_end('p');
+		common_element_end('li');
 	}
 }