<div class="vcard h-card">
- <div class="fn label p-name">{{$profile.name|escape}}</div>
+ <div class="fn label p-name">{{$profile.name}}</div>
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
- <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}"></div>
+ <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{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 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>
{{include file="diaspora_vcard.tpl"}}
- <div id="profile-vcard-break"></div>
+ <div id="profile-vcard-break"></div>
<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 $wallmessage}}
+ {{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 $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>
</div>
-{{$contact_block}}
+{{$contact_block nofilter}}