Merge branch 'develop' of https://github.com/friendica/friendica 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 8a202197b8c5519db61c6364feca74fef9c1301a..a72ac5c605e70bb854c4cf9c742b19cf070899ec 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -26,8 +26,8 @@
                                                        {{/if}}
                                                        <li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
                                                        <li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>
-                                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>
+                                                       {{if $contact_actions.archive.url}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>{{/if}}
+                                                       {{if $contact_actions.delete.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>{{/if}}
                                                </ul>
                                        </li>
                                </ul>
@@ -119,6 +119,7 @@
                                                <div class="clear"></div>
                                        </div>
 
+                                       {{if $contact_settings_label}}
                                        <div class="panel">
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-settings">
                                                        <h4>
@@ -146,7 +147,9 @@
                                                        </div>
                                                </div>
                                        </div>
+                                       {{/if}}
 
+                                       {{if $lbl_info1}}
                                        <div class="panel">
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-info">
                                                        <h4>
@@ -164,10 +167,16 @@
                                                                        <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>
-
+                                       {{/if}}
+                                       {{if $lbl_vis1}}
                                        <div class="panel">
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-profile-select">
                                                        <h4>
@@ -195,7 +204,7 @@
                                                        </div>
                                                </div>
                                        </div>
-
+                                       {{/if}}
                                </div>
 
                        </form>{{* End of the form *}}