From 49b71546ec7e056282c96e4b68b4db26800a7bf5 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 11 Mar 2020 08:19:28 -0400 Subject: [PATCH] Normalize vcard across themes display after profile fields reorganization --- view/templates/profile/vcard.tpl | 4 +--- view/theme/duepuntozero/templates/profile/vcard.tpl | 5 +++-- view/theme/quattro/templates/profile/vcard.tpl | 5 +++-- view/theme/vier/templates/profile/vcard.tpl | 4 +--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl index 521738107..32f7e0fcf 100644 --- a/view/templates/profile/vcard.tpl +++ b/view/templates/profile/vcard.tpl @@ -1,12 +1,10 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.addr}}
{{$profile.addr}}
{{/if}} - {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}} - {{if $profile.picdate}}
{{$profile.name}}
{{else}} diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl index 983d8faa5..1ea91f197 100644 --- a/view/theme/duepuntozero/templates/profile/vcard.tpl +++ b/view/theme/duepuntozero/templates/profile/vcard.tpl @@ -1,11 +1,10 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.addr}}
{{$profile.addr}}
{{/if}} - {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}}
{{$profile.name}}
{{if $account_type}}{{/if}} @@ -26,6 +25,8 @@ {{/if}} + {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}} + {{if $profile.pubkey}}{{/if}} {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl index 605574bf8..3bbb9e09f 100644 --- a/view/theme/quattro/templates/profile/vcard.tpl +++ b/view/theme/quattro/templates/profile/vcard.tpl @@ -1,7 +1,7 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.edit}}
{{$profile.edit.1}} @@ -17,7 +17,6 @@ {{if $profile.addr}}
{{$profile.addr}}
{{/if}} - {{if $about}}
{{$profile.about nofilter}}
{{/if}}
{{$profile.name}}
{{if $account_type}}{{/if}} @@ -38,6 +37,8 @@ {{/if}} + {{if $about}}
{{$profile.about nofilter}}
{{/if}} + {{if $profile.xmpp}}
{{$xmpp}}
diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl index 35f9099ab..c263ccde0 100644 --- a/view/theme/vier/templates/profile/vcard.tpl +++ b/view/theme/vier/templates/profile/vcard.tpl @@ -1,7 +1,7 @@
-
{{$profile.name}}
+
{{$profile.name}}
{{if $profile.edit}}
{{$profile.edit.1}} @@ -11,8 +11,6 @@ {{if $profile.addr}}
{{$profile.addr}}
{{/if}} - {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}} - {{if $profile.picdate}}
{{$profile.name}}
{{else}}