diff --git a/lib/microappplugin.php b/lib/microappplugin.php index d9a00f7ee5..53fe5e9995 100644 --- a/lib/microappplugin.php +++ b/lib/microappplugin.php @@ -104,8 +104,7 @@ abstract class MicroAppPlugin extends ActivityHandlerPlugin $adapter->showNotice(); $adapter->showNoticeAttachments(); - $adapter->showNoticeInfo(); - $adapter->showNoticeOptions(); + $adapter->showNoticeFooter(); return false; } diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php index 9ea83c4caf..2426deb93f 100644 --- a/plugins/Bookmark/BookmarkPlugin.php +++ b/plugins/Bookmark/BookmarkPlugin.php @@ -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); - } } } diff --git a/plugins/Bookmark/css/bookmark.css b/plugins/Bookmark/css/bookmark.css index 7d10957c68..e785664f81 100644 --- a/plugins/Bookmark/css/bookmark.css +++ b/plugins/Bookmark/css/bookmark.css @@ -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; }