summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/attachmentlist.php17
-rw-r--r--lib/noticelist.php14
2 files changed, 8 insertions, 23 deletions
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 2a0114b12..d0478bad3 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -80,9 +80,9 @@ 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('dl', array('id' =>'attachment'));
+ $this->out->element('dt', null, _('Attachments'));
+ $this->out->elementStart('dd');
$this->out->elementStart('ul', array('class' => 'attachments'));
$atts = new File;
@@ -92,8 +92,9 @@ class AttachmentList extends Widget
$item->show();
}
+ $this->out->elementEnd('dd');
$this->out->elementEnd('ul');
- $this->out->elementEnd('div');
+ $this->out->elementEnd('dl');
return count($att);
}
@@ -195,14 +196,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()
diff --git a/lib/noticelist.php b/lib/noticelist.php
index ae1438892..50a95cfcb 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -180,9 +180,9 @@ class NoticeListItem extends Widget
{
$this->showStart();
$this->showNotice();
+ $this->showNoticeAttachments();
$this->showNoticeInfo();
$this->showNoticeOptions();
- $this->showNoticeAttachments();
$this->showEnd();
}
@@ -214,18 +214,6 @@ class NoticeListItem extends Widget
return intval($file_oembed->c);
}
- function showNoticeAttachmentsIcon()
- {
- if (!($this->isUsedInList() && ($count = $this->attachmentCount()))) {
- return;
- }
-
- $href = common_local_url('shownotice', array('notice' => $this->notice->id)) . '#attachments';
- $this->out->elementStart('p', 'entry-attachments');
- $this->out->element('a', array('href' => $href, 'title' => "# of attachments: $count"), $count === 1 ? '' : $count);
- $this->out->elementEnd('p');
- }
-
function showNoticeInfo()
{
$this->out->elementStart('div', 'entry-content');