X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=ad65e2d2a293702231a513b0959225d68f1dd4da;hb=a55044ac0316ab04367b51639b6082bfd16aad79;hp=9a4cf41ebe0464104dcb224ec2a423c7f5563288;hpb=74517da3f545d9659f58af8fa273ca4fafa9ff50;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index 9a4cf41ebe..ad65e2d2a2 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -27,6 +27,36 @@ 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)),
+						 _('Personal'),
+						 sprintf(_('%s and friends'), (($user && $user->fullname) ? $user->fullname : $nickname)),
+						 $action == 'all');
+		common_menu_item(common_local_url('replies', array('nickname' =>
+															  $nickname)),
+						 _('Replies'),
+						 sprintf(_('Replies to %s'), (($user && $user->fullname) ? $user->fullname : $nickname)),
+						 $action == 'replies');
+		common_menu_item(common_local_url('showstream', array('nickname' =>
+															  $nickname)),
+						 _('Profile'),
+						 ($user && $user->fullname) ? $user->fullname : $nickname,
+						 $action == 'showstream');
+		common_element_end('ul');
+	}
+
 	function show_notice($notice) {
 		global $config;
 		$profile = $notice->getProfile();
@@ -35,7 +65,7 @@ class StreamAction extends Action {
 										  '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 : common_default_avatar(AVATAR_STREAM_SIZE),
+		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
 									'class' => 'avatar stream',
 									'width' => AVATAR_STREAM_SIZE,
 									'height' => AVATAR_STREAM_SIZE,
@@ -48,13 +78,37 @@ class StreamAction extends Action {
 					   $profile->nickname);
 		# FIXME: URL, image, video, audio
 		common_element_start('p', array('class' => 'content'));
-		common_raw(common_render_content($notice->content, $notice));
+		if ($notice->rendered) {
+			common_raw($notice->rendered);
+		} else {
+			# XXX: may be some uncooked notices in the DB,
+			# we cook them right now. This should probably disappear in future
+			# versions (>> 0.4.x)
+			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_element('a', array('class' => 'permalink',
+								  'href' => $noticeurl,
+								  'title' => common_exact_date($notice->created)),
 					   common_date_string($notice->created));
+		if ($notice->reply_to) {
+			$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+			common_text(' (');
+			common_element('a', array('class' => 'inreplyto',
+									  'href' => $replyurl),
+						   _('in reply to...'));
+			common_text(')');
+		}
+		common_element_start('a',
+							 array('href' => common_local_url('newnotice',
+															  array('replyto' => $profile->nickname)),
+								   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
+								   'title' => _('reply'),
+								   'class' => 'replybutton'));
+		common_raw('→');
+		common_element_end('a');
 		common_element_end('p');
 		common_element_end('li');
 	}