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 124fca154f16f965182c249a31b26e42208ea0f3..1ee33026690971072427c645fc9c9b1742e7975c 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -17,7 +17,7 @@
        {{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}}</div>{{/if}}
+                       {{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>
@@ -50,21 +50,20 @@
        {{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}}
+                       {{if $wallmessage_link}}
                                <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
                        {{/if}}
-                       {{if $subscribe_feed}}
-                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
                        {{/if}}
                </ul>
        </div>