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

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

diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
index 570e0f818e966a714c0b52fc4adb74ed19c55d64..9e927c6751f61f2f8a0694c08f5655565ea68bf7 100644 (file)
--- a/view/theme/frio/templates/contact_template.tpl
+++ b/view/theme/frio/templates/contact_template.tpl
@@ -1,41 +1,36 @@
 
 <div class="contact-wrapper media" id="contact-entry-wrapper-{{$contact.id}}">
 
-               {{* This is a wrapper for the contact picture and the dropdown menu with contact relating actions *}}
+               {{* This is a wrapper for the contact picture *}}
                <div class="contact-photo-wrapper dropdown media-left">
                        <div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}">
 
-                               <button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{{$contact.id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                       <div class="contact-photo-image-wrapper hidden-xs">
-                                               <img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
-
-                                               {{* Overlay background on hover the avatar picture *}}
-                                               <div class="contact-photo-overlay">
-                                                       <span class="contact-photo-overlay-content xl"><i class="fa fa-angle-down"></i></span>
-                                               </div>
-                                       </div>
+                               <div class="contact-photo-image-wrapper hidden-xs">
+                                       <img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
+                               </div>
 
+                               {{* For very small displays we use a drobdown menu for contact relating actions *}}
+                               <button type="button" class="btn btn-link dropdown-toggle visible-xs" id="contact-photo-menu-button-{{$contact.id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                        {{* use a smaller picture on very small displays (e.g. mobiles) *}}
-                                       <div class="contact-photo-image-wrapper hidden-lg hidden-md hidden-sm">
+                                       <div class="contact-photo-image-wrapper visible-xs">
                                                <img class="contact-photo-xs media-object" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
 
                                                {{* Overlay background on hover the avatar picture *}}
                                                <div class="contact-photo-overlay">
-                                                       <span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down"></i></span>
+                                                       <span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down" aria-hidden="true"></i></span>
                                                </div>
                                        </div>
                                </button>
 
-
                                {{if $contact.photo_menu}}
-                               <ul class="contact-photo-menu menu-popup dropdown-menu " id="contact-photo-menu-{{$contact.id}}" role="menu" aria-labelledby="contact-photo-menu-{{$contact.id}}">
+                               <ul class="contact-photo-menu menu-popup dropdown-menu hidden-lg hidden-md hidden-sm" id="contact-photo-menu-{{$contact.id}}" role="menu" aria-labelledby="contact-photo-menu-{{$contact.id}}">
                                        {{foreach $contact.photo_menu as $c}}
                                        {{if $c.2}}
-                                       <li role="menuitem"><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                       <li role="presentation"><a role="menuitem" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
                                        {{elseif $c.3}}
-                                       <li role="menuitem"><button type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
+                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
                                        {{else}}
-                                       <li role="menuitem"><a href="{{$c.1}}">{{$c.0}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="{{$c.1}}">{{$c.0}}</a></li>
                                        {{/if}}
                                        {{/foreach}}
                                </ul>
@@ -49,12 +44,12 @@
                        {{* The contact actions like private mail, delete contact, edit contact and so on *}}
                        <div class="contact-actions pull-right nav-pills preferences hidden-xs">
                                {{if $contact.photo_menu.pm}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}'); retrurn false;" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}">
                                        <i class="fa fa-envelope" aria-hidden="true"></i>
                                </button>
                                {{/if}}
                                {{if $contact.photo_menu.poke}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}'); retrurn false;" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}">
                                        <i class="fa fa-heartbeat" aria-hidden="true"></i>
                                </button>
                                {{/if}}
@@ -69,7 +64,7 @@
                                </a>
                                {{/if}}
                                {{if $contact.photo_menu.drop}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}'); retrurn false;" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}">
                                        <i class="fa fa-user-times" aria-hidden="true"></i>
                                </button>
                                {{/if}}
@@ -133,41 +128,36 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 <div class="javascript-template" rel="contact-template" style="display: none">
        <div class="contact-wrapper media" id="contact-entry-wrapper-{$id}">
 
-                       {{* This is a wrapper for the contact picture and the dropdown menu with contact relating actions *}}
+                       {{* This is a wrapper for the contact picture *}}
                        <div class="contact-photo-wrapper dropdown media-left">
                                <div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}">
 
-                                       <button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                               <div class="contact-photo-image-wrapper hidden-xs">
-                                                       <img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name}" />
-
-                                                       {{* Overlay background on hover the avatar picture *}}
-                                                       <div class="contact-photo-overlay">
-                                                               <span class="contact-photo-overlay-content xl"><i class="fa fa-angle-down"></i></span>
-                                                       </div>
-                                               </div>
+                                       <div class="contact-photo-image-wrapper hidden-xs">
+                                               <img class="contact-photo media-object xl" src="{{$contact.thumb}}" {11} alt="{{$contact.name}}" />
+                                       </div>
 
+                                       {{* For very small displays we use a drobdown menu for contact relating actions *}}
+                                       <button type="button" class="btn btn-link dropdown-toggle visible-xs" id="contact-photo-menu-button{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                {{* use a smaller picture on very small displays (e.g. mobiles) *}}
-                                               <div class="contact-photo-image-wrapper hidden-lg hidden-md hidden-sm">
-                                                       <img class="contact-photo-xs media-object" src="{$thumb}" {11} alt="{$name}" />
+                                               <div class="contact-photo-image-wrapper visible-xs">
+                                                       <img class="contact-photo-xs media-object" src="{{$contact.thumb}}" {11} alt="{{$contact.name}}" />
 
                                                        {{* Overlay background on hover the avatar picture *}}
                                                        <div class="contact-photo-overlay">
-                                                               <span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down"></i></span>
+                                                               <span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down" aria-hidden="true"></i></span>
                                                        </div>
                                                </div>
                                        </button>
 
-
                                        {if $photo_menu}
-                                       <ul class="contact-photo-menu menu-popup dropdown-menu " id="contact-photo-menu-{$id}" role="menu" aria-labelledby="contact-photo-menu-{$id}">
+                                       <ul class="contact-photo-menu menu-popup dropdown-menu hidden-lg hidden-md hidden-sm" id="contact-photo-menu-{$id}" role="menu" aria-labelledby="contact-photo-menu-{$id}">
                                                {foreach $photo_menu as $c}
                                                {if $c.2}
-                                               <li role="menuitem"><a target="redir" href="{$c.1}">{$c.0}</a></li>
+                                               <li role="presentation"><a role="menuitem" target="redir" href="{$c.1}">{$c.0}</a></li>
                                                {elseif $c.3}
-                                               <li role="menuitem"><button type="button" class="btn-link" onclick="addToModal('{$c.1}')">{$c.0}</button></li>
+                                               <li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{$c.1}')">{$c.0}</button></li>
                                                {else}
-                                               <li role="menuitem"><a href="{$c.1}">{$c.0}</a></li>
+                                               <li role="presentation"><a role="menuitem" href="{$c.1}">{$c.0}</a></li>
                                                {/if}
                                                {/foreach}
                                        </ul>
@@ -214,6 +204,19 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                                </div>
                                {/if}
 
+                               {{* The button to add or remove contacts from a contact group - group edit page *}}
+                               {if $contact.change_member}
+                               <div class="contact-group-actions pull-right nav-pills preferences">
+                                       <button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({$contact.change_member.gid},{$contact.change_member.cid},'{$contact.change_member.sec_token}'); return true;" data-toggle="tooltip" title="{$contact.change_member.title}">
+                                               {if $contact.label == "members"}
+                                               <i class="fa fa-times-circle" aria-hidden="true"></i>
+                                               {elseif $contact.label == "contacts"}
+                                               <i class="fa fa-plus-circle" aria-hidden="true"></i>
+                                               {/if}
+                                       </button>
+                               </div>
+                               {/if}
+
                                {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
                                <div class="contact-entry-desc">
                                        <div class="contact-entry-name" id="contact-entry-name-{$id}">