Commit c6b1b3e5 authored by mmn's avatar mmn

Merge commit 'refs/merge-requests/30' of https://gitorious.org/social/mainline...

Merge commit 'refs/merge-requests/30' of https://gitorious.org/social/mainline into merge-requests/30
parents fb9d32a8 e45c7844
......@@ -104,8 +104,7 @@ abstract class MicroAppPlugin extends ActivityHandlerPlugin
$adapter->showNotice();
$adapter->showNoticeAttachments();
$adapter->showNoticeInfo();
$adapter->showNoticeOptions();
$adapter->showNoticeFooter();
return false;
}
......
......@@ -536,6 +536,12 @@ class BookmarkPlugin extends MicroAppPlugin
$replies = $stored->getReplies();
$tags = $stored->getTags();
if (!empty($nb->description)) {
$out->element('p',
array('class' => 'bookmark-description'),
$nb->description);
}
if (!empty($replies) || !empty($tags)) {
$out->elementStart('ul', array('class' => 'bookmark-tags'));
......@@ -569,10 +575,5 @@ class BookmarkPlugin extends MicroAppPlugin
$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 h3 {
margin: 0px 0px 8px 0px;
line-height: 3em;
margin: 4px 0px 8px 0px;
}
.bookmark-notice-count {
......@@ -42,7 +41,7 @@
.bookmark-tags {
clear: both;
margin-bottom: 8px;
margin-bottom: 4px;
line-height: 1.6em;
}
......
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