1 files changed, 24 insertions, 5 deletions
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 26aa7ed33..fe5a6eb8a 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -169,17 +169,36 @@ class NoticeListItem
     function show()
     {
         $this->showStart();
-        $this->showFaveForm();
+        $this->showNotice();
+        $this->showNoticeInfo();
+        $this->showNoticeOptions();
+        $this->showEnd();
+    }
+
+    function showNotice()
+    {
+        $this->elementStart('div', 'entry-title');
         $this->showAuthor();
-        $this->showContent();
-        $this->startTimeSection();
+        $this->showNoticeContent();
+        $this->elementEnd('div');
+    }
+
+    function showNoticeInfo()
+    {
+        $this->elementStart('div', 'entry-content');
         $this->showNoticeLink();
         $this->showNoticeSource();
         $this->showReplyTo();
+        $this->elementEnd('div');
+    }
+
+    function showNoticeOptions()
+    {
+        $this->elementStart('div', 'notice-options');
+        $this->showFaveForm();
         $this->showReplyLink();
         $this->showDeleteLink();
-        $this->endTimeSection();
-        $this->showEnd();
+        $this->elementEnd('div');
     }
 
     /**