diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index d8cbbf7cbb..8fb078fce3 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -669,6 +669,7 @@ class Conversation 'folders' => $folders, 'text' => strip_tags($body_html), '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'])), 'location_html' => $location_html, 'indent' => '', diff --git a/src/Module/Settings/TwoFactor/Trusted.php b/src/Module/Settings/TwoFactor/Trusted.php index e38d64ac04..844cd4dff4 100644 --- a/src/Module/Settings/TwoFactor/Trusted.php +++ b/src/Module/Settings/TwoFactor/Trusted.php @@ -8,6 +8,7 @@ use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; use Friendica\Core\Renderer; use Friendica\Module\BaseSettings; use Friendica\Security\TwoFactor; +use Friendica\Util\DateTimeFormat; use Friendica\Util\Temporal; use UAParser\Parser; @@ -88,7 +89,11 @@ class Trusted extends BaseSettings $trustedBrowserDisplay = array_map(function (TwoFactor\Model\TrustedBrowser $trustedBrowser) use ($parser) { $dates = [ '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_utc' => DateTimeFormat::utc($trustedBrowser->last_used, 'c'), + 'last_used_local' => DateTimeFormat::local($trustedBrowser->last_used, 'r'), ]; $result = $parser->parse($trustedBrowser->user_agent); diff --git a/src/Security/TwoFactor/Model/AppSpecificPassword.php b/src/Security/TwoFactor/Model/AppSpecificPassword.php index cab1604838..0c47ed5564 100644 --- a/src/Security/TwoFactor/Model/AppSpecificPassword.php +++ b/src/Security/TwoFactor/Model/AppSpecificPassword.php @@ -87,6 +87,8 @@ class AppSpecificPassword array_walk($appSpecificPasswords, function (&$value) { $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; diff --git a/view/templates/settings/twofactor/app_specific.tpl b/view/templates/settings/twofactor/app_specific.tpl index 1f58267445..965caffc8c 100644 --- a/view/templates/settings/twofactor/app_specific.tpl +++ b/view/templates/settings/twofactor/app_specific.tpl @@ -30,9 +30,7 @@ {{$app_specific_password.description}} - - - + diff --git a/view/templates/settings/twofactor/trusted_browsers.tpl b/view/templates/settings/twofactor/trusted_browsers.tpl index e6d434b4fe..29d2ab29c6 100644 --- a/view/templates/settings/twofactor/trusted_browsers.tpl +++ b/view/templates/settings/twofactor/trusted_browsers.tpl @@ -28,14 +28,10 @@ {{$trusted_browser.browser}} - - - + - - - + diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index c7da59a0de..d0e3b51eab 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -53,7 +53,7 @@
{{$item.name}}{{if $item.owner_url}} {{$item.to}} {{$item.owner_name}} {{$item.vwall}}{{/if}}
-
{{$item.pinned}}
+
{{$item.pinned}}
{{$item.title}}
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index 344e73f1d9..95e83ce8d6 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -67,7 +67,11 @@
{{if $item.location_html}} diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index e91b1b99f8..17f2c9d79b 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -168,9 +168,7 @@ as the value of $top_child_total (this is done at the end of this file)
- - - + {{if $item.owner_self}} {{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) {{$item.name}}

- {{$item.ago}} + + + {{if $item.location_html}} — ({{$item.location_html nofilter}}){{/if}} {{if $item.owner_self}} {{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) {{$item.name}} - {{$item.ago}} + + + {{if $item.location_html}} — ({{$item.location_html nofilter}}){{/if}} {{if $item.owner_self}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}} diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl index 3eab3f5690..29dae72b43 100644 --- a/view/theme/quattro/templates/wall_thread.tpl +++ b/view/theme/quattro/templates/wall_thread.tpl @@ -90,7 +90,7 @@ title="{{$item.linktitle}}" class="wall-item-name-link">{{$item.name}} - + {{$item.pinned}} {{if $item.owner_url}}
{{$item.to}} {{$item.owner_name}} {{$item.vwall}} {{/if}} diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl index 37bff21544..773938f3c5 100644 --- a/view/theme/smoothly/templates/wall_thread.tpl +++ b/view/theme/smoothly/templates/wall_thread.tpl @@ -54,7 +54,7 @@ {{$item.name}}

-
{{$item.pinned}}
+
{{$item.pinned}}
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl index 1d13b9e528..f2bd02e7e7 100644 --- a/view/theme/vier/templates/wall_thread.tpl +++ b/view/theme/vier/templates/wall_thread.tpl @@ -56,7 +56,7 @@ {{$item.name}} {{if $item.owner_url}}{{$item.via}} {{$item.owner_name}}{{/if}} - {{if $item.plink}}{{else}} {{/if}} + {{if $item.plink}}{{else}} {{/if}} {{if $item.owner_self}} {{include file="sub/delivery_count.tpl" delivery=$item.delivery}} {{/if}}