X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=a595958e44e27a8e806a49f205064b8917bdfd8f;hb=905ba4998b6388c5a5c23262beff276441d8c393;hp=75734ebc9d0bece9efa0c3294c6b857b5bf83163;hpb=bf4ca7e302ea7b0258a22d092413f3c0f7bc45a8;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index 75734ebc9d..a595958e44 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -19,43 +19,95 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('NOTICES_PER_PAGE', 20);
-
 class StreamAction extends Action {
 
 	function handle($args) {
 		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();
 		# 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('span', 'floatLeft width25');
 		common_element_start('a', array('href' => $profile->profileurl));
-		common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
-									'class' => 'avatar stream floatLeft',
+		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,
 									'alt' =>
 									($profile->fullname) ? $profile->fullname :
 									$profile->nickname));
 		common_element_end('a');
-		common_element_end('span');
-		common_element_start('span', 'floatRight width75');
 		common_element('a', array('href' => $profile->profileurl,
 								  'class' => 'nickname'),
 					   $profile->nickname);
 		# FIXME: URL, image, video, audio
-		common_element('span', array('class' => 'content'), $notice->content);
+		common_element_start('p', array('class' => 'content'));
+		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('a', array('class' => 'notice',
-								  'href' => $noticeurl),
+		common_element_start('p', 'time');
+		common_element('a', array('class' => 'permalink',
+								  'href' => $noticeurl,
+								  'title' => common_exact_date($notice->created)),
 					   common_date_string($notice->created));
-		common_element_end('span');
-		common_element_end('div');
+		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');
 	}
 }