Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

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

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 2a0114b12773d5fd89ba1e3ef8a6006ea9504a9a..61749dca578a1cf0688bb2290b26217990b37dd1 100644 (file)
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -80,20 +80,22 @@ class AttachmentList extends Widget
 
     function show()
     {
-//        $this->out->elementStart('div', array('id' =>'attachments_primary'));
-        $this->out->elementStart('div', array('id' =>'content'));
-        $this->out->element('h2', null, _('Attachments'));
-        $this->out->elementStart('ul', array('class' => 'attachments'));
-
         $atts = new File;
         $att = $atts->getAttachments($this->notice->id);
+        if (empty($att)) return 0;
+        $this->out->elementStart('dl', array('id' =>'attachments'));
+        $this->out->element('dt', null, _('Attachments'));
+        $this->out->elementStart('dd');
+        $this->out->elementStart('ol', array('class' => 'attachments'));
+
         foreach ($att as $n=>$attachment) {
             $item = $this->newListItem($attachment);
             $item->show();
         }
 
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('div');
+        $this->out->elementEnd('dd');
+        $this->out->elementEnd('ol');
+        $this->out->elementEnd('dl');
 
         return count($att);
     }
@@ -195,14 +197,10 @@ class AttachmentListItem extends Widget
     }
 
     function showLink() {
-        $attr = $this->linkAttr();
-        $text = $this->linkTitle();
-        $this->out->elementStart('h4');
-        $this->out->elementStart('a', $attr);
-        $this->out->element('span', null, $text);
+        $this->out->elementStart('a', $this->linkAttr());
+        $this->out->element('span', null, $this->linkTitle());
         $this->showRepresentation();
         $this->out->elementEnd('a');
-        $this->out->elementEnd('h4');
     }
 
     function showNoticeAttachment()