Merge branch '2021.03-rc' into copyright-2021

[friendica.git] / view / templates / profile / vcard.tpl

diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index 521738107ff42c534252f9dac777db4cf37a6594..c4e9ea1d15f90adb69438ef0700d1cbbedc234ab 100644 (file)
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -1,12 +1,10 @@
 
 <div class="vcard h-card">
 
-       <div class="fn label p-name">{{$profile.name}}</div>
+       <div class="fn p-name">{{$profile.name}}</div>
        
        {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
        
-       {{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
-
        {{if $profile.picdate}}
                <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
        {{else}}
@@ -15,16 +13,12 @@
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
        {{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
        {{if $location}}
-               <dl class="location"><dt class="location-label">{{$location}}</dt> 
-               <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-                       <span class="city-state-zip">
-                               <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                               <span class="region p-region">{{$profile.region}}</span>
-                               <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-                       </span>
-                       {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-               </dd>
+               <dl class="location">
+                       <dt class="location-label">{{$location}}</dt>
+                       <dd class="adr h-adr">
+                               {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
+                               {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
+                       </dd>
                </dl>
        {{/if}}
 
@@ -35,7 +29,7 @@
                </dl>
        {{/if}}
 
-       {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+       {{if $profile.upubkey}}<div class="key u-key" style="display:none;">{{$profile.upubkey}}</div>{{/if}}
 
        {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}