X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fprofile%2Fvcard.tpl;h=c4e9ea1d15f90adb69438ef0700d1cbbedc234ab;hb=befc2af5043a3afde251721c0d27df695db1bb7e;hp=32f7e0fcfa9f2669e56cd1391ccae4aa6d529136;hpb=7625eba86dc36f3f9c66edb711da72a0a005b529;p=friendica.git

diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
index 32f7e0fcfa..c4e9ea1d15 100644
--- a/view/templates/profile/vcard.tpl
+++ b/view/templates/profile/vcard.tpl
@@ -13,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}}
 
@@ -33,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}}