Rework Profile::sidebar profile link conditions

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

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index fe5762973fbb0113c8d3b7b5283d85f2a1576d3b..1ee33026690971072427c645fc9c9b1742e7975c 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -3,20 +3,21 @@
 
        <div class="fn label p-name">{{$profile.name}}</div>
        
-                               
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
        
-       {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</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}}
                <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 $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
+       {{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">
-                       {{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>
@@ -27,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}}
 
@@ -39,26 +47,28 @@
 
        {{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"}}
-       
+
        <div id="profile-extra-links">
                <ul>
-                       {{if $connect}}
-                               {{if $remoteconnect}}
-                                       <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                               {{else}}
-                                       <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                               {{/if}}
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+                       {{/if}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+                       {{/if}}
+                       {{if $wallmessage_link}}
+                               <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
                        {{/if}}
-                       {{if $wallmessage}}
-                               <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
                        {{/if}}
                </ul>
        </div>
 </div>
 
-{{$contact_block}}
+{{$contact_block nofilter}}