Merge pull request #6589 from rabuzarus/20190204_-_show_forum_account_in_vcard

frio: add account type to the profile vcard
This commit is contained in:
Hypolite Petovan 2019-02-04 19:02:43 -05:00 committed by GitHub
commit cf9a65cded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View file

@ -1135,7 +1135,9 @@ aside .vcard .p-addr {
white-space: nowrap; white-space: nowrap;
padding-bottom: 2px; padding-bottom: 2px;
} }
aside .vcard .title {
margin-top: 10px;
}
aside .vcard .detail { aside .vcard .detail {
display: table; display: table;
padding: 5px 0; padding: 5px 0;
@ -1150,6 +1152,7 @@ aside .vcard .icon {
} }
#profile-extra-links { #profile-extra-links {
overflow: auto; overflow: auto;
margin-bottom: 10px;
} }
aside .vcard #dfrn-request-link-button, aside .vcard #dfrn-request-link-button,
aside .vcard #wallmessage-link-botton { aside .vcard #wallmessage-link-botton {

View file

@ -42,6 +42,8 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}} {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
</div> </div>
<div id="profile-extra-links"> <div id="profile-extra-links">

View file

@ -28,9 +28,9 @@
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}} {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
{{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}} {{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
{{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}} {{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
</div> </div>