diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-09-02 16:42:15 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-09-02 16:42:15 -0400 |
commit | a535ccdc4eba320ad88dc531329ae63c7f09c258 (patch) | |
tree | a8448dfe0b764818562ca9d04a39f04d4978dead /lib/mailbox.php | |
parent | f949c2c9d9afa63496f26b33d0309f8d06f77520 (diff) | |
parent | 0c95734a6874608ea5ed44608cabeda7c3a1b4ea (diff) |
Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts:
lib/common.php
lib/twitter.php
Diffstat (limited to 'lib/mailbox.php')
-rw-r--r-- | lib/mailbox.php | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/lib/mailbox.php b/lib/mailbox.php index a09bf1060..e1d384a06 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -213,26 +213,20 @@ class MailboxAction extends CurrentUserDesignAction } $this->elementStart('div', 'entry-content'); - $this->elementStart('dl', 'timestamp'); - $this->element('dt', null, _('Published')); - $this->elementStart('dd', null); - $dt = common_date_iso8601($message->created); $this->elementStart('a', array('rel' => 'bookmark', + 'class' => 'timestamp', 'href' => $messageurl)); + $dt = common_date_iso8601($message->created); $this->element('abbr', array('class' => 'published', 'title' => $dt), common_date_string($message->created)); $this->elementEnd('a'); - $this->elementEnd('dd'); - $this->elementEnd('dl'); if ($message->source) { - $this->elementStart('dl', 'device'); - $this->elementStart('dt'); - $this->text(_('From')); - $this->elementEnd('dt'); - $this->showSource($message->source); - $this->elementEnd('dl'); + $this->elementStart('span', 'source'); + $this->text(_('from')); + $this->element('span', 'device', $this->showSource($message->source)); + $this->elementEnd('span'); } $this->elementEnd('div'); @@ -277,18 +271,18 @@ class MailboxAction extends CurrentUserDesignAction case 'mail': case 'omb': case 'api': - $this->element('dd', null, $source_name); + $this->element('span', 'device', $source_name); break; default: $ns = Notice_source::staticGet($source); if ($ns) { - $this->elementStart('dd', null); + $this->elementStart('span', 'device'); $this->element('a', array('href' => $ns->url, - 'rel' => 'external'), - $ns->name); - $this->elementEnd('dd'); + 'rel' => 'external'), + $ns->name); + $this->elementEnd('span'); } else { - $this->element('dd', null, $source_name); + $this->out->element('span', 'device', $source_name); } break; } |