forked from GNUsocial/gnu-social
Merge commit 'refs/merge-requests/30' of https://gitorious.org/social/mainline into merge-requests/30
This commit is contained in:
commit
c6b1b3e5e3
@ -104,8 +104,7 @@ abstract class MicroAppPlugin extends ActivityHandlerPlugin
|
|||||||
|
|
||||||
$adapter->showNotice();
|
$adapter->showNotice();
|
||||||
$adapter->showNoticeAttachments();
|
$adapter->showNoticeAttachments();
|
||||||
$adapter->showNoticeInfo();
|
$adapter->showNoticeFooter();
|
||||||
$adapter->showNoticeOptions();
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -536,6 +536,12 @@ class BookmarkPlugin extends MicroAppPlugin
|
|||||||
$replies = $stored->getReplies();
|
$replies = $stored->getReplies();
|
||||||
$tags = $stored->getTags();
|
$tags = $stored->getTags();
|
||||||
|
|
||||||
|
if (!empty($nb->description)) {
|
||||||
|
$out->element('p',
|
||||||
|
array('class' => 'bookmark-description'),
|
||||||
|
$nb->description);
|
||||||
|
}
|
||||||
|
|
||||||
if (!empty($replies) || !empty($tags)) {
|
if (!empty($replies) || !empty($tags)) {
|
||||||
|
|
||||||
$out->elementStart('ul', array('class' => 'bookmark-tags'));
|
$out->elementStart('ul', array('class' => 'bookmark-tags'));
|
||||||
@ -569,10 +575,5 @@ class BookmarkPlugin extends MicroAppPlugin
|
|||||||
$out->elementEnd('ul');
|
$out->elementEnd('ul');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($nb->description)) {
|
|
||||||
$out->element('p',
|
|
||||||
array('class' => 'bookmark-description'),
|
|
||||||
$nb->description);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,8 +3,7 @@
|
|||||||
.bookmark-tags li { display: inline; }
|
.bookmark-tags li { display: inline; }
|
||||||
|
|
||||||
.bookmark h3 {
|
.bookmark h3 {
|
||||||
margin: 0px 0px 8px 0px;
|
margin: 4px 0px 8px 0px;
|
||||||
line-height: 3em;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.bookmark-notice-count {
|
.bookmark-notice-count {
|
||||||
@ -42,7 +41,7 @@
|
|||||||
|
|
||||||
.bookmark-tags {
|
.bookmark-tags {
|
||||||
clear: both;
|
clear: both;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 4px;
|
||||||
line-height: 1.6em;
|
line-height: 1.6em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user