Move title attribute to <time> tag
- Use correct machine-readable value in datetime attribute
This commit is contained in:
parent
53ca59d9b6
commit
23e1130264
|
@ -669,6 +669,7 @@ class Conversation
|
||||||
'folders' => $folders,
|
'folders' => $folders,
|
||||||
'text' => strip_tags($body_html),
|
'text' => strip_tags($body_html),
|
||||||
'localtime' => DateTimeFormat::local($item['created'], 'r'),
|
'localtime' => DateTimeFormat::local($item['created'], 'r'),
|
||||||
|
'utc' => DateTimeFormat::utc($item['created'], 'c'),
|
||||||
'ago' => (($item['app']) ? $this->l10n->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])),
|
'ago' => (($item['app']) ? $this->l10n->t('%s from %s', Temporal::getRelativeDate($item['created']), $item['app']) : Temporal::getRelativeDate($item['created'])),
|
||||||
'location_html' => $location_html,
|
'location_html' => $location_html,
|
||||||
'indent' => '',
|
'indent' => '',
|
||||||
|
|
|
@ -8,6 +8,7 @@ use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Module\BaseSettings;
|
use Friendica\Module\BaseSettings;
|
||||||
use Friendica\Security\TwoFactor;
|
use Friendica\Security\TwoFactor;
|
||||||
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Temporal;
|
use Friendica\Util\Temporal;
|
||||||
use UAParser\Parser;
|
use UAParser\Parser;
|
||||||
|
|
||||||
|
@ -88,7 +89,11 @@ class Trusted extends BaseSettings
|
||||||
$trustedBrowserDisplay = array_map(function (TwoFactor\Model\TrustedBrowser $trustedBrowser) use ($parser) {
|
$trustedBrowserDisplay = array_map(function (TwoFactor\Model\TrustedBrowser $trustedBrowser) use ($parser) {
|
||||||
$dates = [
|
$dates = [
|
||||||
'created_ago' => Temporal::getRelativeDate($trustedBrowser->created),
|
'created_ago' => Temporal::getRelativeDate($trustedBrowser->created),
|
||||||
|
'created_utc' => DateTimeFormat::utc($trustedBrowser->created, 'c'),
|
||||||
|
'created_local' => DateTimeFormat::local($trustedBrowser->created, 'r'),
|
||||||
'last_used_ago' => Temporal::getRelativeDate($trustedBrowser->last_used),
|
'last_used_ago' => Temporal::getRelativeDate($trustedBrowser->last_used),
|
||||||
|
'last_used_utc' => DateTimeFormat::utc($trustedBrowser->last_used, 'c'),
|
||||||
|
'last_used_local' => DateTimeFormat::local($trustedBrowser->last_used, 'r'),
|
||||||
];
|
];
|
||||||
|
|
||||||
$result = $parser->parse($trustedBrowser->user_agent);
|
$result = $parser->parse($trustedBrowser->user_agent);
|
||||||
|
|
|
@ -87,6 +87,8 @@ class AppSpecificPassword
|
||||||
|
|
||||||
array_walk($appSpecificPasswords, function (&$value) {
|
array_walk($appSpecificPasswords, function (&$value) {
|
||||||
$value['ago'] = Temporal::getRelativeDate($value['last_used']);
|
$value['ago'] = Temporal::getRelativeDate($value['last_used']);
|
||||||
|
$value['utc'] = DateTimeFormat::utc($value['last_used'], 'c');
|
||||||
|
$value['local'] = DateTimeFormat::local($value['last_used'], 'r');
|
||||||
});
|
});
|
||||||
|
|
||||||
return $appSpecificPasswords;
|
return $appSpecificPasswords;
|
||||||
|
|
|
@ -30,9 +30,7 @@
|
||||||
{{$app_specific_password.description}}
|
{{$app_specific_password.description}}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span class="time" title="{{$app_specific_password.last_used}}" data-toggle="tooltip">
|
<time class="time" title="{{$app_specific_password.local}}" data-toggle="tooltip" datetime="{{$app_specific_password.utc}}">{{$app_specific_password.ago}}</time>
|
||||||
<time datetime="{{$app_specific_password.last_used}}">{{$app_specific_password.ago}}</time>
|
|
||||||
</span>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<button type="submit" name="revoke_id" class="btn btn-default btn-small" value="{{$app_specific_password.id}}">{{$revoke_label}}</button>
|
<button type="submit" name="revoke_id" class="btn btn-default btn-small" value="{{$app_specific_password.id}}">{{$revoke_label}}</button>
|
||||||
|
|
|
@ -28,14 +28,10 @@
|
||||||
{{$trusted_browser.browser}}
|
{{$trusted_browser.browser}}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span class="time" title="{{$trusted_browser.created}}" data-toggle="tooltip">
|
<time class="time" title="{{$trusted_browser.created_local}}" data-toggle="tooltip" datetime="{{$trusted_browser.created_utc}}">{{$trusted_browser.created_ago}}</time>
|
||||||
<time datetime="{{$trusted_browser.created}}">{{$trusted_browser.created_ago}}</time>
|
|
||||||
</span>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span class="time" title="{{$trusted_browser.last_used}}" data-toggle="tooltip">
|
<time class="time" title="{{$trusted_browser.last_used_local}}" data-toggle="tooltip" datetime="{{$trusted_browser.last_used_utc}}">{{$trusted_browser.last_used_ago}}</time>
|
||||||
<time datetime="{{$trusted_browser.last_used}}">{{$trusted_browser.last_used_ago}}</time>
|
|
||||||
</span>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<button type="submit" name="remove_id" class="btn btn-default btn-small" value="{{$trusted_browser.cookie_hash}}">{{$remove_label}}</button>
|
<button type="submit" name="remove_id" class="btn btn-default btn-small" value="{{$trusted_browser.cookie_hash}}">{{$remove_label}}</button>
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="wall-item-author">
|
<div class="wall-item-author">
|
||||||
<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
|
<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
|
||||||
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time><span class="pinned">{{$item.pinned}}</span></div>
|
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><time class="dt-published" title="{{$item.localtime}}" datetime="{{$item.utc}}">{{$item.ago}}</time><span class="pinned">{{$item.pinned}}</span></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
|
<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
|
||||||
<div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}" dir="auto">{{$item.title}}</div>
|
<div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}" dir="auto">{{$item.title}}</div>
|
||||||
|
|
|
@ -67,7 +67,11 @@
|
||||||
|
|
||||||
<div class="additional-info text-muted">
|
<div class="additional-info text-muted">
|
||||||
<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
|
<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
|
||||||
<small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></a></small>
|
<small>
|
||||||
|
<a href="{{$item.plink.orig}}">
|
||||||
|
<time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
|
||||||
|
</a>
|
||||||
|
</small>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{if $item.location_html}}
|
{{if $item.location_html}}
|
||||||
|
|
|
@ -168,9 +168,7 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
|
<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
|
||||||
<small>
|
<small>
|
||||||
<a href="{{$item.plink.orig}}">
|
<a href="{{$item.plink.orig}}">
|
||||||
<span class="time" title="{{$item.localtime}}" data-toggle="tooltip">
|
<time class="time dt-published" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
|
||||||
<time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time>
|
|
||||||
</span>
|
|
||||||
</a>
|
</a>
|
||||||
{{if $item.owner_self}}
|
{{if $item.owner_self}}
|
||||||
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
|
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
|
||||||
|
@ -201,7 +199,9 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>
|
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>
|
||||||
<p class="text-muted">
|
<p class="text-muted">
|
||||||
<small>
|
<small>
|
||||||
<a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a>
|
<a href="{{$item.plink.orig}}">
|
||||||
|
<time class="time" class="wall-item-ago" datetime="{{$item.utc}}">{{$item.ago}}</time>
|
||||||
|
</a>
|
||||||
{{if $item.location_html}} — ({{$item.location_html nofilter}}){{/if}}
|
{{if $item.location_html}} — ({{$item.location_html nofilter}}){{/if}}
|
||||||
{{if $item.owner_self}}
|
{{if $item.owner_self}}
|
||||||
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
|
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
|
||||||
|
@ -220,7 +220,9 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span class="fakelink">{{$item.name}}</span></a>
|
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span class="fakelink">{{$item.name}}</span></a>
|
||||||
<span class="text-muted">
|
<span class="text-muted">
|
||||||
<small>
|
<small>
|
||||||
<a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a>
|
<a href="{{$item.plink.orig}}">
|
||||||
|
<time class="time" title="{{$item.localtime}}" data-toggle="tooltip" datetime="{{$item.utc}}">{{$item.ago}}</time>
|
||||||
|
</a>
|
||||||
{{if $item.location_html}} — ({{$item.location_html nofilter}}){{/if}}
|
{{if $item.location_html}} — ({{$item.location_html nofilter}}){{/if}}
|
||||||
{{if $item.owner_self}}
|
{{if $item.owner_self}}
|
||||||
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
|
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
|
||||||
|
|
|
@ -90,7 +90,7 @@
|
||||||
title="{{$item.linktitle}}"
|
title="{{$item.linktitle}}"
|
||||||
class="wall-item-name-link"><span
|
class="wall-item-name-link"><span
|
||||||
class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
|
class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
|
||||||
<span class="wall-item-ago" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span>
|
<span class="wall-item-ago"><time class="dt-published" title="{{$item.localtime}}" datetime="{{$item.utc}}">{{$item.ago}}</time></span>
|
||||||
<span class="pinned">{{$item.pinned}}</span>
|
<span class="pinned">{{$item.pinned}}</span>
|
||||||
{{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}
|
{{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
<span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span>
|
<span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span>
|
||||||
</a>
|
</a>
|
||||||
<div class="wall-item-ago">•</div>
|
<div class="wall-item-ago">•</div>
|
||||||
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time><span class="pinned">{{$item.pinned}}</span></div>
|
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><time class="dt-published" title="{{$item.localtime}}" datetime="{{$item.utc}}">{{$item.ago}}</time><span class="pinned">{{$item.pinned}}</span></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
|
<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
|
||||||
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
|
{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
|
||||||
<span class="wall-item-ago">
|
<span class="wall-item-ago">
|
||||||
{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
|
{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.utc}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.utc}}">{{$item.created}}</time> {{/if}}
|
||||||
{{if $item.owner_self}}
|
{{if $item.owner_self}}
|
||||||
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
|
{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user