added FI translation as core translation is now over 50% THX Kris

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

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index c5012822ec6d38f09a1a51435978f0440b9d4434..ab38a1c6c19ccb296709de167222165e09dadd29 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -1,6 +1,3 @@
-
-{{if $header}}<h2>{{$header}}</h2>{{/if}}
-
 <div id="contact-edit-wrapper" >
 
        {{* Insert Tab-Nav *}}
@@ -24,7 +21,7 @@
                                                        <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>
                                                        <li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
-                                                       <li role="menuitem"><a  href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
+                                                       <li role="menuitem"><a  href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
                                                </ul>
                                        </div>
 
@@ -42,7 +39,8 @@
 
                                                {{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
                                                {{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li> {{/if}}
-                                               {{if $blocked}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+                                               {{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+                                               {{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
                                                {{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
                                                {{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
                                        </ul>
@@ -56,6 +54,7 @@
                                {{* 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 $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}}
                        </div>{{* 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 @@
                                </div>
                                <div id="contact-edit-info-end"></div>
 
+                               {{if $reason}}
+                               <div id="contact-info-wrapper">
+                                       <h4>{{$lbl_info2}}</h4>
+                                       <p>{{$reason}}</p>
+                               </div>
+                               <div id="contact-info-end"></div>
+                               {{/if}}
+
                                {{if $profile_select}}
                                        <div id="contact-edit-profile-select-text">
                                        <h4>{{$lbl_vis1}}</h4>