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

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

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 52f3fc545ed5edd7e2c5b29031b92259ba52ed33..8dc0df38fe3e695f337e0a5ec41010a2ebfd5f66 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -52,7 +52,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>
@@ -163,6 +164,11 @@
                                                                        <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
+                                                               {{if $reason}}
+                                                               <h4>{{$lbl_info2}}</h4>
+                                                               <p>{{$reason}}</p>
+                                                               <div class="clear"></div>
+                                                               {{/if}}
                                                        </div>
                                                </div>
                                        </div>