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

lib/microappplugin.php

@@ -104,8 +104,7 @@ abstract class MicroAppPlugin extends ActivityHandlerPlugin
 
         $adapter->showNotice();
         $adapter->showNoticeAttachments();
-        $adapter->showNoticeInfo();
-        $adapter->showNoticeOptions();
+        $adapter->showNoticeFooter();
 
         return false;
     }

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

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;
 }