From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 4 Nov 2022 11:03:55 +0000 (-0400)
Subject: Move viewcontact_template and contact_template to contact/ folder
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=811e144e9e4656525d9c0c01ca55153e5eee102c;p=friendica.git

Move viewcontact_template and contact_template to contact/ folder
---

diff --git a/mod/match.php b/mod/match.php
index e8a0a66059..ea59d7ee61 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -93,7 +93,7 @@ function match_content(App $a)
 		DI::sysmsg()->addInfo(DI::l10n()->t('No matches'));
 	}
 
-	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
 	$o = Renderer::replaceMacros($tpl, [
 		'$title'    => DI::l10n()->t('Profile Match'),
 		'$contacts' => array_slice($entries, 0, $limit),
diff --git a/mod/suggest.php b/mod/suggest.php
index 9ad11f7452..41fa1b06b2 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -49,7 +49,7 @@ function suggest_content(App $a)
 		$entries[] = ModuleContact::getContactTemplateVars($contact);
 	}
 
-	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
 
 	return Renderer::replaceMacros($tpl,[
 		'$title' => DI::l10n()->t('Friend Suggestions'),
diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index b0f03c17d0..2eace38bf1 100644
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -132,7 +132,7 @@ class BaseSearch extends BaseModule
 			}
 		}
 
-		$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+		$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
 		return Renderer::replaceMacros($tpl, [
 			'title'     => $header,
 			'$contacts' => $entries,
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index ce2afbfc75..72c4f67cf2 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -178,7 +178,7 @@ class Network extends BaseModule
 		} elseif (self::$forumContactId) {
 			$contact = Contact::getById(self::$forumContactId);
 			if (DBA::isResult($contact)) {
-				$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('viewcontact_template.tpl'), [
+				$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('contact/list.tpl'), [
 					'contacts' => [ModuleContact::getContactTemplateVars($contact)],
 					'id' => DI::args()->get(0),
 				]) . $o;
diff --git a/view/templates/contact/entry.tpl b/view/templates/contact/entry.tpl
new file mode 100644
index 0000000000..31a2d15d6e
--- /dev/null
+++ b/view/templates/contact/entry.tpl
@@ -0,0 +1,46 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}">
+	<div class="contact-entry-photo-wrapper">
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $multiselect}}
+			<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
+			{{/if}}
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+			<div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+				<ul>
+					{{foreach $contact.photo_menu as $k=>$c}}
+					{{if $c.2}}
+					<li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+					{{else}}
+					<li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
+					{{/if}}
+					{{/foreach}}
+				</ul>
+			</div>
+			{{/if}}
+		</div>
+			
+	</div>
+
+	<div class="contact-entry-desc">
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
+			{{$contact.name}}
+			{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
+		</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.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}}
+		
+	</div>
+
+	<div class="contact-entry-end"></div>
+</div>
diff --git a/view/templates/contact/list.tpl b/view/templates/contact/list.tpl
new file mode 100644
index 0000000000..ec77fd521b
--- /dev/null
+++ b/view/templates/contact/list.tpl
@@ -0,0 +1,14 @@
+
+{{include file="section_title.tpl"}}
+
+{{$tab_str nofilter}}
+
+<div id="viewcontact_wrapper-{{$id}}">
+{{foreach $contacts as $contact}}
+	{{include file="contact/entry.tpl"}}
+{{/foreach}}
+</div>
+<div class="clear"></div>
+<div id="view-contact-end"></div>
+
+{{$paginate nofilter}}
diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl
deleted file mode 100644
index 31a2d15d6e..0000000000
--- a/view/templates/contact_template.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}">
-	<div class="contact-entry-photo-wrapper">
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
-
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
-
-			{{if $multiselect}}
-			<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
-			{{/if}}
-
-			{{if $contact.photo_menu}}
-			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
-			<div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-				<ul>
-					{{foreach $contact.photo_menu as $k=>$c}}
-					{{if $c.2}}
-					<li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-					{{else}}
-					<li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
-					{{/if}}
-					{{/foreach}}
-				</ul>
-			</div>
-			{{/if}}
-		</div>
-			
-	</div>
-
-	<div class="contact-entry-desc">
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
-			{{$contact.name}}
-			{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
-		</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.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}}
-		
-	</div>
-
-	<div class="contact-entry-end"></div>
-</div>
diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl
deleted file mode 100644
index 562270e352..0000000000
--- a/view/templates/viewcontact_template.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-{{include file="section_title.tpl"}}
-
-{{$tab_str nofilter}}
-
-<div id="viewcontact_wrapper-{{$id}}">
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-</div>
-<div class="clear"></div>
-<div id="view-contact-end"></div>
-
-{{$paginate nofilter}}
diff --git a/view/theme/frio/templates/contact/entry.tpl b/view/theme/frio/templates/contact/entry.tpl
new file mode 100644
index 0000000000..0cd55f8d3e
--- /dev/null
+++ b/view/theme/frio/templates/contact/entry.tpl
@@ -0,0 +1,233 @@
+
+<div class="contact-wrapper media" id="contact-entry-wrapper-{{$contact.id}}">
+
+		{{* 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}}">
+
+				<div class="contact-photo-image-wrapper hidden-xs">
+					<a href="{{$contact.url}}">
+						<img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
+					</a>
+				</div>
+
+				{{* For very small displays we use a dropdown 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 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" aria-hidden="true"></i></span>
+						</div>
+					</div>
+				</button>
+
+				{{if $contact.photo_menu}}
+				<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="presentation"><a role="menuitem" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+					{{elseif $c.3}}
+					<li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
+					{{else}}
+					<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}}'); 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.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.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.unfollow}}
+				<a class="contact-action-link btn-link" href="{{$contact.photo_menu.unfollow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.unfollow.0}}">
+					<i class="fa fa-user-times" 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 contact-group-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}}">
+					<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 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 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) *}}
+			{{* if !$no_contacts_checkbox *}}
+			{{if $multiselect}}
+			<div class="checkbox contact-entry-checkbox pull-right">
+				<input id="checkbox-{{$contact.id}}" type="checkbox" class="contact-select pull-right" name="contact_batch[]" value="{{$contact.id}}">
+				<label for="checkbox-{{$contact.id}}"></label>
+			</div>
+			{{/if}}
+		</div>
+
+</div>
+
+
+{{* 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 *}}
+<template 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 *}}
+		<div class="contact-photo-wrapper dropdown media-left">
+			<div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}">
+
+				<div class="contact-photo-image-wrapper hidden-xs">
+					<img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$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 visible-xs">
+						<img class="contact-photo-xs media-object" src="{$thumb}" {11} alt="{$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" aria-hidden="true"></i></span>
+						</div>
+					</div>
+				</button>
+
+				{if $photo_menu}
+				<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="presentation"><a role="menuitem" target="redir" href="{$c.1}">{$c.0}</a></li>
+					{elseif $c.3}
+					<li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{$c.1}')">{$c.0}</button></li>
+					{else}
+					<li role="presentation"><a role="menuitem" href="{$c.1}">{$c.0}</a></li>
+					{/if}
+					{/foreach}
+				</ul>
+
+				{/if}
+			</div>
+
+		</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.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-user" 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}">
+					<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}
+					{{* @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 $alt_text}<div class="contact-entry-details" id="contact-entry-rel-{$id}">{$alt_text}</div>{/if}
+				{if $itemurl}<div class="contact-entry-details" id="contact-entry-url-{$id}">{$itemurl}</div>{/if}
+				{if $tags}<div class="contact-entry-details" id="contact-entry-tags-{$id}">{$tags}</div>{/if}
+				{if $details}<div class="contact-entry-details" id="contact-entry-details-{$id}">{$details}</div>{/if}
+				{if $network}<div class="contact-entry-details" id="contact-entry-network-{$id}">{$network}</div>{/if}
+			</div>
+
+			{{* The checkbox to perform batch actions to these contacts (for batch actions have a look at contacts-template.tpl) *}}
+			{{* if !$no_contacts_checkbox *}}
+			{{if $multiselect}}
+			<div class="checkbox contact-entry-checkbox pull-right">
+				<input id="checkbox-{$id}" type="checkbox" class="contact-select pull-right" name="contact_batch[]" value="{$id}">
+				<label for="checkbox-{$id}"></label>
+			</div>
+			{{/if}}
+		</div>
+	</div>
+</template>
diff --git a/view/theme/frio/templates/contact/list.tpl b/view/theme/frio/templates/contact/list.tpl
new file mode 100644
index 0000000000..5a1ac026bf
--- /dev/null
+++ b/view/theme/frio/templates/contact/list.tpl
@@ -0,0 +1,17 @@
+
+{{* This is the standard template for showing contact lists. It is used e.g. 
+at the suggest page and also at many other places *}}
+
+{{include file="section_title.tpl"}}
+
+{{$tab_str nofilter}}
+
+<ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
+{{foreach $contacts as $contact}}
+	<li>{{include file="contact/entry.tpl"}}</li>
+{{/foreach}}
+</ul>
+<div class="clear"></div>
+<div id="view-contact-end"></div>
+
+{{$paginate nofilter}}
diff --git a/view/theme/frio/templates/contact_drop_confirm.tpl b/view/theme/frio/templates/contact_drop_confirm.tpl
index a0ac15cf6d..e4c0a35638 100644
--- a/view/theme/frio/templates/contact_drop_confirm.tpl
+++ b/view/theme/frio/templates/contact_drop_confirm.tpl
@@ -1,7 +1,7 @@
 <div id="contact-drop-confirm">
 	<h2 class="heading">{{$l10n.header}}</h2>
 
-	{{include file="contact_template.tpl" no_contacts_checkbox=True}}
+	{{include file="contact/entry.tpl" no_contacts_checkbox=True}}
 
 	{{include file="confirm.tpl"}}
 
diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
deleted file mode 100644
index 0cd55f8d3e..0000000000
--- a/view/theme/frio/templates/contact_template.tpl
+++ /dev/null
@@ -1,233 +0,0 @@
-
-<div class="contact-wrapper media" id="contact-entry-wrapper-{{$contact.id}}">
-
-		{{* 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}}">
-
-				<div class="contact-photo-image-wrapper hidden-xs">
-					<a href="{{$contact.url}}">
-						<img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
-					</a>
-				</div>
-
-				{{* For very small displays we use a dropdown 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 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" aria-hidden="true"></i></span>
-						</div>
-					</div>
-				</button>
-
-				{{if $contact.photo_menu}}
-				<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="presentation"><a role="menuitem" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-					{{elseif $c.3}}
-					<li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
-					{{else}}
-					<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}}'); 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.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.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.unfollow}}
-				<a class="contact-action-link btn-link" href="{{$contact.photo_menu.unfollow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.unfollow.0}}">
-					<i class="fa fa-user-times" 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 contact-group-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}}">
-					<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 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 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) *}}
-			{{* if !$no_contacts_checkbox *}}
-			{{if $multiselect}}
-			<div class="checkbox contact-entry-checkbox pull-right">
-				<input id="checkbox-{{$contact.id}}" type="checkbox" class="contact-select pull-right" name="contact_batch[]" value="{{$contact.id}}">
-				<label for="checkbox-{{$contact.id}}"></label>
-			</div>
-			{{/if}}
-		</div>
-
-</div>
-
-
-{{* 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 *}}
-<template 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 *}}
-		<div class="contact-photo-wrapper dropdown media-left">
-			<div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}">
-
-				<div class="contact-photo-image-wrapper hidden-xs">
-					<img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$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 visible-xs">
-						<img class="contact-photo-xs media-object" src="{$thumb}" {11} alt="{$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" aria-hidden="true"></i></span>
-						</div>
-					</div>
-				</button>
-
-				{if $photo_menu}
-				<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="presentation"><a role="menuitem" target="redir" href="{$c.1}">{$c.0}</a></li>
-					{elseif $c.3}
-					<li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{$c.1}')">{$c.0}</button></li>
-					{else}
-					<li role="presentation"><a role="menuitem" href="{$c.1}">{$c.0}</a></li>
-					{/if}
-					{/foreach}
-				</ul>
-
-				{/if}
-			</div>
-
-		</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.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-user" 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}">
-					<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}
-					{{* @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 $alt_text}<div class="contact-entry-details" id="contact-entry-rel-{$id}">{$alt_text}</div>{/if}
-				{if $itemurl}<div class="contact-entry-details" id="contact-entry-url-{$id}">{$itemurl}</div>{/if}
-				{if $tags}<div class="contact-entry-details" id="contact-entry-tags-{$id}">{$tags}</div>{/if}
-				{if $details}<div class="contact-entry-details" id="contact-entry-details-{$id}">{$details}</div>{/if}
-				{if $network}<div class="contact-entry-details" id="contact-entry-network-{$id}">{$network}</div>{/if}
-			</div>
-
-			{{* The checkbox to perform batch actions to these contacts (for batch actions have a look at contacts-template.tpl) *}}
-			{{* if !$no_contacts_checkbox *}}
-			{{if $multiselect}}
-			<div class="checkbox contact-entry-checkbox pull-right">
-				<input id="checkbox-{$id}" type="checkbox" class="contact-select pull-right" name="contact_batch[]" value="{$id}">
-				<label for="checkbox-{$id}"></label>
-			</div>
-			{{/if}}
-		</div>
-	</div>
-</template>
diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index f13f108340..5c41c74e25 100644
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -49,10 +49,10 @@
 		</ul>
 		<div class="clear"></div>
 		<div id="contact-list">
-			{{* format each contact with the contact_template.tpl *}}
+			{{* format each contact with the contact/entry.tpl *}}
 			<ul id="viewcontact_wrapper" class="viewcontact_wrapper media-list">
 			{{foreach $contacts as $contact}}
-				<li>{{include file="contact_template.tpl"}}</li>
+				<li>{{include file="contact/entry.tpl"}}</li>
 			{{/foreach}}
 			</ul>
 		</div>
diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl
index cef6208ad0..2c271ffeaa 100644
--- a/view/theme/frio/templates/directory_header.tpl
+++ b/view/theme/frio/templates/directory_header.tpl
@@ -28,10 +28,10 @@
 
 	<div id="directory-search-end" class="clear"></div>
 
-	{{* format each contact with the contact_template.tpl *}}
+	{{* format each contact with the contact/entry.tpl *}}
 	<ul id="viewcontact_wrapper" class="viewcontact_wrapper media-list">
 	{{foreach $contacts as $contact}}
-		<li>{{include file="contact_template.tpl"}}</li>
+		<li>{{include file="contact/entry.tpl"}}</li>
 	{{/foreach}}
 	</ul>
 
diff --git a/view/theme/frio/templates/groupeditor.tpl b/view/theme/frio/templates/groupeditor.tpl
index 8d1db5b222..5ec1571147 100644
--- a/view/theme/frio/templates/groupeditor.tpl
+++ b/view/theme/frio/templates/groupeditor.tpl
@@ -6,12 +6,12 @@
 
 		{{* The contacts who are already members of the contact group *}}
 		{{foreach $groupeditor.members as $contact}}
-			<li class="members active">{{include file="contact_template.tpl"}}</li>
+			<li class="members active">{{include file="contact/entry.tpl"}}</li>
 		{{/foreach}}
 
 		{{* The contacts who are not members of the contact group *}}
 		{{foreach $groupeditor.contacts as $contact}}
-			<li class="contacts">{{include file="contact_template.tpl"}}</li>
+			<li class="contacts">{{include file="contact/entry.tpl"}}</li>
 		{{/foreach}}
 
 	</ul>
diff --git a/view/theme/frio/templates/profile/contacts.tpl b/view/theme/frio/templates/profile/contacts.tpl
index 513223f318..4a313e774f 100644
--- a/view/theme/frio/templates/profile/contacts.tpl
+++ b/view/theme/frio/templates/profile/contacts.tpl
@@ -10,7 +10,7 @@
 {{if $contacts}}
 	<ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
 	{{foreach $contacts as $contact}}
-		<li>{{include file="contact_template.tpl"}}</li>
+		<li>{{include file="contact/entry.tpl"}}</li>
 	{{/foreach}}
 	</ul>
 {{else}}
diff --git a/view/theme/frio/templates/viewcontact_template.tpl b/view/theme/frio/templates/viewcontact_template.tpl
deleted file mode 100644
index 90f286558d..0000000000
--- a/view/theme/frio/templates/viewcontact_template.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-{{* This is the standard template for showing contact lists. It is used e.g. 
-at the suggest page and also at many other places *}}
-
-{{include file="section_title.tpl"}}
-
-{{$tab_str nofilter}}
-
-<ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
-{{foreach $contacts as $contact}}
-	<li>{{include file="contact_template.tpl"}}</li>
-{{/foreach}}
-</ul>
-<div class="clear"></div>
-<div id="view-contact-end"></div>
-
-{{$paginate nofilter}}
diff --git a/view/theme/quattro/templates/contact/entry.tpl b/view/theme/quattro/templates/contact/entry.tpl
new file mode 100644
index 0000000000..13eea60de0
--- /dev/null
+++ b/view/theme/quattro/templates/contact/entry.tpl
@@ -0,0 +1,45 @@
+
+<div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}">
+	{{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();"></a>{{/if}}
+	<div class="contact-photo-wrapper">
+		<div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $multiselect}}
+			<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
+			{{/if}}
+			{{if $contact.photo_menu}}
+			<a href="#" rel="#contact-photo-menu-{{$contact.id}}" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-{{$contact.id}}">menu</a>
+			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-{{$contact.id}}">
+				{{foreach $contact.photo_menu as $c}}
+				{{if $c.2}}
+				<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+				{{else}}
+				<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+				{{/if}}
+				{{/foreach}}
+			</ul>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-name" id="contact-entry-name-{{$contact.id}}">
+		{{$contact.name}}
+		{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
+	</div>
+	{{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}">{{$contact.alt_text}}</div>{{/if}}
+	{{if $contact.itemurl}}<div class="contact-details" id="contact-entry-url-{{$contact.id}}">{{$contact.itemurl}}</div>{{/if}}
+	{{if $contact.tags}}<div class="contact-details" id="contact-entry-tags-{{$contact.id}}">{{$contact.tags}}</div>{{/if}}
+	{{if $contact.details}}<div class="contact-details" id="contact-entry-details-{{$contact.id}}">{{$contact.details}}</div>{{/if}}
+	{{if $contact.network}}<div class="contact-details" id="contact-entry-network-{{$contact.id}}">{{$contact.network}}</div>{{/if}}
+
+	{{if $contact.connlnk}}
+	<div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt}}">{{$contact.conntxt}}</a></div>
+	{{/if}}
+
+
+</div>
+
diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl
deleted file mode 100644
index 13eea60de0..0000000000
--- a/view/theme/quattro/templates/contact_template.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}">
-	{{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();"></a>{{/if}}
-	<div class="contact-photo-wrapper">
-		<div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
-		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
-
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
-
-			{{if $multiselect}}
-			<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
-			{{/if}}
-			{{if $contact.photo_menu}}
-			<a href="#" rel="#contact-photo-menu-{{$contact.id}}" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-{{$contact.id}}">menu</a>
-			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-{{$contact.id}}">
-				{{foreach $contact.photo_menu as $c}}
-				{{if $c.2}}
-				<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-				{{else}}
-				<li><a href="{{$c.1}}">{{$c.0}}</a></li>
-				{{/if}}
-				{{/foreach}}
-			</ul>
-			{{/if}}
-		</div>
-			
-	</div>
-	<div class="contact-name" id="contact-entry-name-{{$contact.id}}">
-		{{$contact.name}}
-		{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
-	</div>
-	{{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}">{{$contact.alt_text}}</div>{{/if}}
-	{{if $contact.itemurl}}<div class="contact-details" id="contact-entry-url-{{$contact.id}}">{{$contact.itemurl}}</div>{{/if}}
-	{{if $contact.tags}}<div class="contact-details" id="contact-entry-tags-{{$contact.id}}">{{$contact.tags}}</div>{{/if}}
-	{{if $contact.details}}<div class="contact-details" id="contact-entry-details-{{$contact.id}}">{{$contact.details}}</div>{{/if}}
-	{{if $contact.network}}<div class="contact-details" id="contact-entry-network-{{$contact.id}}">{{$contact.network}}</div>{{/if}}
-
-	{{if $contact.connlnk}}
-	<div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt}}">{{$contact.conntxt}}</a></div>
-	{{/if}}
-
-
-</div>
-
diff --git a/view/theme/vier/templates/contact/entry.tpl b/view/theme/vier/templates/contact/entry.tpl
new file mode 100644
index 0000000000..e99aab93d2
--- /dev/null
+++ b/view/theme/vier/templates/contact/entry.tpl
@@ -0,0 +1,49 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}">
+	<div class="contact-entry-photo-wrapper">
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}">
+		<!-- onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)"> -->
+
+			<!-- <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /></a> -->
+			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
+
+			{{if $multiselect}}
+			<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
+			{{/if}}
+			{{if $contact.photo_menu}}
+			<!-- <span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span> -->
+			<div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+				<ul role="menu" aria-haspopup="true">
+					{{foreach $contact.photo_menu as $k=>$c}}
+					{{if $c.2}}
+					<li role="menuitem"><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+					{{else}}
+					<li role="menuitem"><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
+					{{/if}}
+					{{/foreach}}
+				</ul>
+			</div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end"></div>
+	
+	<div class="contact-entry-desc">
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
+			{{$contact.name}}
+			{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
+		</div>
+		{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}">{{$contact.alt_text}}</div>{{/if}}
+		<div class="contact-entry-details">
+		{{if $contact.itemurl}}<span class="contact-entry-details" id="contact-entry-url-{{$contact.id}}">{{$contact.itemurl}}</span>{{/if}}
+		{{if $contact.network}}<span class="contact-entry-details" id="contact-entry-network-{{$contact.id}}"> ({{$contact.network}})</span>{{/if}}
+		</div>
+		{{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}}
+	</div>
+
+
+	<div class="contact-entry-end"></div>
+</div>
diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl
deleted file mode 100644
index e99aab93d2..0000000000
--- a/view/theme/vier/templates/contact_template.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}">
-	<div class="contact-entry-photo-wrapper">
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}">
-		<!-- onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)"> -->
-
-			<!-- <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /></a> -->
-			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
-
-			{{if $multiselect}}
-			<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
-			{{/if}}
-			{{if $contact.photo_menu}}
-			<!-- <span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span> -->
-			<div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-				<ul role="menu" aria-haspopup="true">
-					{{foreach $contact.photo_menu as $k=>$c}}
-					{{if $c.2}}
-					<li role="menuitem"><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-					{{else}}
-					<li role="menuitem"><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
-					{{/if}}
-					{{/foreach}}
-				</ul>
-			</div>
-			{{/if}}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end"></div>
-	
-	<div class="contact-entry-desc">
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
-			{{$contact.name}}
-			{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
-		</div>
-		{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}">{{$contact.alt_text}}</div>{{/if}}
-		<div class="contact-entry-details">
-		{{if $contact.itemurl}}<span class="contact-entry-details" id="contact-entry-url-{{$contact.id}}">{{$contact.itemurl}}</span>{{/if}}
-		{{if $contact.network}}<span class="contact-entry-details" id="contact-entry-network-{{$contact.id}}"> ({{$contact.network}})</span>{{/if}}
-		</div>
-		{{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}}
-	</div>
-
-
-	<div class="contact-entry-end"></div>
-</div>