Profile block base style

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 4cf216566b395a3950f230b542e0ad1a9cf8ee41..2919a154f21710197d609a4244c35ad216e49ff8 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -202,6 +202,19 @@ class ShowstreamAction extends StreamAction {
                $user = User::staticGet('id', $profile->id);
                common_profile_new_message_nudge($cur, $user, $profile);
 
+        if ($cur) {
+            $blocked = $cur->hasBlocked($profile);
+            common_element_start('li', array('id' => ($blocked) ? 'profile_unblock' : 'profile_block'));
+            if ($blocked) {
+                common_unblock_form($profile, array('action' => 'showstream',
+                                                    'nickname' => $profile->nickname));
+            } else {
+                common_block_form($profile, array('action' => 'showstream',
+                                                  'nickname' => $profile->nickname));
+            }
+            common_element_end('li');
+        }
+
                common_element_end('ul');
 
                common_element_end('div');
@@ -451,7 +464,7 @@ class ShowstreamAction extends StreamAction {
                }
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                # FIXME: URL, image, video, audio
-               common_element_start('p', 'entry-title entry-content');
+               common_element_start('p', 'entry-title');
                if ($notice->rendered) {
                        common_raw($notice->rendered);
                } else {
@@ -462,11 +475,14 @@ class ShowstreamAction extends StreamAction {
                }
                common_element_end('p');
                common_element_start('p', array('class' => 'time'));
-               common_element('a', array('class' => 'permalink published',
+               common_element_start('a', array('class' => 'permalink',
                                                                  'rel' => 'bookmark',
-                                                                 'href' => $noticeurl,
-                                                                 'title' => common_exact_date($notice->created)),
-                                          common_date_string($notice->created));
+                                                                 'href' => $noticeurl));
+               common_element('abbr', array('class' => 'published',
+                                                                        'title' => common_date_iso8601($notice->created)),
+                                               common_date_string($notice->created));
+               common_element_end('a');
+
                if ($notice->source) {
                        common_text(_(' from '));
                        $this->source_link($notice->source);