Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / lib / inlineattachmentlist.php

diff --git a/lib/inlineattachmentlist.php b/lib/inlineattachmentlist.php
index de5008e87babb796e2ebd8d92b6066e453de901f..a8f383c3fe80b2a5e0191d4e57238dc14abfd545 100644 (file)
--- a/lib/inlineattachmentlist.php
+++ b/lib/inlineattachmentlist.php
@@ -35,12 +35,7 @@ class InlineAttachmentList extends AttachmentList
 {
     function showListStart()
     {
-        $this->out->elementStart('div', array('class' => 'entry-content thumbnails'));
-    }
-
-    function showListEnd()
-    {
-        $this->out->elementEnd('div');
+        parent::showListStart();
     }
 
     /**
@@ -50,7 +45,7 @@ class InlineAttachmentList extends AttachmentList
      *
      * @return ListItem a list item for displaying the attachment
      */
-    function newListItem($attachment)
+    function newListItem(File $attachment)
     {
         return new InlineAttachmentListItem($attachment, $this->out);
     }
@@ -58,28 +53,8 @@ class InlineAttachmentList extends AttachmentList
 
 class InlineAttachmentListItem extends AttachmentListItem
 {
-    function show()
-    {
-        if ($this->attachment->isEnclosure()) {
-            parent::show();
-        }
-    }
-
     function showLink() {
-        $this->out->elementStart('a', $this->linkAttr());
         $this->showRepresentation();
-        $this->out->elementEnd('a');
-    }
-
-    /**
-     * Build HTML attributes for the link
-     * @return array
-     */
-    function linkAttr()
-    {
-        $attr = parent::linkAttr();
-        $attr['class'] = 'attachment-thumbnail';
-        return $attr;
     }
 
     /**
@@ -91,7 +66,7 @@ class InlineAttachmentListItem extends AttachmentListItem
     {
         // XXX: RDFa
         // TODO: add notice_type class e.g., notice_video, notice_image
-        $this->out->elementStart('span', array('class' => 'inline-attachment'));
+        $this->out->elementStart('li', array('class' => 'inline-attachment'));
     }
 
     /**
@@ -103,6 +78,6 @@ class InlineAttachmentListItem extends AttachmentListItem
      */
     function showEnd()
     {
-        $this->out->elementEnd('span');
+        $this->out->elementEnd('li');
     }
 }