X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=ac683367f166aec509ec9a7246dc8ad6a6d36b4c;hb=31829840802dd8433fdb278c8b014c45c7ef39c8;hp=b659eb8b5b171175fe5f8af8db054d2f0c356102;hpb=b6cfd2dffeeb733f07818db5f4ce11d4b3d51771;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index b659eb8b5b..ac683367f1 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -1,23 +1,23 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-  
-if (!defined('LACONICA')) { exit(1) }
+
+if (!defined('LACONICA')) { exit(1); }
 
 define('NOTICES_PER_PAGE', 20);
 
@@ -28,17 +28,32 @@ class StreamAction extends Action {
 	}
 
 	function show_notice($notice) {
+		global $config;
 		$profile = $notice->getProfile();
 		# XXX: RDFa
-		common_start_element('div', array('class' => 'notice'));
-		# FIXME: add the avatar
-		common_start_element('a', array('href' => $profile->profileurl,
-										'class' => 'nickname'),
-							 $profile->nickname);
+		common_element_start('div', array('class' => 'notice',
+										  '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),
+									'class' => 'avatar stream',
+									'width' => AVATAR_STREAM_SIZE,
+									'height' => AVATAR_STREAM_SIZE,
+									'alt' =>
+									($profile->fullname) ? $profile->fullname :
+									$profile->nickname));
+		common_element_end('a');
+		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('span', array('class' => 'date'),
+		common_element_start('span', array('class' => 'content'));
+		common_raw(common_render_content($notice->content, $notice));
+		common_element_end('span');
+		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
+		common_element('a', array('class' => 'notice',
+								  'href' => $noticeurl),
 					   common_date_string($notice->created));
-		common_end_element('div');
+		common_element_end('div');
 	}
 }