Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 01:25:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into app-user2

Browse source
This commit is contained in:
Michael 2021-08-09 15:32:32 +00:00
commit 4495e83eca
36 changed files with 446 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

482
view/lang/C/messages.po
View file

File diff suppressed because it is too large Load diff

1
view/templates/contact_edit.tpl
View file

@ -51,6 +51,7 @@
<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location nofilter}}</dd></dl>{{/if}}
{{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
{{if $matrix}}<dl><dt>{{$matrix_label}}</dt><dd>{{$matrix}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
</div>{{* End of contact-edit-links *}}

8
view/templates/profile/profile.tpl
View file

@ -77,6 +77,14 @@
</dl>
{{/if}}
{{if $basic_fields.matrix}}
<dl id="aprofile-matrix" class="row {{$basic_fields.matrix.class|default:'aprofile'}}">
<hr class="profile-separator">
<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.matrix.label}}</dt>
<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.matrix.value nofilter}}</dd>
</dl>
{{/if}}
{{if $basic_fields.pub_keywords}}
<dl id="aprofile-tags" class="row {{$basic_fields.pub_keywords.class|default:'aprofile'}}">
<hr class="profile-separator">

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

@ -29,6 +29,13 @@
</dl>
{{/if}}
{{if $profile.matrix}}
<dl class="matrix">
<dt class="matrix-label">{{$matrix}}</dt>
<dd class="matrix-data">{{$profile.matrix}}</dd>
</dl>
{{/if}}
{{if $profile.upubkey}}<div class="key u-key" style="display:none;">{{$profile.upubkey}}</div>{{/if}}
{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}

6
view/templates/settings/profile/index.tpl
View file

@ -80,6 +80,12 @@
</div>
<div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
<div id="profile-edit-xmpp-end"></div>
<div id="profile-edit-matrix-wrapper">
<label id="profile-edit-matrix-label" for="profile-edit-matrix">{{$matrix.1}} </label>
<input type="text" size="32" name="matrix" id="profile-edit-matrix" title="{{$lbl_ex2}}" value="{{$matrix.2}}"/>
</div>
<div id="profile-edit-matrix-desc">{{$matrix.3}}</div>
<div id="profile-edit-matrix-end"></div>
<div id="profile-edit-pubkeywords-wrapper">
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords">{{$pub_keywords.1}} </label>
<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}"/>

6
view/templates/widget/vcard.tpl
View file

@ -14,6 +14,12 @@
<dd class="xmpp-data">{{$contact.xmpp}}</dd>
</dl>
{{/if}}
{{if $contact.matrix}}
<dl class="matrix">
<dt class="matrix-label">{{$matrix}}</dt>
<dd class="matrix-data">{{$contact.matrix}}</dd>
</dl>
{{/if}}
{{if $contact.location}}
<dl class="location" dir="auto">
<dt class="location-label">{{$location}}</dt>

2
view/theme/frio/css/style.css
View file

@ -1167,7 +1167,7 @@ aside .vcard .detail {
display: table;
padding: 2px 0;
}
aside .xmpp {
aside .xmpp, aside .matrix {
display: table;
}
aside .vcard .icon {

8
view/theme/frio/templates/contact_edit.tpl
View file

@ -96,6 +96,14 @@
</div>
{{/if}}
{{if $matrix}}
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$matrix_label}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$matrix}}</div>
</div>
{{/if}}
{{if $keywords}}
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<hr class="profile-separator">

11
view/theme/frio/templates/profile/vcard.tpl
View file

@ -88,11 +88,18 @@
{{if $profile.xmpp}}
<div class="xmpp">
<span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
<span class="xmpp-label icon"><i class="fa fa-xmpp"></i></span>
<span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
</div>
{{/if}}
{{if $profile.matrix}}
<div class="matrix">
<span class="matrix-label icon"><i class="fa fa-matrix-org"></i></span>
<span class="matrix-data"><a href="matrix:{{$profile.matrix}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.matrix}}</a></span>
</div>
{{/if}}
{{if $profile.upubkey}}<div class="key u-key" style="display:none;">{{$profile.upubkey}}</div>{{/if}}
{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
@ -101,7 +108,7 @@
{{if $homepage}}
<div class="homepage detail">
<span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
<span class="homepage-label icon"><i class="fa fa-external-link"></i></span>
<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a></span>
</div>
{{/if}}

2
view/theme/frio/templates/settings/profile/index.tpl
View file

@ -129,6 +129,8 @@
{{include file="field_input.tpl" field=$xmpp}}
{{include file="field_input.tpl" field=$matrix}}
{{include file="field_input.tpl" field=$pub_keywords}}
{{include file="field_input.tpl" field=$prv_keywords}}

9
view/theme/frio/templates/widget/vcard.tpl
View file

@ -69,11 +69,18 @@
{{if $contact.xmpp}}
<div class="xmpp detail">
<span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
<span class="xmpp-label icon"><i class="fa fa-xmpp"></i></span>
<span class="xmpp-data"><a href="xmpp:{{$contact.xmpp}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$contact.xmpp}}</a></span>
</div>
{{/if}}
{{if $contact.matrix}}
<div class="matrix detail">
<span class="matrix-label icon"><i class="fa fa-matrix-org"></i></span>
<span class="matrix-data"><a href="matrix:{{$contact.matrix}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$contact.matrix}}</a></span>
</div>
{{/if}}
{{if $network_link}}
<div class="network detail">
<span class="network-label icon"><i class="fa fa-{{$network_avatar}}"></i></span>

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

@ -42,6 +42,13 @@
</dl>
{{/if}}
{{if $profile.matrix}}
<dl class="matrix">
<dt class="matrix-label">{{$matrix}}</dt>
<dd class="matrix-data">{{$profile.matrix}}</dd>
</dl>
{{/if}}
{{if $profile.upubkey}}<div class="key" style="display:none;">{{$profile.upubkey}}</div>{{/if}}
{{if $homepage}}

1
view/theme/vier/templates/contact_edit.tpl
View file

@ -52,6 +52,7 @@
<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location nofilter}}</dd></dl>{{/if}}
{{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
{{if $matrix}}<dl><dt>{{$matrix_label}}</dt><dd>{{$matrix}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
</div>{{* End of contact-edit-links *}}

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

@ -36,6 +36,13 @@
</dl>
{{/if}}
{{if $profile.matrix}}
<dl class="matrix">
<dt class="matrix-label">{{$matrix}}</dt>
<dd class="matrix-data">{{$profile.matrix}}</dd>
</dl>
{{/if}}
{{if $profile.upubkey}}<div class="key u-key" style="display:none;">{{$profile.upubkey}}</div>{{/if}}
{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}

7
view/theme/vier/templates/settings/profile/index.tpl
View file

@ -67,6 +67,13 @@
<div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
<div id="profile-edit-xmpp-end"></div>
<div id="profile-edit-matrix-wrapper">
<label id="profile-edit-matrix-label" for="profile-edit-matrix">{{$matrix.1}} </label>
<input type="text" size="32" name="matrix" id="profile-edit-matrix" value="{{$matrix.2}}"/>
</div>
<div id="profile-edit-matrix-desc">{{$matrix.3}}</div>
<div id="profile-edit-matrix-end"></div>
<div id="profile-edit-homepage-wrapper">
<label id="profile-edit-homepage-label" for="profile-edit-homepage">{{$homepage.1}} </label>
<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}"/>