Merge pull request #6490 from tobiasd/20190122-adminfedstat

[friendica.git] / view / templates / profile_vcard.tpl

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index 0f1cf070c4fcbb07999c8deaaa5cbe569ba6041a..192c860de8a0e626b756ab88f32fcb680a1e6a07 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -13,11 +13,11 @@
                <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
        {{/if}}
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-       {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/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">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
+               <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>
@@ -28,7 +28,14 @@
                </dl>
        {{/if}}
 
-       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender p-gender-identity">{{$profile.gender}}</dd></dl>{{/if}}
+       {{if $profile.xmpp}}
+               <dl class="xmpp">
+               <dt class="xmpp-label">{{$xmpp}}</dt>
+               <dd class="xmpp-data">{{$profile.xmpp}}</dd>
+               </dl>
+       {{/if}}
+
+       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
        
        {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
 
@@ -40,7 +47,7 @@
 
        {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
 
-       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about}}</dd></dl>{{/if}}
+       {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
        {{include file="diaspora_vcard.tpl"}}
        
@@ -63,6 +70,6 @@
        </div>
 </div>
 
-{{$contact_block}}
+{{$contact_block nofilter}}