X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=4ffe27d3cab3231f50dcc441eb5023396a3b3b0a;hb=5650d698bed8351f4f9c86b615ae89184cec8e94;hp=18b80d89816bf2169366a4cada42b70b6de12fcb;hpb=63758c59e1df81c955ce8528d80ba3fd0e466bec;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index 18b80d8981..4ffe27d3ca 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -27,14 +27,40 @@ class StreamAction extends Action {
 		parent::handle($args);
 	}
 
+	function views_menu() {
+		
+		$user = NULL;
+		$action = $this->trimmed('action');
+		$nickname = $this->trimmed('nickname');
+
+		if ($nickname) {
+			$user = User::staticGet('nickname', $nickname);
+		}
+		
+		common_element_start('ul', array('id' => 'nav_views'));
+		
+		common_menu_item(common_local_url('all', array('nickname' =>
+													   $nickname)),
+						 _t('Personal'),
+						 (($user && $user->fullname) ? $user->fullname : $nickname) . _t(' and friends'),
+						 $action == 'all');
+		common_menu_item(common_local_url('showstream', array('nickname' =>
+															  $nickname)),
+						 _t('Profile'),  
+						 ($user && $user->fullname) ? $user->fullname : $nickname,
+						 $action == 'showstream');
+		common_element_end('ul');
+	}
+	
 	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,
@@ -46,11 +72,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');
 	}
 }