X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftemplates%2Fcontact_edit.tpl;h=ab38a1c6c19ccb296709de167222165e09dadd29;hb=ae62c1d1ea1296e2fcb134debe290aa4e769f9ea;hp=c5012822ec6d38f09a1a51435978f0440b9d4434;hpb=ee72f1e4bd2c83d5a4303f295b6bc1f8c3c9728f;p=friendica.git
diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index c5012822ec..ab38a1c6c1 100644
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -1,6 +1,3 @@
-
-{{if $header}}
{{$header}}
{{/if}}
-
@@ -42,7 +39,8 @@
{{if $lost_contact}}{{$lost_contact}}
{{/if}}
{{if $insecure}}{{$insecure}}
{{/if}}
- {{if $blocked}}{{$blocked}}
{{/if}}
+ {{if $blocked && !$pending}}{{$blocked}}
{{/if}}
+ {{if $pending}}{{$pending}}
{{/if}}
{{if $ignored}}{{$ignored}}
{{/if}}
{{if $archived}}{{$archived}}
{{/if}}
@@ -56,6 +54,7 @@
{{* Some information about the contact from the profile *}}
- {{$profileurllabel}}
- {{$profileurl}}
{{if $location}}- {{$location_label}}
- {{$location}}
{{/if}}
+ {{if $xmpp}}- {{$xmpp_label}}
- {{$xmpp}}
{{/if}}
{{if $keywords}}- {{$keywords_label}}
- {{$keywords}}
{{/if}}
{{if $about}}- {{$about_label}}
- {{$about}}
{{/if}}
{{* End of contact-edit-links *}}
@@ -72,7 +71,7 @@
{{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 }} {{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_blacklist}} {{/if}}
{{/if}}
{{include file="field_checkbox.tpl" field=$hidden}}
@@ -82,6 +81,14 @@
+ {{if $reason}}
+
+
+ {{/if}}
+
{{if $profile_select}}
{{$lbl_vis1}}