diff --git a/plugins/Bookmark/bookmark.css b/plugins/Bookmark/bookmark.css index 0e2f3df52f..966adbc66c 100644 --- 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 e462111410..65ebe50367 100644 --- a/plugins/Bookmark/bookmarklistitem.php +++ b/plugins/Bookmark/bookmarklistitem.php @@ -47,13 +47,21 @@ if (!defined('STATUSNET')) { class BookmarkListItem extends NoticeListItemAdapter { + function showNotice() + { + $this->nli->out->elementStart('div', 'entry-title'); + $this->nli->showAuthor(); + $this->showContent(); + $this->nli->out->elementEnd('div'); + } + function showContent() { - $this->out->elementStart('p', array('class' => 'entry-content')); - $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 98e8131997..fd4046c7c1 100644 --- 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;