From 20457d43897899fcac79117465894fb959d3d6c1 Mon Sep 17 00:00:00 2001
From: aroquen <antonio.roquentin@sfr.fr>
Date: Fri, 16 Jan 2015 23:27:07 +0100
Subject: [PATCH 1/4] Better frame and spacing for bookmark title

---
 plugins/Bookmark/css/bookmark.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/Bookmark/css/bookmark.css b/plugins/Bookmark/css/bookmark.css
index 7d10957c68..2aeaa3d47e 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 {

From 22df2fa40fda569eeb10cea471c7154da6e4e40f Mon Sep 17 00:00:00 2001
From: aroquen <antonio.roquentin@sfr.fr>
Date: Fri, 16 Jan 2015 23:28:07 +0100
Subject: [PATCH 2/4] Move bookmark's tags after description

---
 plugins/Bookmark/BookmarkPlugin.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

From 2b78eb1735921fd3fa81f6743bc3bea303c3b9fe Mon Sep 17 00:00:00 2001
From: aroquen <antonio.roquentin@sfr.fr>
Date: Fri, 16 Jan 2015 23:37:09 +0100
Subject: [PATCH 3/4] Reduce tag margin in bookmark notice

---
 plugins/Bookmark/css/bookmark.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Bookmark/css/bookmark.css b/plugins/Bookmark/css/bookmark.css
index 2aeaa3d47e..e785664f81 100644
--- a/plugins/Bookmark/css/bookmark.css
+++ b/plugins/Bookmark/css/bookmark.css
@@ -41,7 +41,7 @@
 
 .bookmark-tags {
     clear: both;
-    margin-bottom: 8px;
+    margin-bottom: 4px;
     line-height: 1.6em;
 }
 

From e45c784451f9a63e4cf87255d13ed90d568fb621 Mon Sep 17 00:00:00 2001
From: aroquen <antonio.roquentin@sfr.fr>
Date: Fri, 16 Jan 2015 23:38:54 +0100
Subject: [PATCH 4/4] Fix footer in plugins' notices.

Make it look like like normal notices. Footer element was missing.
---
 lib/microappplugin.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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