Changed the option to enable the smart threading with the option to disable this

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

diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl
index 02aa89fcccc3eb3f53954d923446d0106f593719..1673a9c9990d61d5b354246afb05c721ec7dd39c 100644 (file)
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ b/view/theme/frio/templates/profile_vcard.tpl
@@ -25,7 +25,11 @@
        <div id="vcard-short-info-wrapper" style="display: none;">
                <div id="vcard-short-info" class="media" style="display: none">
                        <div id="vcard-short-photo-wrapper" class="pull-left">
-                               <img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}" />
+                               {{if $profile.picdate}}
+                               <img class="media-object" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a>
+                               {{else}}
+                               <img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}"></a>
+                               {{/if}}
                        </div>
 
                        <div id="vcard-short-desc" class="media-body">
@@ -39,30 +43,31 @@
                <div class="profile-header">
                        <h3 class="fn p-name">{{$profile.name}}</h3>
 
-                       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+                       {{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
 
                        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
                        {{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
                </div>
 
+               {{if $follow_link || $unfollow_link || $wallmessage_link}}
                <div id="profile-extra-links">
-                       {{if $connect}}
+                       {{if $follow_link || $unfollow_link}}
                        <div id="dfrn-request-link-button">
-                               {{if $remoteconnect}}
-                               <a id="dfrn-request-link" class="btn btn-primary btn-sm" href="{{$remoteconnect}}">
-                                       <span class=""><i class="fa fa-user-plus"></i></span>
-                                       <span class="">{{$connect}}</span>
+                               {{if $unfollow_link}}
+                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
+                                       <span class=""><i class="fa fa-user-times"></i></span>
+                                       <span class="">{{$unfollow}}</span>
                                </a>
                                {{else}}
-                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="dfrn_request/{{$profile.nickname}}">
+                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
                                        <span class=""><i class="fa fa-user-plus"></i></span>
-                                       <span class="">{{$connect}}</span>
+                                       <span class="">{{$follow}}</span>
                                </a>
                                {{/if}}
                        </div>
                        {{/if}}
-                       {{if $wallmessage}}
+                       {{if $wallmessage_link}}
                        <div id="wallmessage-link-botton">
                                <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
                                        <span class=""><i class="fa fa-envelope"></i></span>
@@ -71,6 +76,7 @@
                        </div>
                        {{/if}}
                </div>
+               {{/if}}
 
                <div class="clear"></div>
 
@@ -92,7 +98,7 @@
                {{if $profile.xmpp}}
                <div class="xmpp">
                        <span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
-                       <span class="xmpp-data">{{$profile.xmpp}}</span>
+                       <span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
                </div>
                {{/if}}
 
@@ -119,7 +125,7 @@
                {{if $homepage}}
                <div class="homepage detail">
                        <span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
-                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></span>
+                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a></span>
                </div>
                {{/if}}