strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8406 from MrPetovan/bug/8404-vcard-normalization

Browse source 
Normalize vcard across themes display after profile fields reorganization
This commit is contained in:
Michael Vogel 2020-03-11 13:55:03 +01:00 committed by GitHub
parent e24e24688f 49b71546ec
commit 6d199965ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
view/templates/profile/vcard.tpl
View file

@ -1,12 +1,10 @@
<div class="vcard h-card">
<div class="fn label p-name">{{$profile.name}}</div>
<div class="fn p-name">{{$profile.name}}</div>
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about nofilter}}</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}}

5
view/theme/duepuntozero/templates/profile/vcard.tpl
View file

@ -1,11 +1,10 @@
<div class="vcard h-card">
<div class="fn label p-name">{{$profile.name}}</div>
<div class="fn p-name">{{$profile.name}}</div>
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about nofilter}}</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}}"></div>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
@ -26,6 +25,8 @@
</dl>
{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}

5
view/theme/quattro/templates/profile/vcard.tpl
View file

@ -1,7 +1,7 @@
<div class="vcard h-card">
<div class="tool">
<div class="fn label p-name">{{$profile.name}}</div>
<div class="fn p-name">{{$profile.name}}</div>
{{if $profile.edit}}
<div class="action">
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
@ -17,7 +17,6 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $about}}<div class="title">{{$profile.about nofilter}}</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}}" /></div>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
@ -38,6 +37,8 @@
</dl>
{{/if}}
{{if $about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
{{if $profile.xmpp}}
<dl class="xmpp">
<dt class="xmpp-label">{{$xmpp}}</dt>

4
view/theme/vier/templates/profile/vcard.tpl
View file

@ -1,7 +1,7 @@
<div class="vcard h-card">
<div class="tool">
<div class="fn label p-name">{{$profile.name}}</div>
<div class="fn p-name">{{$profile.name}}</div>
{{if $profile.edit}}
<div class="action">
<a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
@ -11,8 +11,6 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
{{if $profile.picdate}}
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
{{else}}