X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftemplates%2Fprofile%2Fvcard.tpl;h=c4e9ea1d15f90adb69438ef0700d1cbbedc234ab;hb=befc2af5043a3afde251721c0d27df695db1bb7e;hp=521738107ff42c534252f9dac777db4cf37a6594;hpb=d6ed0068e6c8bf513e40a5d29b73d100f664261b;p=friendica.git
diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index 521738107f..c4e9ea1d15 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}}
{{else}}
@@ -15,16 +13,12 @@
{{if $account_type}}
{{$account_type}}
{{/if}}
{{if $profile.network_link}}
- {{$network}}
- {{$profile.network_link nofilter}}
{{/if}}
{{if $location}}
-
- {{$location}}
- -
- {{if $profile.address}}
{{$profile.address nofilter}}
{{/if}}
-
- {{$profile.locality}}{{if $profile.locality}}, {{/if}}
- {{$profile.region}}
- {{$profile.postal_code}}
-
- {{if $profile.country_name}}{{$profile.country_name}}{{/if}}
-
+
+ - {{$location}}
+ -
+ {{if $profile.address}}
{{$profile.address nofilter}}
{{/if}}
+ {{if $profile.location}}{{$profile.location}}
{{/if}}
+
{{/if}}
@@ -35,7 +29,7 @@
{{/if}}
- {{if $profile.pubkey}}
{{$profile.pubkey}}
{{/if}}
+ {{if $profile.upubkey}}
{{$profile.upubkey}}
{{/if}}
{{if $contacts}}
{{$contacts}}
{{/if}}