X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftemplates%2Fcontact_template.tpl;h=4d3be769ba7b2a10535e18858fb3f3744ec34d4b;hb=f2d51737eb0bb5edc0b70eec8a064aa67d3b1bef;hp=5ae4fd4f793e06707def5a4175425b246a6afd50;hpb=d78acd54088784c2b9823c7a37f279c992287b35;p=friendica.git

diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
index 5ae4fd4f79..4d3be769ba 100644
--- a/view/theme/frio/templates/contact_template.tpl
+++ b/view/theme/frio/templates/contact_template.tpl
@@ -1,17 +1,17 @@
 
-<div class="contact-wrapper media" id="contact-entry-wrapper-{{$contact.id}}" >
+<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 *}}
-		<div class="contact-photo-wrapper dropdown pull-left" >
-			<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}" >
+		<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" >
+				<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>
+							<span class="contact-photo-overlay-content xl"><i class="fa fa-angle-down" aria-hidden="true"></i></span>
 						</div>
 					</div>
 
@@ -21,7 +21,7 @@
 
 						{{* 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>
@@ -31,46 +31,88 @@
 				<ul class="contact-photo-menu menu-popup dropdown-menu " 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>
 
 				{{/if}}
 			</div>
-
 		</div>
 
 		<div class="media-body">
+			{{if $contact.photo_menu}}
 			{{* 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}}')" 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}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{{/if}}
-				{{if $contact.photo_menu.network}}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.edit   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.drop   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></button>{{/if}}
-				{{if $contact.photo_menu.follow }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.hide   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}
+				{{if $contact.photo_menu.pm}}
+				<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}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}">
+					<i class="fa fa-heartbeat" aria-hidden="true"></i>
+				</button>
+				{{/if}}
+				{{if $contact.photo_menu.network}}
+				<a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}">
+					<i class="fa fa-cloud" aria-hidden="true"></i>
+				</a>
+				{{/if}}
+				{{if $contact.photo_menu.edit}}
+				<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}">
+					<i class="fa fa-user" aria-hidden="true"></i>
+				</a>
+				{{/if}}
+				{{if $contact.photo_menu.drop}}
+				<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}}
+				{{if $contact.photo_menu.follow}}
+				<a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}">
+					<i class="fa fa-user-plus" aria-hidden="true"></i>
+				</a>
+				{{/if}}
+				{{if $contact.photo_menu.hide}}
+				<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}">
+					<i class="fa fa-times" aria-hidden="true"></i>
+				</a>
+				{{/if}}
 			</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-{{$contact.id}}" >
+				<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
 					<h4 class="media-heading"><a href="{{$contact.url}}">{{$contact.name}}</a>
 					{{if $contact.account_type}} <small class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</small>{{/if}}
 					{{if $contact.account_type == 'Forum'}}<i class="fa fa-comments-o" aria-hidden="true"></i>{{/if}}
 					{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
 					</h4>
 				</div>
-				{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-				{{if $contact.itemurl}}<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
+				{{if $contact.alt_text}}<div class="contact-entry-details contact-entry-rel" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+				{{if $contact.itemurl}}<div class="contact-entry-details contact-entry-url" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
 				{{if $contact.tags}}<div class="contact-entry-details" id="contact-entry-tags-{{$contact.id}}" >{{$contact.tags}}</div>{{/if}}
-				{{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
-				{{if $contact.network}}<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+				{{if $contact.details}}<div class="contact-entry-details contact-entry-tags" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
+				{{if $contact.network}}<div class="contact-entry-details contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
 			</div>
 
 			{{* The checkbox to perform batch actions to these contacts (for batch actions have a look at contacts-template.tpl) *}}
@@ -89,19 +131,19 @@
 {{* the following part is a nearly a copy of the part above but it is modified for working with js.
 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}" >
+	<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 *}}
-			<div class="contact-photo-wrapper dropdown pull-left" >
-				<div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}" >
+			<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" >
+					<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>
+								<span class="contact-photo-overlay-content xl"><i class="fa fa-angle-down"  aria-hidden="true"></i></span>
 							</div>
 						</div>
 
@@ -111,7 +153,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 
 							{{* 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>
@@ -121,11 +163,11 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 					<ul class="contact-photo-menu menu-popup dropdown-menu " 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>
@@ -136,19 +178,58 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 			</div>
 
 			<div class="media-body">
+				{if $photo_menu}
 				{{* 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 $photo_menu.pm}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{/if}
-					{if $photo_menu.poke}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{/if}
-					{if $photo_menu.network}<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.edit}<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.drop}<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.follow}<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.pm}
+					<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}">
+						<i class="fa fa-envelope" aria-hidden="true"></i>
+					</button>
+					{/if}
+					{if $photo_menu.poke}
+					<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}">
+						<i class="fa fa-heartbeat" aria-hidden="true"></i>
+					</button>
+					{/if}
+					{if $photo_menu.network}
+					<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}">
+						<i class="fa fa-cloud" aria-hidden="true"></i>
+					</a>
+					{/if}
+					{if $photo_menu.edit}
+					<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}">
+						<i class="fa fa-pencil" aria-hidden="true"></i>
+					</a>
+					{/if}
+					{if $photo_menu.drop}
+					<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}">
+						<i class="fa fa-user-times" aria-hidden="true"></i>
+					</a>
+					{/if}
+					{if $photo_menu.follow}
+					<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}">
+						<i class="fa fa-user-plus" aria-hidden="true"></i>
+					</a>
+					{/if}
+				</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}" >
+					<div class="contact-entry-name" id="contact-entry-name-{$id}">
 						<h4 class="media-heading"><a href="{$url}">{$name}</a>
 						{if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if}
 						{if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if}