GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

remove extraneous <dl> and <dt> tags

This commit is contained in:
Evan Prodromou 2011-01-14 15:36:06 -05:00
parent ca75adf408
commit 5c25364141
15 changed files with 130 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/publictagcloud.php
View File

@ -142,9 +142,6 @@ class PublictagcloudAction extends Action
ksort($tw); ksort($tw);
$this->elementStart('dl');
$this->element('dt', null, _('Tag cloud'));
$this->elementStart('dd');
$this->elementStart('ul', 'tags xoxo tag-cloud'); $this->elementStart('ul', 'tags xoxo tag-cloud');
foreach ($tw as $tag => $weight) { foreach ($tw as $tag => $weight) {
if ($sum) { if ($sum) {
@ -155,8 +152,7 @@ class PublictagcloudAction extends Action
$this->showTag($tag, $weight, $weightedSum); $this->showTag($tag, $weight, $weightedSum);
} }
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementEnd('div'); $this->elementEnd('div');
} else { } else {
$this->showEmptyList(); $this->showEmptyList();

67
actions/showapplication.php
View File

@ -155,42 +155,24 @@ class ShowApplicationAction extends OwnerDesignAction
$this->elementStart('div', 'entity_profile vcard'); $this->elementStart('div', 'entity_profile vcard');
$this->element('h2', null, _('Application profile')); $this->element('h2', null, _('Application profile'));
$this->elementStart('dl', 'entity_depiction');
$this->element('dt', null, _('Icon'));
$this->elementStart('dd');
if (!empty($this->application->icon)) { if (!empty($this->application->icon)) {
$this->element('img', array('src' => $this->application->icon, $this->element('img', array('src' => $this->application->icon,
'class' => 'photo logo')); 'class' => 'photo logo entity_depiction'));
} }
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_fn');
$this->element('dt', null, _('Name'));
$this->elementStart('dd');
$this->element('a', array('href' => $this->application->source_url, $this->element('a', array('href' => $this->application->source_url,
'class' => 'url fn'), 'class' => 'url fn entity_fn'),
$this->application->name); $this->application->name);
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_org');
$this->element('dt', null, _('Organization'));
$this->elementStart('dd');
$this->element('a', array('href' => $this->application->homepage, $this->element('a', array('href' => $this->application->homepage,
'class' => 'url'), 'class' => 'url entity_org'),
$this->application->organization); $this->application->organization);
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_note'); $this->element('div',
$this->element('dt', null, _('Description')); 'note entity_note',
$this->element('dd', 'note', $this->application->description); $this->application->description);
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_statistics'); $this->elementStart('div', 'entity_statistics');
$this->element('dt', null, _('Statistics'));
$this->elementStart('dd');
$defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess) $defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess)
? 'read-write' : 'read-only'; ? 'read-write' : 'read-only';
$profile = Profile::staticGet($this->application->owner); $profile = Profile::staticGet($this->application->owner);
@ -205,8 +187,8 @@ class ShowApplicationAction extends OwnerDesignAction
$defaultAccess, $defaultAccess,
$userCnt $userCnt
)); ));
$this->elementEnd('dd'); $this->elementEnd('div');
$this->elementEnd('dl');
$this->elementEnd('div'); $this->elementEnd('div');
$this->elementStart('div', 'entity_actions'); $this->elementStart('div', 'entity_actions');
@ -259,30 +241,21 @@ class ShowApplicationAction extends OwnerDesignAction
$this->elementStart('div', 'entity_data'); $this->elementStart('div', 'entity_data');
$this->element('h2', null, _('Application info')); $this->element('h2', null, _('Application info'));
$this->elementStart('dl', 'entity_consumer_key'); $this->element('div',
$this->element('dt', null, _('Consumer key')); 'entity_consumer_key',
$this->element('dd', null, $consumer->consumer_key); $consumer->consumer_key);
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_consumer_secret'); $this->element('div',
$this->element('dt', null, _('Consumer secret')); 'entity_consumer_secret',
$this->element('dd', null, $consumer->consumer_secret); $consumer->consumer_secret);
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_request_token_url'); $this->element('div',
$this->element('dt', null, _('Request token URL')); 'entity_request_token_url',
$this->element('dd', null, common_local_url('ApiOauthRequestToken')); common_local_url('ApiOauthRequestToken'));
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_access_token_url'); $this->element('div', 'entity_access_token_url', common_local_url('ApiOauthAccessToken'));
$this->element('dt', null, _('Access token URL'));
$this->element('dd', null, common_local_url('ApiOauthAccessToken'));
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_authorize_url'); $this->element('div', 'entity_authorize_url', common_local_url('ApiOauthAuthorize'));
$this->element('dt', null, _('Authorize URL'));
$this->element('dd', null, common_local_url('ApiOauthAuthorize'));
$this->elementEnd('dl');
$this->element('p', 'note', $this->element('p', 'note',
_('Note: We support HMAC-SHA1 signatures. We do not support the plaintext signature method.')); _('Note: We support HMAC-SHA1 signatures. We do not support the plaintext signature method.'));

69
actions/showgroup.php
View File

@ -216,83 +216,47 @@ class ShowgroupAction extends GroupDesignAction
$this->elementStart('div', array('id' => 'i', $this->elementStart('div', array('id' => 'i',
'class' => 'entity_profile vcard author')); 'class' => 'entity_profile vcard author'));
// TRANS: Group profile header (h2). Text hidden by default.
$this->element('h2', null, _('Group profile'));
$this->elementStart('dl', 'entity_depiction');
// TRANS: Label for group avatar (dt). Text hidden by default.
$this->element('dt', null, _('Avatar'));
$this->elementStart('dd');
$logo = ($this->group->homepage_logo) ? $logo = ($this->group->homepage_logo) ?
$this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE); $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
$this->element('img', array('src' => $logo, $this->element('img', array('src' => $logo,
'class' => 'photo avatar', 'class' => 'photo avatar entity_depiction',
'width' => AVATAR_PROFILE_SIZE, 'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE,
'alt' => $this->group->nickname)); 'alt' => $this->group->nickname));
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_nickname'); $hasFN = ($this->group->fullname) ? 'entity_nickname nickname url uid' :
// TRANS: Label for group nickname (dt). Text hidden by default. 'entity_nickname fn org nickname url uid';
$this->element('dt', null, _('Nickname'));
$this->elementStart('dd');
$hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid';
$this->element('a', array('href' => $this->group->homeUrl(), $this->element('a', array('href' => $this->group->homeUrl(),
'rel' => 'me', 'class' => $hasFN), 'rel' => 'me', 'class' => $hasFN),
$this->group->nickname); $this->group->nickname);
$this->elementEnd('dd');
$this->elementEnd('dl');
if ($this->group->fullname) { if ($this->group->fullname) {
$this->elementStart('dl', 'entity_fn'); $this->element('div', 'entity_fn fn org', $this->group->fullname);
// TRANS: Label for full group name (dt). Text hidden by default.
$this->element('dt', null, _('Full name'));
$this->elementStart('dd');
$this->element('span', 'fn org', $this->group->fullname);
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if ($this->group->location) { if ($this->group->location) {
$this->elementStart('dl', 'entity_location'); $this->element('div', 'entity_location label', $this->group->location);
// TRANS: Label for group location (dt). Text hidden by default.
$this->element('dt', null, _('Location'));
$this->element('dd', 'label', $this->group->location);
$this->elementEnd('dl');
} }
if ($this->group->homepage) { if ($this->group->homepage) {
$this->elementStart('dl', 'entity_url');
// TRANS: Label for group URL (dt). Text hidden by default.
$this->element('dt', null, _('URL'));
$this->elementStart('dd');
$this->element('a', array('href' => $this->group->homepage, $this->element('a', array('href' => $this->group->homepage,
'rel' => 'me', 'class' => 'url'), 'rel' => 'me',
'class' => 'url entity_url'),
$this->group->homepage); $this->group->homepage);
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if ($this->group->description) { if ($this->group->description) {
$this->elementStart('dl', 'entity_note'); $this->element('div', 'note entity_note', $this->group->description);
// TRANS: Label for group description or group note (dt). Text hidden by default.
$this->element('dt', null, _('Note'));
$this->element('dd', 'note', $this->group->description);
$this->elementEnd('dl');
} }
if (common_config('group', 'maxaliases') > 0) { if (common_config('group', 'maxaliases') > 0) {
$aliases = $this->group->getAliases(); $aliases = $this->group->getAliases();
if (!empty($aliases)) { if (!empty($aliases)) {
$this->elementStart('dl', 'entity_aliases'); $this->element('div',
// TRANS: Label for group aliases (dt). Text hidden by default. 'aliases entity_aliases',
$this->element('dt', null, _('Aliases')); implode(' ', $aliases));
$this->element('dd', 'aliases', implode(' ', $aliases));
$this->elementEnd('dl');
} }
} }
@ -447,15 +411,10 @@ class ShowgroupAction extends GroupDesignAction
// TRANS: Header for group statistics on a group page (h2). // TRANS: Header for group statistics on a group page (h2).
$this->element('h2', null, _('Statistics')); $this->element('h2', null, _('Statistics'));
$this->elementStart('dl', 'entity_created');
// @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message.
// TRANS: Label for creation date in statistics on group page.
$this->element('dt', null, _m('LABEL','Created'));
$this->element('dd', null, date('j M Y',
strtotime($this->group->created)));
$this->elementEnd('dl'); $this->elementEnd('dl');
$this->element('dt', null, _m('LABEL','Created'));
$this->elementStart('dl', 'entity_members'); $this->element('dd', 'entity_created', date('j M Y',
strtotime($this->group->created)));
// @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message. // @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message.
// TRANS: Label for member count in statistics on group page. // TRANS: Label for member count in statistics on group page.
$this->element('dt', null, _m('LABEL','Members')); $this->element('dt', null, _m('LABEL','Members'));

43
actions/tagother.php
View File

@ -77,58 +77,37 @@ class TagotherAction extends Action
$this->element('h2', null, _('User profile')); $this->element('h2', null, _('User profile'));
$avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
$this->elementStart('dl', 'entity_depiction');
$this->element('dt', null, _('Photo'));
$this->elementStart('dd');
$this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE), $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
'class' => 'photo avatar', 'class' => 'photo avatar entity_depiction',
'width' => AVATAR_PROFILE_SIZE, 'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE,
'alt' => 'alt' =>
($this->profile->fullname) ? $this->profile->fullname : ($this->profile->fullname) ? $this->profile->fullname :
$this->profile->nickname)); $this->profile->nickname));
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_nickname');
$this->element('dt', null, _('Nickname'));
$this->elementStart('dd');
$this->element('a', array('href' => $this->profile->profileurl, $this->element('a', array('href' => $this->profile->profileurl,
'class' => 'nickname'), 'class' => 'entity_nickname nickname'),
$this->profile->nickname); $this->profile->nickname);
$this->elementEnd('dd');
$this->elementEnd('dl');
if ($this->profile->fullname) { if ($this->profile->fullname) {
$this->elementStart('dl', 'entity_fn'); $this->element('div', 'fn entity_fn', $this->profile->fullname);
$this->element('dt', null, _('Full name'));
$this->elementStart('dd');
$this->element('span', 'fn', $this->profile->fullname);
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if ($this->profile->location) { if ($this->profile->location) {
$this->elementStart('dl', 'entity_location'); $this->element('div', 'label entity_location', $this->profile->location);
$this->element('dt', null, _('Location'));
$this->element('dd', 'label', $this->profile->location);
$this->elementEnd('dl');
} }
if ($this->profile->homepage) { if ($this->profile->homepage) {
$this->elementStart('dl', 'entity_url');
$this->element('dt', null, _('URL'));
$this->elementStart('dd');
$this->element('a', array('href' => $this->profile->homepage, $this->element('a', array('href' => $this->profile->homepage,
'rel' => 'me', 'class' => 'url'), 'rel' => 'me',
'class' => 'url entity_url'),
$this->profile->homepage); $this->profile->homepage);
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if ($this->profile->bio) { if ($this->profile->bio) {
$this->elementStart('dl', 'entity_note'); $this->element('div', 'note entity_note', $this->profile->bio);
$this->element('dt', null, _('Note'));
$this->element('dd', 'note', $this->profile->bio);
$this->elementEnd('dl');
} }
$this->elementEnd('div'); $this->elementEnd('div');
$this->elementStart('form', array('method' => 'post', $this->elementStart('form', array('method' => 'post',

53
actions/userauthorization.php
View File

@ -128,79 +128,56 @@ class UserauthorizationAction extends Action
$avatar = $params->getAvatarURL(); $avatar = $params->getAvatarURL();
$this->elementStart('div', 'entity_profile vcard'); $this->elementStart('div', 'entity_profile vcard');
$this->elementStart('dl', 'entity_depiction');
$this->element('dt', null, _('Photo'));
$this->elementStart('dd');
if ($avatar) { if ($avatar) {
$this->element('img', array('src' => $avatar, $this->element('img', array('src' => $avatar,
'class' => 'photo avatar', 'class' => 'photo avatar entity_depiction',
'width' => AVATAR_PROFILE_SIZE, 'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE,
'alt' => $nickname)); 'alt' => $nickname));
} }
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_nickname'); $this->element('div', 'entity_nickname', _('Nickname'));
$this->element('dt', null, _('Nickname'));
$this->elementStart('dd');
$hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname'; $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname';
// XXX: why are these raw() instead of escaped...?
$this->elementStart('a', array('href' => $profile, $this->elementStart('a', array('href' => $profile,
'class' => 'url '.$hasFN)); 'class' => 'url '.$hasFN));
$this->raw($nickname); $this->raw($nickname);
$this->elementEnd('a'); $this->elementEnd('a');
$this->elementEnd('dd');
$this->elementEnd('dl');
if (!is_null($fullname)) { if (!is_null($fullname)) {
$this->elementStart('dl', 'entity_fn'); $this->elementStart('div', 'fn entity_fn');
$this->elementStart('dd');
$this->elementStart('span', 'fn');
$this->raw($fullname); $this->raw($fullname);
$this->elementEnd('span'); $this->elementEnd('div');
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if (!is_null($location)) { if (!is_null($location)) {
$this->elementStart('dl', 'entity_location'); $this->elementStart('div', 'label entity_location');
$this->element('dt', null, _('Location'));
$this->elementStart('dd', 'label');
$this->raw($location); $this->raw($location);
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if (!is_null($homepage)) { if (!is_null($homepage)) {
$this->elementStart('dl', 'entity_url');
$this->element('dt', null, _('URL'));
$this->elementStart('dd');
$this->elementStart('a', array('href' => $homepage, $this->elementStart('a', array('href' => $homepage,
'class' => 'url')); 'class' => 'url entity_url'));
$this->raw($homepage); $this->raw($homepage);
$this->elementEnd('a'); $this->elementEnd('a');
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if (!is_null($bio)) { if (!is_null($bio)) {
$this->elementStart('dl', 'entity_note'); $this->elementStart('div', 'note entity_note');
$this->element('dt', null, _('Note'));
$this->elementStart('dd', 'note');
$this->raw($bio); $this->raw($bio);
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl');
} }
if (!is_null($license)) { if (!is_null($license)) {
$this->elementStart('dl', 'entity_license');
$this->element('dt', null, _('License'));
$this->elementStart('dd', 'license');
$this->element('a', array('href' => $license, $this->element('a', array('href' => $license,
'class' => 'license'), 'class' => 'license entity_license'),
$license); $license);
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
$this->elementEnd('div'); $this->elementEnd('div');
$this->elementStart('div', 'entity_actions'); $this->elementStart('div', 'entity_actions');

48
lib/action.php
View File

@ -526,11 +526,7 @@ class Action extends HTMLOutputter // lawsuit
function showPrimaryNav() function showPrimaryNav()
{ {
$user = common_current_user(); $user = common_current_user();
$this->elementStart('dl', array('id' => 'site_nav_global_primary')); $this->elementStart('ul', array('class' => 'nav site_nav_global_primary'));
// TRANS: DT element for primary navigation menu. String is hidden in default CSS.
$this->element('dt', null, _('Primary site navigation'));
$this->elementStart('dd');
$this->elementStart('ul', array('class' => 'nav'));
if (Event::handle('StartPrimaryNav', array($this))) { if (Event::handle('StartPrimaryNav', array($this))) {
if ($user) { if ($user) {
// TRANS: Tooltip for main menu option "Personal" // TRANS: Tooltip for main menu option "Personal"
@ -600,8 +596,6 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndPrimaryNav', array($this)); Event::handle('EndPrimaryNav', array($this));
} }
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
/** /**
@ -614,14 +608,10 @@ class Action extends HTMLOutputter // lawsuit
// Revist. Should probably do an hAtom pattern here // Revist. Should probably do an hAtom pattern here
$text = common_config('site', 'notice'); $text = common_config('site', 'notice');
if ($text) { if ($text) {
$this->elementStart('dl', array('id' => 'site_notice', $this->elementStart('div', array('id' => 'site_notice',
'class' => 'system_notice')); 'class' => 'system_notice'));
// TRANS: DT element for site notice. String is hidden in default CSS.
$this->element('dt', null, _('Site notice'));
$this->elementStart('dd', null);
$this->raw($text); $this->raw($text);
$this->elementEnd('dd'); $this->elementEnd('div');
$this->elementEnd('dl');
} }
} }
@ -682,13 +672,7 @@ class Action extends HTMLOutputter // lawsuit
*/ */
function showLocalNavBlock() function showLocalNavBlock()
{ {
$this->elementStart('dl', array('id' => 'site_nav_local_views'));
// TRANS: DT element for local views block. String is hidden in default CSS.
$this->element('dt', null, _('Local views'));
$this->elementStart('dd');
$this->showLocalNav(); $this->showLocalNav();
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
/** /**
@ -751,17 +735,13 @@ class Action extends HTMLOutputter // lawsuit
if ($dclass != 'Action' || Event::hasHandler('StartShowPageNotice')) { if ($dclass != 'Action' || Event::hasHandler('StartShowPageNotice')) {
$this->elementStart('dl', array('id' => 'page_notice', $this->elementStart('div', array('id' => 'page_notice',
'class' => 'system_notice')); 'class' => 'system_notice'));
// TRANS: DT element for page notice. String is hidden in default CSS.
$this->element('dt', null, _('Page notice'));
$this->elementStart('dd');
if (Event::handle('StartShowPageNotice', array($this))) { if (Event::handle('StartShowPageNotice', array($this))) {
$this->showPageNotice(); $this->showPageNotice();
Event::handle('EndShowPageNotice', array($this)); Event::handle('EndShowPageNotice', array($this));
} }
$this->elementEnd('dd'); $this->elementEnd('div');
$this->elementEnd('dl');
} }
} }
@ -853,11 +833,7 @@ class Action extends HTMLOutputter // lawsuit
*/ */
function showSecondaryNav() function showSecondaryNav()
{ {
$this->elementStart('dl', array('id' => 'site_nav_global_secondary')); $this->elementStart('ul', array('class' => 'nav site_nav_global_secondary'));
// TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
$this->element('dt', null, _('Secondary site navigation'));
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
if (Event::handle('StartSecondaryNav', array($this))) { if (Event::handle('StartSecondaryNav', array($this))) {
$this->menuItem(common_local_url('doc', array('title' => 'help')), $this->menuItem(common_local_url('doc', array('title' => 'help')),
// TRANS: Secondary navigation menu option leading to help on StatusNet. // TRANS: Secondary navigation menu option leading to help on StatusNet.
@ -893,8 +869,6 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndSecondaryNav', array($this)); Event::handle('EndSecondaryNav', array($this));
} }
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
/** /**
@ -904,10 +878,8 @@ class Action extends HTMLOutputter // lawsuit
*/ */
function showLicenses() function showLicenses()
{ {
$this->elementStart('dl', array('id' => 'licenses'));
$this->showStatusNetLicense(); $this->showStatusNetLicense();
$this->showContentLicense(); $this->showContentLicense();
$this->elementEnd('dl');
} }
/** /**
@ -1335,11 +1307,7 @@ class Action extends HTMLOutputter // lawsuit
{ {
// Does a little before-after block for next/prev page // Does a little before-after block for next/prev page
if ($have_before || $have_after) { if ($have_before || $have_after) {
$this->elementStart('dl', 'pagination'); $this->elementStart('ul', array('class' => 'nav pagination'));
// TRANS: DT element for pagination (previous/next, etc.).
$this->element('dt', null, _('Pagination'));
$this->elementStart('dd', null);
$this->elementStart('ul', array('class' => 'nav'));
} }
if ($have_before) { if ($have_before) {
$pargs = array('page' => $page-1); $pargs = array('page' => $page-1);
@ -1363,8 +1331,6 @@ class Action extends HTMLOutputter // lawsuit
} }
if ($have_before || $have_after) { if ($have_before || $have_after) {
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
} }

23
lib/attachmentlist.php
View File

@ -93,19 +93,12 @@ class AttachmentList extends Widget
function showListStart() function showListStart()
{ {
$this->out->elementStart('dl', array('id' =>'attachments', $this->out->elementStart('ol', array('class' => 'attachments entry-content'));
'class' => 'entry-content'));
// TRANS: DT element label in attachment list.
$this->out->element('dt', null, _('Attachments'));
$this->out->elementStart('dd');
$this->out->elementStart('ol', array('class' => 'attachments'));
} }
function showListEnd() function showListEnd()
{ {
$this->out->elementEnd('dd');
$this->out->elementEnd('ol'); $this->out->elementEnd('ol');
$this->out->elementEnd('dl');
} }
/** /**
@ -289,32 +282,22 @@ class Attachment extends AttachmentListItem
$this->out->elementStart('div', array('id' => 'oembed_info', $this->out->elementStart('div', array('id' => 'oembed_info',
'class' => 'entry-content')); 'class' => 'entry-content'));
if (!empty($this->oembed->author_name)) { if (!empty($this->oembed->author_name)) {
$this->out->elementStart('dl', 'vcard author'); $this->out->elementStart('div', 'fn vcard author');
// TRANS: DT element label in attachment list item.
$this->out->element('dt', null, _('Author'));
$this->out->elementStart('dd', 'fn');
if (empty($this->oembed->author_url)) { if (empty($this->oembed->author_url)) {
$this->out->text($this->oembed->author_name); $this->out->text($this->oembed->author_name);
} else { } else {
$this->out->element('a', array('href' => $this->oembed->author_url, $this->out->element('a', array('href' => $this->oembed->author_url,
'class' => 'url'), $this->oembed->author_name); 'class' => 'url'), $this->oembed->author_name);
} }
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
} }
if (!empty($this->oembed->provider)) { if (!empty($this->oembed->provider)) {
$this->out->elementStart('dl', 'vcard'); $this->out->elementStart('div', 'fn vcard');
// TRANS: DT element label in attachment list item.
$this->out->element('dt', null, _('Provider'));
$this->out->elementStart('dd', 'fn');
if (empty($this->oembed->provider_url)) { if (empty($this->oembed->provider_url)) {
$this->out->text($this->oembed->provider); $this->out->text($this->oembed->provider);
} else { } else {
$this->out->element('a', array('href' => $this->oembed->provider_url, $this->out->element('a', array('href' => $this->oembed->provider_url,
'class' => 'url'), $this->oembed->provider); 'class' => 'url'), $this->oembed->provider);
} }
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
} }
$this->out->elementEnd('div'); $this->out->elementEnd('div');
} }

7
lib/galleryaction.php
View File

@ -117,9 +117,6 @@ class GalleryAction extends OwnerDesignAction
$content[$t] = $t; $content[$t] = $t;
} }
if ($tags) { if ($tags) {
$this->elementStart('dl', array('id'=>'filter_tags'));
$this->element('dt', null, _('Filter tags'));
$this->elementStart('dd');
$this->elementStart('ul'); $this->elementStart('ul');
$this->elementStart('li', array('id' => 'filter_tags_all', $this->elementStart('li', array('id' => 'filter_tags_all',
'class' => 'child_1')); 'class' => 'child_1'));
@ -133,7 +130,7 @@ class GalleryAction extends OwnerDesignAction
$this->elementStart('li', array('id'=>'filter_tags_item')); $this->elementStart('li', array('id'=>'filter_tags_item'));
$this->elementStart('form', array('name' => 'bytag', $this->elementStart('form', array('name' => 'bytag',
'id' => 'form_filter_bytag', 'id' => 'form_filter_bytag',
'action' => common_path('?action=' . $this->trimmed('action')), 'action' => common_path('?action=' . $this->trimmed('action')),
'method' => 'post')); 'method' => 'post'));
$this->elementStart('fieldset'); $this->elementStart('fieldset');
$this->element('legend', null, _('Select tag to filter')); $this->element('legend', null, _('Select tag to filter'));
@ -145,8 +142,6 @@ class GalleryAction extends OwnerDesignAction
$this->elementEnd('form'); $this->elementEnd('form');
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
} }

7
lib/messageform.php
View File

@ -162,11 +162,10 @@ class MessageForm extends Form
$contentLimit = Message::maxContent(); $contentLimit = Message::maxContent();
if ($contentLimit > 0) { if ($contentLimit > 0) {
$this->out->elementStart('dl', 'form_note'); $this->out->element('span',
$this->out->element('dt', null, _('Available characters')); array('id' => 'notice_text-count',
$this->out->element('dd', array('id' => 'notice_text-count'), 'class' => 'form_note'),
$contentLimit); $contentLimit);
$this->out->elementEnd('dl');
} }
} }

7
lib/noticeform.php
View File

@ -182,11 +182,10 @@ class NoticeForm extends Form
$contentLimit = Notice::maxContent(); $contentLimit = Notice::maxContent();
if ($contentLimit > 0) { if ($contentLimit > 0) {
$this->out->elementStart('dl', 'form_note'); $this->out->element('span',
$this->out->element('dt', null, _('Available characters')); array('id' => 'notice_text-count',
$this->out->element('dd', array('id' => 'notice_text-count'), 'class' => 'form_note'),
$contentLimit); $contentLimit);
$this->out->elementEnd('dl');
} }
if (common_config('attachments', 'uploads')) { if (common_config('attachments', 'uploads')) {

29
lib/profileaction.php
View File

@ -187,53 +187,42 @@ class ProfileAction extends OwnerDesignAction
$this->element('h2', null, _('Statistics')); $this->element('h2', null, _('Statistics'));
// Other stats...? // Other stats...?
$this->elementStart('dl', 'entity_user-id'); $this->elementStart('dl');
$this->element('dt', null, _('User ID')); $this->element('dt', null, _('User ID'));
$this->element('dd', null, $this->profile->id); $this->element('dd', 'entity_user-id', $this->profile->id);
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_member-since');
$this->element('dt', null, _('Member since')); $this->element('dt', null, _('Member since'));
$this->element('dd', null, date('j M Y', $this->element('dd', 'entity_member-since', date('j M Y',
strtotime($this->profile->created))); strtotime($this->profile->created)));
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_subscriptions');
$this->elementStart('dt'); $this->elementStart('dt');
$this->element('a', array('href' => common_local_url('subscriptions', $this->element('a', array('href' => common_local_url('subscriptions',
array('nickname' => $this->profile->nickname))), array('nickname' => $this->profile->nickname))),
_('Subscriptions')); _('Subscriptions'));
$this->elementEnd('dt'); $this->elementEnd('dt');
$this->element('dd', null, $subs_count); $this->element('dd', 'entity_subscriptions', $subs_count);
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_subscribers');
$this->elementStart('dt'); $this->elementStart('dt');
$this->element('a', array('href' => common_local_url('subscribers', $this->element('a', array('href' => common_local_url('subscribers',
array('nickname' => $this->profile->nickname))), array('nickname' => $this->profile->nickname))),
_('Subscribers')); _('Subscribers'));
$this->elementEnd('dt'); $this->elementEnd('dt');
$this->element('dd', 'subscribers', $subbed_count); $this->element('dd', 'subscribers entity_subscribers', $subbed_count);
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_groups');
$this->elementStart('dt'); $this->elementStart('dt');
$this->element('a', array('href' => common_local_url('usergroups', $this->element('a', array('href' => common_local_url('usergroups',
array('nickname' => $this->profile->nickname))), array('nickname' => $this->profile->nickname))),
_('Groups')); _('Groups'));
$this->elementEnd('dt'); $this->elementEnd('dt');
$this->element('dd', 'groups', $group_count); $this->element('dd', 'groups entity_groups', $group_count);
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_notices');
$this->element('dt', null, _('Notices')); $this->element('dt', null, _('Notices'));
$this->element('dd', null, $notice_count); $this->element('dd', 'entity_notices', $notice_count);
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_daily_notices');
// TRANS: Average count of posts made per day since account registration // TRANS: Average count of posts made per day since account registration
$this->element('dt', null, _('Daily average')); $this->element('dt', null, _('Daily average'));
$this->element('dd', null, $daily_count); $this->element('dd', 'entity_daily_notices', $daily_count);
$this->elementEnd('dl'); $this->elementEnd('dl');
$this->elementEnd('div'); $this->elementEnd('div');

8
lib/searchaction.php
View File

@ -165,12 +165,10 @@ You can also try your search on other engines:
E_O_T E_O_T
), $qe, $qe, $qe, $qe, $qe); ), $qe, $qe, $qe, $qe, $qe);
} }
$this->elementStart('dl', array('id' => 'help_search', 'class' => 'help')); $this->elementStart('div', 'help instructions');
// TRANS: Definition list item with instructions on how to get (better) search results.
$this->element('dt', null, _('Search help'));
$this->elementStart('dd', 'instructions');
$this->raw(common_markup_to_html($message)); $this->raw(common_markup_to_html($message));
$this->elementEnd('dd'); $this->elementEnd('div');
$this->elementEnd('div'); $this->elementEnd('div');
} }
} }

8
lib/subscriptionlist.php
View File

@ -98,8 +98,6 @@ class SubscriptionListItem extends ProfileListItem
{ {
$tags = Profile_tag::getTags($this->owner->id, $this->profile->id); $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
$this->out->elementStart('dl', 'entity_tags');
$this->out->elementStart('dt');
if ($this->isOwn()) { if ($this->isOwn()) {
$this->out->element('a', array('href' => common_local_url('tagother', $this->out->element('a', array('href' => common_local_url('tagother',
array('id' => $this->profile->id))), array('id' => $this->profile->id))),
@ -107,10 +105,8 @@ class SubscriptionListItem extends ProfileListItem
} else { } else {
$this->out->text(_('Tags')); $this->out->text(_('Tags'));
} }
$this->out->elementEnd('dt');
$this->out->elementStart('dd');
if ($tags) { if ($tags) {
$this->out->elementStart('ul', 'tags xoxo'); $this->out->elementStart('ul', 'tags xoxo entity_tags');
foreach ($tags as $tag) { foreach ($tags as $tag) {
$this->out->elementStart('li'); $this->out->elementStart('li');
// Avoid space by using raw output. // Avoid space by using raw output.
@ -126,7 +122,5 @@ class SubscriptionListItem extends ProfileListItem
} else { } else {
$this->out->text(_('(None)')); $this->out->text(_('(None)'));
} }
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
} }
} }

79
lib/userprofile.php
View File

@ -103,26 +103,21 @@ class UserProfile extends Widget
$avatar = $this->profile->getAvatar(73); $avatar = $this->profile->getAvatar(73);
} }
$this->out->elementStart('dl', 'entity_depiction'); $this->out->element('img',
$this->out->element('dt', null, _('Photo')); array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
$this->out->elementStart('dd'); 'class' => 'photo avatar entity_depiction',
$this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE), 'width' => AVATAR_PROFILE_SIZE,
'class' => 'photo avatar', 'height' => AVATAR_PROFILE_SIZE,
'width' => AVATAR_PROFILE_SIZE, 'alt' => $this->profile->nickname));
'height' => AVATAR_PROFILE_SIZE,
'alt' => $this->profile->nickname));
$this->out->elementEnd('dd');
$cur = common_current_user(); $cur = common_current_user();
if ($cur && $cur->id == $this->profile->id) { if ($cur && $cur->id == $this->profile->id) {
$this->out->elementStart('dd');
$this->out->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar')); $this->out->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
$this->out->elementEnd('dd');
} }
$this->out->elementEnd('dl'); Event::handle('EndProfilePageAvatar',
array($this->out, $this->profile));
Event::handle('EndProfilePageAvatar', array($this->out, $this->profile));
} }
} }
@ -130,15 +125,12 @@ class UserProfile extends Widget
{ {
if (Event::handle('StartProfilePageNickname', array($this->out, $this->profile))) { if (Event::handle('StartProfilePageNickname', array($this->out, $this->profile))) {
$this->out->elementStart('dl', 'entity_nickname'); $hasFN = ($this->profile->fullname) ? 'entity_nickname nickname url uid' : 'entity_nickname fn nickname url uid';
$this->out->element('dt', null, _('Nickname')); $this->out->element('a',
$this->out->elementStart('dd'); array('href' => $this->profile->profileurl,
$hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid'; 'rel' => 'me',
$this->out->element('a', array('href' => $this->profile->profileurl, 'class' => $hasFN),
'rel' => 'me', 'class' => $hasFN),
$this->profile->nickname); $this->profile->nickname);
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
Event::handle('EndProfilePageNickname', array($this->out, $this->profile)); Event::handle('EndProfilePageNickname', array($this->out, $this->profile));
} }
@ -148,12 +140,9 @@ class UserProfile extends Widget
{ {
if (Event::handle('StartProfilePageFullName', array($this->out, $this->profile))) { if (Event::handle('StartProfilePageFullName', array($this->out, $this->profile))) {
if ($this->profile->fullname) { if ($this->profile->fullname) {
$this->out->elementStart('dl', 'entity_fn'); $this->out->element('span',
$this->out->element('dt', null, _('Full name')); 'entity_fn fn',
$this->out->elementStart('dd'); $this->profile->fullname);
$this->out->element('span', 'fn', $this->profile->fullname);
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
} }
Event::handle('EndProfilePageFullName', array($this->out, $this->profile)); Event::handle('EndProfilePageFullName', array($this->out, $this->profile));
} }
@ -163,10 +152,9 @@ class UserProfile extends Widget
{ {
if (Event::handle('StartProfilePageLocation', array($this->out, $this->profile))) { if (Event::handle('StartProfilePageLocation', array($this->out, $this->profile))) {
if ($this->profile->location) { if ($this->profile->location) {
$this->out->elementStart('dl', 'entity_location'); $this->out->element('span',
$this->out->element('dt', null, _('Location')); 'entity_location label',
$this->out->element('dd', 'label', $this->profile->location); $this->profile->location);
$this->out->elementEnd('dl');
} }
Event::handle('EndProfilePageLocation', array($this->out, $this->profile)); Event::handle('EndProfilePageLocation', array($this->out, $this->profile));
} }
@ -176,14 +164,11 @@ class UserProfile extends Widget
{ {
if (Event::handle('StartProfilePageHomepage', array($this->out, $this->profile))) { if (Event::handle('StartProfilePageHomepage', array($this->out, $this->profile))) {
if ($this->profile->homepage) { if ($this->profile->homepage) {
$this->out->elementStart('dl', 'entity_url'); $this->out->element('a',
$this->out->element('dt', null, _('URL')); array('href' => $this->profile->homepage,
$this->out->elementStart('dd'); 'rel' => 'me',
$this->out->element('a', array('href' => $this->profile->homepage, 'class' => 'url entity_url'),
'rel' => 'me', 'class' => 'url'),
$this->profile->homepage); $this->profile->homepage);
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
} }
Event::handle('EndProfilePageHomepage', array($this->out, $this->profile)); Event::handle('EndProfilePageHomepage', array($this->out, $this->profile));
} }
@ -193,10 +178,9 @@ class UserProfile extends Widget
{ {
if (Event::handle('StartProfilePageBio', array($this->out, $this->profile))) { if (Event::handle('StartProfilePageBio', array($this->out, $this->profile))) {
if ($this->profile->bio) { if ($this->profile->bio) {
$this->out->elementStart('dl', 'entity_note'); $this->out->element('div',
$this->out->element('dt', null, _('Note')); 'note entity_note',
$this->out->element('dd', 'note', $this->profile->bio); $this->profile->bio);
$this->out->elementEnd('dl');
} }
Event::handle('EndProfilePageBio', array($this->out, $this->profile)); Event::handle('EndProfilePageBio', array($this->out, $this->profile));
} }
@ -208,10 +192,7 @@ class UserProfile extends Widget
$tags = Profile_tag::getTags($this->profile->id, $this->profile->id); $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
if (count($tags) > 0) { if (count($tags) > 0) {
$this->out->elementStart('dl', 'entity_tags'); $this->out->elementStart('ul', 'tags xoxo entity_tags');
$this->out->element('dt', null, _('Tags'));
$this->out->elementStart('dd');
$this->out->elementStart('ul', 'tags xoxo');
foreach ($tags as $tag) { foreach ($tags as $tag) {
$this->out->elementStart('li'); $this->out->elementStart('li');
// Avoid space by using raw output. // Avoid space by using raw output.
@ -222,8 +203,6 @@ class UserProfile extends Widget
$this->out->elementEnd('li'); $this->out->elementEnd('li');
} }
$this->out->elementEnd('ul'); $this->out->elementEnd('ul');
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
} }
Event::handle('EndProfilePageProfileTags', array($this->out, $this->profile)); Event::handle('EndProfilePageProfileTags', array($this->out, $this->profile));
} }

44
plugins/OStatus/actions/ostatussub.php
View File

@ -163,65 +163,41 @@ class OStatusSubAction extends Action
} }
$this->elementStart('div', 'entity_profile vcard'); $this->elementStart('div', 'entity_profile vcard');
$this->elementStart('dl', 'entity_depiction');
$this->element('dt', null, _m('Photo'));
$this->elementStart('dd');
$this->element('img', array('src' => $avatar, $this->element('img', array('src' => $avatar,
'class' => 'photo avatar', 'class' => 'photo avatar entity_depiction',
'width' => AVATAR_PROFILE_SIZE, 'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE,
'alt' => $nickname)); 'alt' => $nickname));
$this->elementEnd('dd');
$this->elementEnd('dl');
$this->elementStart('dl', 'entity_nickname'); $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname entity_nickname';
$this->element('dt', null, _m('Nickname'));
$this->elementStart('dd');
$hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname';
$this->elementStart('a', array('href' => $profile, $this->elementStart('a', array('href' => $profile,
'class' => 'url '.$hasFN)); 'class' => 'url '.$hasFN));
$this->raw($nickname); $this->raw($nickname);
$this->elementEnd('a'); $this->elementEnd('a');
$this->elementEnd('dd');
$this->elementEnd('dl');
if (!is_null($fullname)) { if (!is_null($fullname)) {
$this->elementStart('dl', 'entity_fn'); $this->elementStart('div', 'fn entity_fn');
$this->elementStart('dd');
$this->elementStart('span', 'fn');
$this->raw($fullname); $this->raw($fullname);
$this->elementEnd('span'); $this->elementEnd('div');
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if (!is_null($location)) { if (!is_null($location)) {
$this->elementStart('dl', 'entity_location'); $this->elementStart('div', 'label entity_location');
$this->element('dt', null, _m('Location'));
$this->elementStart('dd', 'label');
$this->raw($location); $this->raw($location);
$this->elementEnd('dd'); $this->elementEnd('div');
$this->elementEnd('dl');
} }
if (!is_null($homepage)) { if (!is_null($homepage)) {
$this->elementStart('dl', 'entity_url');
$this->element('dt', null, _m('URL'));
$this->elementStart('dd');
$this->elementStart('a', array('href' => $homepage, $this->elementStart('a', array('href' => $homepage,
'class' => 'url')); 'class' => 'url entity_url'));
$this->raw($homepage); $this->raw($homepage);
$this->elementEnd('a'); $this->elementEnd('a');
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
if (!is_null($note)) { if (!is_null($note)) {
$this->elementStart('dl', 'entity_note'); $this->elementStart('div', 'note entity_note');
$this->element('dt', null, _m('Note'));
$this->elementStart('dd', 'note');
$this->raw($note); $this->raw($note);
$this->elementEnd('dd'); $this->elementEnd('div');
$this->elementEnd('dl');
} }
$this->elementEnd('div'); $this->elementEnd('div');
} }