maybe an extra \n will help my formatting

[quix0rs-gnu-social.git] / actions / shownotice.php

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 48e5861dd874c5b63230f926e607dcc90c8ddb9f..c05537c38ebb4d80198fd10cb8d30b3823f0fc0d 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -19,7 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ShownoticeAction extends Action {
+require_once(INSTALLDIR.'/lib/stream.php');
+
+class ShownoticeAction extends StreamAction {
 
        function handle($args) {
                parent::handle($args);
@@ -27,51 +29,39 @@ class ShownoticeAction extends Action {
                $notice = Notice::staticGet($id);
 
                if (!$notice) {
-                       $this->no_such_notice();
+                       $this->client_error(_('No such notice.'), 404);
+                       return;
                }
 
-               if (!$notice->getProfile()) {
-                       $this->no_such_notice();
+               $profile = $notice->getProfile();
+
+               if (!$profile) {
+                       $this->server_error(_('Notice has no profile'), 500);
+                       return;
                }
 
                # Looks like we're good; show the header
 
-               common_show_header($profile->nickname." status on ".$notice->created);
+               common_show_header(sprintf(_('%1$s\'s status on %2$s'), $profile->nickname, common_exact_date($notice->created)),
+                                                  NULL, $profile,
+                                                  array($this, 'show_top'));
 
+               common_element_start('ul', array('id' => 'notices'));
                $this->show_notice($notice);
+               common_element_end('ul');
 
                common_show_footer();
        }
 
-       function no_such_notice() {
-               common_user_error('No such notice.');
-       }
+       function show_top($user) {
+               $cur = common_current_user();
 
-       function show_notice($notice) {
-               $profile = $notice->getProfile();
-               # XXX: RDFa
-               common_element_start('div', array('class' => 'notice'));
-               $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-               if ($avatar) {
-                       common_element('img', array('src' => $avatar->url,
-                                                                               'class' => 'avatar profile',
-                                                                               'width' => AVATAR_PROFILE_SIZE,
-                                                                               'height' => AVATAR_PROFILE_SIZE,
-                                                                               'alt' =>
-                                                                               ($profile->fullname) ? $profile->fullname :
-                                                                                                      $profile->nickname));
+               if ($cur && $cur->id == $user->id) {
+                       common_notice_form();
                }
-               common_element('a', array('href' => $profile->profileurl,
-                                                                 'class' => 'nickname',
-                                                                 'title' =>
-                                                                 ($profile->fullname) ? $profile->fullname :
-                                                                 $profile->nickname),
-                                          $profile->nickname);
-               # FIXME: URL, image, video, audio
-               common_element('span', array('class' => 'content'),
-                                          $notice->content);
-               common_element('span', array('class' => 'date'),
-                                          common_date_string($notice->created));
-               common_element_end('div');
+       }
+
+       function no_such_notice() {
+               common_user_error(_('No such notice.'));
        }
 }