Style for Activity notices.

diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index 92972ff173804d234590879106be8b51f03b73d9..1a460219dc51e62aad5058572bf2c9eeeb3deb82 100644 (file)
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -84,7 +84,7 @@ class ActivityPlugin extends Plugin
         if (!empty($user)) {
                $sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
                                                   'subscribed' => $other->id));
-            $rendered = sprintf(_m('<em><a href="%s">%s</a> started following <a href="%s">%s</a></em>.'),
+            $rendered = sprintf(_m('<a href="%s">%s</a> started following <a href="%s">%s</a>.'),
                                                $subscriber->profileurl,
                                                $subscriber->getBestName(),
                                 $other->profileurl,
@@ -113,7 +113,7 @@ class ActivityPlugin extends Plugin
         if(!$this->StopFollowUser) return true;
         $user = $subscriber->getUser();
         if (!empty($user)) {
-            $rendered = sprintf(_m('<em><a href="%s">%s</a> stopped following <a href="%s">%s</a></em>.'),
+            $rendered = sprintf(_m('<a href="%s">%s</a> stopped following <a href="%s">%s</a>.'),
                                                $subscriber->profileurl,
                                                $subscriber->getBestName(),
                                 $other->profileurl,
@@ -154,7 +154,7 @@ class ActivityPlugin extends Plugin
             $fave   = Fave::pkeyGet(array('user_id' => $user->id,
                                                                  'notice_id' => $notice->id));
             
-            $rendered = sprintf(_m('<em><a href="%s">%s</a> liked <a href="%s">%s\'s update</a></em>.'),
+            $rendered = sprintf(_m('<a href="%s">%s</a> liked <a href="%s">%s\'s update</a>.'),
                                                $profile->profileurl,
                                                $profile->getBestName(),
                                 $notice->bestUrl(),
@@ -186,7 +186,7 @@ class ActivityPlugin extends Plugin
 
         if (!empty($user)) {
             $author = Profile::staticGet('id', $notice->profile_id);
-            $rendered = sprintf(_m('<em><a href="%s">%s</a> stopped liking <a href="%s">%s\'s update</a></em>.'),
+            $rendered = sprintf(_m('<a href="%s">%s</a> stopped liking <a href="%s">%s\'s update</a>.'),
                                                $profile->profileurl,
                                                $profile->getBestName(),
                                 $notice->bestUrl(),
@@ -226,7 +226,7 @@ class ActivityPlugin extends Plugin
             return true;
         }
         
-        $rendered = sprintf(_m('<em><a href="%s">%s</a> joined the group <a href="%s">%s</a></em>.'),
+        $rendered = sprintf(_m('<a href="%s">%s</a> joined the group <a href="%s">%s</a>.'),
                                        $profile->profileurl,
                                        $profile->getBestName(),
                             $group->homeUrl(),
@@ -262,7 +262,7 @@ class ActivityPlugin extends Plugin
             return true;
         }
         
-        $rendered = sprintf(_m('<em><a href="%s">%s</a> left the group <a href="%s">%s</a></em>.'),
+        $rendered = sprintf(_m('<a href="%s">%s</a> left the group <a href="%s">%s</a>.'),
                                        $profile->profileurl,
                                        $profile->getBestName(),
                             $group->homeUrl(),

diff --git a/plugins/Activity/joinlistitem.php b/plugins/Activity/joinlistitem.php
index 19795240014b946767af1ce741fdcdd6ffe42fc2..5764f1d2e63d2b5a59ae61a3bd07e9560fa83c9a 100644 (file)
--- a/plugins/Activity/joinlistitem.php
+++ b/plugins/Activity/joinlistitem.php
@@ -58,7 +58,7 @@ class JoinListItem extends SystemListItem
             $out->elementStart('div', 'join-activity');
                $profile = $mem->getMember();
                $group = $mem->getGroup();
-               $out->raw(sprintf(_m('<em><a href="%s">%s</a> joined the group <a href="%s">%s</a></em>.'),
+               $out->raw(sprintf(_m('<a href="%s">%s</a> joined the group <a href="%s">%s</a>.'),
                                                $profile->profileurl,
                                                $profile->getBestName(),
                                $group->homeUrl(),

diff --git a/plugins/Activity/systemlistitem.php b/plugins/Activity/systemlistitem.php
index d2b99c802e54bd9ae5e8482370d50007e8059009..0b8d2f4c02041cce2486bfbab2ecbf483e647d3a 100644 (file)
--- a/plugins/Activity/systemlistitem.php
+++ b/plugins/Activity/systemlistitem.php
@@ -56,7 +56,7 @@ class SystemListItem extends NoticeListItemAdapter
     function showNotice()
     {
         $out = $this->nli->out;
-        $out->elementStart('div');
+        $out->elementStart('div', 'entry-title');
         $this->showContent();
         $out->elementEnd('div');
     }

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9ad1b4ec1551ba2871024c8cd693089f64baa8f8..5b18772db8b7594c0e2b5c54f28ba59eb63bd447 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1514,6 +1514,15 @@ content:'☠';
 font-size:150%;
 }
 
+#content .notice-source-system div.entry-title, .notice-source-system div.entry-content {
+    margin-left: 0;
+} 
+
+#content .notice-source-system div.entry-title {
+    font-style: italic;
+    min-height: 0;
+} 
+
 /* override OStatus plugin style */
 
 #form_ostatus_connect.form_settings.dialogbox, #form_ostatus_sub.dialogbox {