better output for bookmark list item

diff --git a/plugins/Bookmark/bookmark.css b/plugins/Bookmark/bookmark.css
index 0e2f3df52f0fc4319feba48112b9948b06122dec..966adbc66ca7258143d56ef4792a68d8ee175d5a 100644 (file)
--- a/plugins/Bookmark/bookmark.css
+++ b/plugins/Bookmark/bookmark.css
@@ -1,8 +1 @@
 .bookmark-tags li { display: inline; }
-.bookmark-mentions li { display: inline; }
-.bookmark-avatar { float: left; }
-.bookmark-notice-count { float: right; }
-.bookmark-info { float: left; }
-.bookmark-title { margin-left: 0px; }
-#content .bookmark .entry-title { margin-left: 0px; }
-#content .bookmark .entry-content { margin-left: 0px; }

diff --git a/plugins/Bookmark/bookmarklistitem.php b/plugins/Bookmark/bookmarklistitem.php
index e4621114108980da7b34621ad9e53632fb2ec4f4..65ebe5036774160ba5717cf31fbf378257cead95 100644 (file)
--- a/plugins/Bookmark/bookmarklistitem.php
+++ b/plugins/Bookmark/bookmarklistitem.php
@@ -47,13 +47,21 @@ if (!defined('STATUSNET')) {
 
 class BookmarkListItem extends NoticeListItemAdapter
 {
-    function showContent()
+    function showNotice()
     {
-        $this->out->elementStart('p', array('class' => 'entry-content'));
+        $this->nli->out->elementStart('div', 'entry-title');
+        $this->nli->showAuthor();
+        $this->showContent();
+        $this->nli->out->elementEnd('div');
+    }
 
+    function showContent()
+    {
         $notice = $this->nli->notice;
         $out    = $this->nli->out;
 
+        $out->elementStart('p', array('class' => 'entry-content'));
+
         $nb = Bookmark::getByNotice($notice);
 
         $profile = $notice->getProfile();
@@ -74,17 +82,10 @@ class BookmarkListItem extends NoticeListItemAdapter
         $out->elementStart('h3');
         $out->element('a',
                       array('href' => $att->url,
-                            'class' => 'bookmark-title entry-title'),
+                            'class' => 'bookmark-title'),
                       $nb->title);
         $out->elementEnd('h3');
 
-        $countUrl = common_local_url('noticebyurl',
-                                     array('id' => $att->id));
-
-        $out->element('a', array('class' => 'bookmark-notice-count',
-                                 'href' => $countUrl),
-                      $att->noticeCount());
-
         // Replies look like "for:" tags
 
         $replies = $notice->getReplies();
@@ -126,6 +127,6 @@ class BookmarkListItem extends NoticeListItemAdapter
                           $nb->description);
         }
 
-        $this->out->elementEnd('p');
+        $out->elementEnd('p');
     }
 }

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 98e813199760bf63dd53d9a456f880d0c8f79bda..fd4046c7c11619e2e4484e4a0654eef96f238a19 100644 (file)
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -1131,10 +1131,6 @@ padding-right:0;
 
 /* Bookmark specific styles */
 
-#content .bookmark .entry-title {
-    margin-left: 0px;
-}
-
 .bookmark h3 {
     margin: 0px 0px 8px 0px;
     float: left;