Merge branch '2021.03-rc' into copyright-2021

[friendica.git] / view / templates / contact_edit.tpl

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index 19a1c7350459228a6f17536025cedf07dc9d4042..c98b44e439e44db650638b28976994190786c2e2 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -1,7 +1,7 @@
 <div id="contact-edit-wrapper" >
 
        {{* Insert Tab-Nav *}}
-       {{$tab_str}}
+       {{$tab_str nofilter}}
 
 
        <div id="contact-edit-nav-wrapper" >
@@ -17,6 +17,7 @@
                                                <ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup" >
                                                        {{if $lblsuggest}}<li role="menuitem"><a  href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
                                                        {{if $poll_enabled}}<li role="menuitem"><a  href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
+                                                       {{if $contact_actions.updateprofile}}<li role="menuitem"><a href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
                                                        <li class="divider"></li>
                                                        <li role="menuitem"><a  href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
                                                        <li role="menuitem"><a  href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
@@ -32,7 +33,7 @@
                                                {{if $poll_enabled}}
                                                        <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
-                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
+                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
                                                        {{/if}}
                                                        </li>
                                                {{/if}}
@@ -44,19 +45,14 @@
                                                {{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
                                                {{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
                                        </ul>
-
-                                       <ul>
-                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
-                                               {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
-                                       </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}
 
                                {{* Some information about the contact from the profile *}}
                                <dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
-                               {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
+                               {{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 $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-                               {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+                               {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
                        </div>{{* End of contact-edit-links *}}
 
                        <div id="contact-edit-links-end"></div>
@@ -72,8 +68,12 @@
                                        {{include file="field_checkbox.tpl" field=$notify}}
                                        {{if $fetch_further_information}}
                                                {{include file="field_select.tpl" field=$fetch_further_information}}
-                                               {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}}
+                                               {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
+                                       {{/if}}
+                                       {{if $allow_remote_self}}
+                                               {{include file="field_select.tpl" field=$remote_self}}
                                        {{/if}}
+
                                        {{include file="field_checkbox.tpl" field=$hidden}}
 
                                <div id="contact-edit-info-wrapper">
@@ -89,15 +89,6 @@
                                </div>
                                <div id="contact-info-end"></div>
                                {{/if}}
-
-                               {{if $profile_select}}
-                                       <div id="contact-edit-profile-select-text">
-                                       <h4>{{$lbl_vis1}}</h4>
-                                       <p>{{$lbl_vis2}}</p> 
-                                       </div>
-                                       {{$profile_select}}
-                                       <div id="contact-edit-profile-select-end"></div>
-                               {{/if}}
                        </div>
 
                        <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />