X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=d8bd1f5629103aa8aa47c1ab5e5f76ee3a8d8e11;hb=34cdd4ebd017d9829c47829ee57fb259700dc75b;hp=e167691187c344d93ce7d06473d4db85401cc62b;hpb=52600ce0b063e68e622b19699841e41b5ddbf2d1;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index e167691187..d8bd1f5629 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -27,15 +27,33 @@ class StreamAction extends Action {
 		parent::handle($args);
 	}
 
-	# XXX: for 'showstream' repeats same avatar over and over
+	function views_menu() {
+		$action = $this->trimmed('action');
+		$nickname = $this->trimmed('nickname');
+		
+		common_element_start('ul', array('id' => 'nav_views'));
+		common_menu_item(common_local_url('showstream', array('nickname' =>
+															  $nickname)),
+						 _t('Profile'),  
+						 ($user->fullname) ? $user->fullname : $nickname,
+						 $action == 'showstream');
+		common_element_end('ul');
+		common_menu_item(common_local_url('all', array('nickname' =>
+													   $nickname)),
+						 _t('All'),
+						 _t('All'),
+						 $action == 'all');
+	}
+	
 	function show_notice($notice) {
+		global $config;
 		$profile = $notice->getProfile();
 		# XXX: RDFa
-		common_element_start('div', array('class' => 'notice',
+		common_element_start('li', array('class' => 'notice_single',
 										  'id' => 'notice-' . $notice->id));
 		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
 		common_element_start('a', array('href' => $profile->profileurl));
-		common_element('img', array('src' => ($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR,
+		common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
 									'class' => 'avatar stream',
 									'width' => AVATAR_STREAM_SIZE,
 									'height' => AVATAR_STREAM_SIZE,
@@ -47,11 +65,15 @@ class StreamAction extends Action {
 								  'class' => 'nickname'),
 					   $profile->nickname);
 		# FIXME: URL, image, video, audio
-		common_element('span', array('class' => 'content'), $notice->content);
+		common_element_start('p', array('class' => 'content'));
+		common_raw(common_render_content($notice->content, $notice));
+		common_element_end('p');
 		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+		common_element_start('p', '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');
 	}
 }