GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Style for Activity notices.

Browse Source
This commit is contained in:
Samantha Doherty 2011-08-25 16:24:54 -04:00
parent 3bdae5aed4
commit f0443aff1a
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Activity/ActivityPlugin.php
View File

@ -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(),

2
plugins/Activity/joinlistitem.php
View File

@ -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(),

2
plugins/Activity/systemlistitem.php
View File

@ -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');
}

9
theme/base/css/display.css
View File

@ -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 {