Commit f0443aff authored by Samantha Doherty's avatar Samantha Doherty

Style for Activity notices.

parent 3bdae5ae
...@@ -84,7 +84,7 @@ class ActivityPlugin extends Plugin ...@@ -84,7 +84,7 @@ class ActivityPlugin extends Plugin
if (!empty($user)) { if (!empty($user)) {
$sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id, $sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
'subscribed' => $other->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->profileurl,
$subscriber->getBestName(), $subscriber->getBestName(),
$other->profileurl, $other->profileurl,
...@@ -113,7 +113,7 @@ class ActivityPlugin extends Plugin ...@@ -113,7 +113,7 @@ class ActivityPlugin extends Plugin
if(!$this->StopFollowUser) return true; if(!$this->StopFollowUser) return true;
$user = $subscriber->getUser(); $user = $subscriber->getUser();
if (!empty($user)) { 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->profileurl,
$subscriber->getBestName(), $subscriber->getBestName(),
$other->profileurl, $other->profileurl,
...@@ -154,7 +154,7 @@ class ActivityPlugin extends Plugin ...@@ -154,7 +154,7 @@ class ActivityPlugin extends Plugin
$fave = Fave::pkeyGet(array('user_id' => $user->id, $fave = Fave::pkeyGet(array('user_id' => $user->id,
'notice_id' => $notice->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->profileurl,
$profile->getBestName(), $profile->getBestName(),
$notice->bestUrl(), $notice->bestUrl(),
...@@ -186,7 +186,7 @@ class ActivityPlugin extends Plugin ...@@ -186,7 +186,7 @@ class ActivityPlugin extends Plugin
if (!empty($user)) { if (!empty($user)) {
$author = Profile::staticGet('id', $notice->profile_id); $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->profileurl,
$profile->getBestName(), $profile->getBestName(),
$notice->bestUrl(), $notice->bestUrl(),
...@@ -226,7 +226,7 @@ class ActivityPlugin extends Plugin ...@@ -226,7 +226,7 @@ class ActivityPlugin extends Plugin
return true; 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->profileurl,
$profile->getBestName(), $profile->getBestName(),
$group->homeUrl(), $group->homeUrl(),
...@@ -262,7 +262,7 @@ class ActivityPlugin extends Plugin ...@@ -262,7 +262,7 @@ class ActivityPlugin extends Plugin
return true; 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->profileurl,
$profile->getBestName(), $profile->getBestName(),
$group->homeUrl(), $group->homeUrl(),
......
...@@ -58,7 +58,7 @@ class JoinListItem extends SystemListItem ...@@ -58,7 +58,7 @@ class JoinListItem extends SystemListItem
$out->elementStart('div', 'join-activity'); $out->elementStart('div', 'join-activity');
$profile = $mem->getMember(); $profile = $mem->getMember();
$group = $mem->getGroup(); $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->profileurl,
$profile->getBestName(), $profile->getBestName(),
$group->homeUrl(), $group->homeUrl(),
......
...@@ -56,7 +56,7 @@ class SystemListItem extends NoticeListItemAdapter ...@@ -56,7 +56,7 @@ class SystemListItem extends NoticeListItemAdapter
function showNotice() function showNotice()
{ {
$out = $this->nli->out; $out = $this->nli->out;
$out->elementStart('div'); $out->elementStart('div', 'entry-title');
$this->showContent(); $this->showContent();
$out->elementEnd('div'); $out->elementEnd('div');
} }
......
...@@ -1514,6 +1514,15 @@ content:'☠'; ...@@ -1514,6 +1514,15 @@ content:'☠';
font-size:150%; 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 */ /* override OStatus plugin style */
#form_ostatus_connect.form_settings.dialogbox, #form_ostatus_sub.dialogbox { #form_ostatus_connect.form_settings.dialogbox, #form_ostatus_sub.dialogbox {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment