Merge pull request #7886 from nupplaphil/task/disable_drone

[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 793fec753af80935358308c177c95d6aef913a88..1673a9c9990d61d5b354246afb05c721ec7dd39c 100644 (file)
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ b/view/theme/frio/templates/profile_vcard.tpl
@@ -2,19 +2,19 @@
 
        <div id="profile-photo-wrapper">
                {{if $profile.picdate}}
-               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}" /></a>
+               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
                {{else}}
-               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name|escape}}" /></a>
+               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
                {{/if}}
 
                <div class="tool visible-lg visible-md">
                        {{if $profile.edit}}
                        <div class="action">
-                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3|escape}}"><i class="fa fa-pencil-square-o"></i></a>
+                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
                        </div>
                        {{else}}
                                {{if $profile.menu}}
-                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile|escape}}" href="profiles" ></a></div>
+                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
                                {{/if}}
                        {{/if}}
                </div>
@@ -25,50 +25,58 @@
        <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|escape}}" />
+                               {{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">
-                               <h4 class="media-heading">{{$profile.name|escape}}</h4>
-                               {{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr|escape}}</div>{{/if}}
+                               <h4 class="media-heading">{{$profile.name}}</h4>
+                               {{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr}}</div>{{/if}}
                        </div>
                </div>
        </div>
 
        <div class="panel-body">
                <div class="profile-header">
-                       <h3 class="fn p-name">{{$profile.name|escape}}</h3>
+                       <h3 class="fn p-name">{{$profile.name}}</h3>
+
+                       {{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
 
-                       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+                       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
-                       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc|escape}}</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|escape}}')">
+                               <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>
                                        <span class="">{{$wallmessage}}</span>
                                </button>
                        </div>
                        {{/if}}
                </div>
+               {{/if}}
 
                <div class="clear"></div>
 
@@ -76,13 +84,13 @@
                <div class="location detail">
                        <span class="location-label icon"><i class="fa fa-map-marker"></i></span>
                        <span class="adr">
-                               {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address}}</span>{{/if}}
+                               {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address nofilter}}</span>{{/if}}
                                <span class="city-state-zip">
-                                       <span class="locality p-locality">{{$profile.locality|escape}}</span>{{if $profile.locality}}, {{/if}}
-                                       <span class="region p-region">{{$profile.region|escape}}</span>
-                                       <span class="postal-code p-postal-code">{{$profile.postal_code|escape}}</span>
+                                       <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|escape}}</span>{{/if}}
+                               {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                        </span>
                </div>
                {{/if}}
@@ -90,38 +98,38 @@
                {{if $profile.xmpp}}
                <div class="xmpp">
                        <span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
-                       <span class="xmpp-data">{{$profile.xmpp|escape}}</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}}
 
                {{if $gender}}
                <div class="mf detail">
                        <span class="gender-label icon"><i class="fa fa-venus-mars"></i></span>
-                       <span class="p-gender">{{$profile.gender|escape}}</span>
+                       <span class="p-gender">{{$profile.gender}}</span>
                </div>
                {{/if}}
 
-               {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey|escape}}</div>{{/if}}
+               {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
 
-               {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts|escape}}</div>{{/if}}
+               {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
 
-               {{if $updated}}<div class="updated" style="display:none;">{{$updated|escape}}</div>{{/if}}
+               {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
                {{if $marital}}
                <div class="marital detail">
                        <span class="marital-label icon"><i class="fa fa-heart"></i></span>
-                       <span class="marital-text icon">{{$profile.marital|escape}}</span>
+                       <span class="marital-text icon">{{$profile.marital}}</span>
                </div>
                {{/if}}
 
                {{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|escape}}</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}}
 
-               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about|escape}}</dt><dd class="x-network">{{$profile.about}}</dd></dl>{{/if}}
+               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
                {{include file="diaspora_vcard.tpl"}}
        </div>
@@ -129,6 +137,6 @@
 
 {{if $contact_block}}
 <div class="widget" id="widget-contacts">
-       {{$contact_block}}
+       {{$contact_block nofilter}}
 </div>
 {{/if}}