Merge branch 'develop' into improvement/frio-action-links-to-buttons

[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 b4217aa436edcf5238bf631158ad49785d6f3d56..aa9abdc9b5b10322b4c0a2718661a0c0822463fd 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -14,18 +14,20 @@
                                {{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
                                <ul id="contact-edit-actions" class="nav nav-pills preferences">
                                        <li class="dropdown pull-right">
-                                               <a class="btn btn-link btn-sm dropdown-toggle" type="button" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
+                                               <button type="button" class="btn-link btn-sm dropdown-toggle" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
                                                        <i class="fa fa-angle-down"></i>&nbsp;{{$contact_action_button}}
-                                               </a>
+                                               </button>
 
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu" >
-                                                       {{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 $lblsuggest}}<li role="menuitem"><a href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
+                                                       {{if $poll_enabled}}<li role="menuitem"><a href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
+                                                       {{if $lblsuggest || $poll_enabled}}
                                                        <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>
-                                                       <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>
+                                                       {{/if}}
+                                                       <li role="menuitem"><a href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
+                                                       <li role="menuitem"><a href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
+                                                       <li role="menuitem"><a href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>
+                                                       <li role="menuitem"><button type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>
                                                </ul>
                                        </li>
                                </ul>
@@ -88,10 +90,18 @@
                                                                </div>
                                                                {{/if}}
 
+                                                               {{if $xmpp}}
+                                                               <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+                                                                       <hr class="profile-separator">
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$xmpp_label}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$xmpp}}</div>
+                                                               </div>
+                                                               {{/if}}
+
                                                                {{if $keywords}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{$keywords_label}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$keywords_label}}</div>
                                                                        <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$keywords}}</div>
                                                                </div>
                                                                {{/if}}