template rework: use viewcontact_template.tpl for contact dealing pages

mod/contacts.php

@@ -799,6 +799,7 @@ function contacts_content(&$a) {
 		'$cmd' => $a->cmd,
 		'$contacts' => $contacts,
 		'$contact_drop_confirm' => t('Do you really want to delete this contact?'),
+		'multiselect' => 1,
 		'$batch_actions' => array(
 			'contacts_batch_update' => t('Update'),
 			'contacts_batch_block' => t('Block')."/".t("Unblock"),

mod/dirfind.php

@@ -141,8 +141,8 @@ function dirfind_content(&$a, $prefix = "") {
 				$entry = array(
 					'url' => zrl($jj->url),
 					'name' => htmlentities($jj->name),
-					'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+					'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-					'tags' => $jj->tags,
+					'img_hover' => $jj->tags,
 					'conntxt' => $conntxt,
 					'connlnk' => $connlnk,
 					'photo_menu' => $photo_menu,
@@ -151,11 +151,11 @@ function dirfind_content(&$a, $prefix = "") {
 				$entries[] = $entry;
 			}
 
-		$tpl = get_markup_template('match.tpl');
+		$tpl = get_markup_template('viewcontact_template.tpl');
 
 		$o .= replace_macros($tpl,array(
 			'title' => sprintf( t('People Search - %s'), $search),
-			'$entries' => $entries,
+			'$contacts' => $entries,
 			'$paginate' => paginate($a),
 		));
 

mod/match.php

@@ -56,32 +56,40 @@ function match_content(&$a) {
 
 		if(count($j->results)) {
 
+			$id = 0;
+
 			foreach($j->results as $jj) {
 				$match_nurl = normalise_link($jj->url);
 				$match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
 					intval(local_user()),
 					dbesc($match_nurl));
+
 				if (!count($match)) {
 					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 					$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+					$photo_menu = array(array(t("View Profile"), zrl($jj->url)));
+					$photo_menu[] = array(t("Connect/Follow"), $connlnk);
+
 					$entry = array(
 						'url' => zrl($jj->url),
 						'name' => $jj->name,
-						'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+						'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
 						'inttxt' => ' ' . t('is interested in:'),
 						'conntxt' => t('Connect'),
 						'connlnk' => $connlnk,
-						'tags' => $jj->tags
+						'img_hover' => $jj->tags,
+						'photo_menu' => $photo_menu,
+						'id' => ++$id,
 					);
-					$entries[] = $entry;
 				}
+				$entries[] = $entry;
 			}
 
-		$tpl = get_markup_template('match.tpl');
+		$tpl = get_markup_template('viewcontact_template.tpl');
 
 		$o .= replace_macros($tpl,array(
 			'$title' => t('Profile Match'),
-			'entries' => $entries,
+			'$contacts' => $entries,
 			'$paginate' => paginate($a),
 		));
 

mod/suggest.php

@@ -72,31 +72,41 @@ function suggest_content(&$a) {
 		return $o;
 	}
 
+	require_once 'include/contact_selectors.php';
+
 	foreach($r as $rr) {
 
 		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+		$ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id'];
+		$photo_menu = array(array(t("View Profile"), zrl($jj->url)));
+		$photo_menu[] = array(t("Connect/Follow"), $connlnk);
+		$photo_menu[] = array(t('Ignore/Hide'), $ignlnk);
 
 		$entry = array(
 			'url' => zrl($rr['url']),
-			'url_clean' => $rr['url'],
+			'itemurl' => $rr['url'],
+			'img_hover' => $rr['url'],
 			'name' => $rr['name'],
-			'photo' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
+			'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
-			'ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
+			'ignlnk' => $ignlnk,
 			'ignid' => $rr['id'],
 			'conntxt' => t('Connect'),
 			'connlnk' => $connlnk,
-			'ignore' => t('Ignore/Hide')
+			'photo_menu' => $photo_menu,
+			'ignore' => t('Ignore/Hide'),
+			'network' => network_to_name($rr['network'], $rr['url']),
+			'id' => ++$id,
 		);
 		$entries[] = $entry;
 	}
 
-	$tpl = get_markup_template('suggest_friends.tpl');
+	$tpl = get_markup_template('viewcontact_template.tpl');
 
 	$o .= replace_macros($tpl,array(
 		'$title' => t('Friend Suggestions'),
-		'$entries' => $entries,
+		'$contacts' => $entries,
+		
 	));
 
-//	$o .= paginate($a);
 	return $o;
 }

mod/viewcontacts.php

@@ -48,7 +48,7 @@ function viewcontacts_content(&$a) {
 		if($rr['self'])
 			continue;
 
-	    $url = $rr['url'];
+		$url = $rr['url'];
 
 		// route DFRN profiles through the redirect
 

view/templates/contact_template.tpl

@@ -7,9 +7,10 @@
 
 			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
-			{{if !$no_contacts_checkbox}}
+			{{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}}">

view/templates/contacts-template.tpl

@@ -1,5 +1,5 @@
 
-<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
+<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
 

view/theme/duepuntozero/style.css

@@ -891,6 +891,10 @@ input#dfrn-url {
 .contact-entry-photo img {
 	border: none;
 }
+.contact-entry-photo a img {
+	width: 80px;
+	height: 80px;
+}
 .contact-entry-photo-end {
 	clear: both;
 }

view/theme/frost-mobile/style.css

@@ -1124,6 +1124,8 @@ input#dfrn-url {
 
 .contact-entry-photo img {
 	border: none;
+	width: 80px;
+	height: 80px;
 }
 .contact-entry-photo-end {
 	clear: both;

view/theme/frost-mobile/templates/contact_template.tpl

@@ -29,8 +29,8 @@
 			
 	</div>
 	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+	<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
-{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
 	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
 
 	<div class="contact-entry-end" ></div>

view/theme/frost-mobile/templates/viewcontact_template.tpl

@@ -0,0 +1,12 @@
+
+{{include file="section_title.tpl"}}
+
+<div id="contacts-display-wrapper">
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+</div>
+
+<div id="view-contact-end"></div>
+
+{{$paginate}}

view/theme/frost/style.css

@@ -1093,15 +1093,19 @@ input#dfrn-url {
 .contact-entry-photo img {
 	border: none;
 }
+.contact-entry-photo a img {
+	width: 80px;
+	height: 80px;
+}
 .contact-entry-photo-end {
 	clear: both;
 }
 .contact-entry-name {
-	float: left;
+	/*float: left;*/
 	margin-left: 0px;
 	margin-right: 10px;
 	padding-bottom: 5px;
-	width: 120px;
+	/*width: 120px;*/
 	font-weight: 600;
 	overflow: hidden;
 }

view/theme/frost/templates/contact_template.tpl

@@ -10,8 +10,8 @@
 
 			{{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}}">
+		<div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
-                    <ul>
+			<ul>
 						{{foreach $contact.photo_menu as $c}}
 						{{if $c.2}}
 						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
@@ -19,15 +19,15 @@
 						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
 						{{/if}}
 						{{/foreach}}
-                    </ul>
+			</ul>
-                </div>
+		</div>
 			{{/if}}
 		</div>
 			
 	</div>
 	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+	<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
-{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
 	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
 
 	<div class="contact-entry-end" ></div>

view/theme/quattro/dark/style.css

@@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] {
   left: 0px;
   top: 63px;
 }
+.contact-wrapper .drop {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .drophide {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  opacity: 0.3;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+  padding-top: 5px;
+  font-weight: bold;
+}
 .directory-item {
   float: left;
   width: 200px;

view/theme/quattro/green/style.css

@@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] {
   left: 0px;
   top: 63px;
 }
+.contact-wrapper .drop {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .drophide {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  opacity: 0.3;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+  padding-top: 5px;
+  font-weight: bold;
+}
 .directory-item {
   float: left;
   width: 200px;

view/theme/quattro/lilac/style.css

@@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] {
   left: 0px;
   top: 63px;
 }
+.contact-wrapper .drop {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .drophide {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  opacity: 0.3;
+  position: relative;
+  top: 10px;
+  left: -10px;
+  z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+  padding-top: 5px;
+  font-weight: bold;
+}
 .directory-item {
   float: left;
   width: 200px;

view/theme/quattro/quattro.less

@@ -877,6 +877,27 @@ span[id^="showmore-wrap"] {
 		left: 0px;
 		top: 63px;
 	}
+	.drop {
+		background-image: url('../../../images/icons/22/delete.png');
+		display: block; width: 22px; height: 22px;
+		position: relative;
+		top: 10px;
+		left: -10px;
+		z-index: 99;
+	}
+	.drophide {
+		background-image: url('../../../images/icons/22/delete.png');
+		display: block; width: 22px; height: 22px;
+		opacity: 0.3;
+		position: relative;
+		top: 10px;
+		left: -10px;
+		z-index: 99;
+	}
+	.contact-entry-connect {
+		padding-top: 5px;
+		font-weight: bold;
+	}
 }
 .directory-item {
 	float: left;

view/theme/quattro/templates/contact_template.tpl

@@ -1,5 +1,6 @@
 
 <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}}')" 
@@ -7,7 +8,7 @@
 
 			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
-			{{if !$no_contacts_checkbox}}
+			{{if $multiselect}}
 			<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
 			{{/if}}
 			{{if $contact.photo_menu}}
@@ -30,6 +31,10 @@
 	<div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>
 	<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
 
+	{{if $contact.connlnk}}
+	<div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt}}">{{$contact.conntxt}}</a></div>
+	{{/if}}
+
 
 </div>
 

view/theme/smoothly/style.css

@@ -291,7 +291,7 @@ section {
 	margin: 10px 0 0 230px;
 }
 
-.login-form,
+.login-form {
 	margin-top: 10px;
 }
 
@@ -2784,7 +2784,7 @@ margin-left: 0px;
 	font-weight: bold;
 }
 
-.contact-entry-name {
+.contact-entry-name, .contact-entry-connect {
 	width: 100px;
 	overflow: hidden;
 	font: #999;
@@ -2805,6 +2805,11 @@ margin-left: 0px;
 		-webkit-box-shadow: 0 0 8px #BDBDBD;*/
 }
 
+.contact-entry-photo a img {
+	width: 80px;
+	height: 80px;
+}
+
 .contact-entry-edit-links .icon {	
 	border: 1px solid #babdb6;
 	border-radius: 3px;

view/theme/vier/style.css

@@ -2282,6 +2282,10 @@ aside #id_password {
   float: left;
   margin: 0px 10px 10px 0px;
 }
+.contact-entry-photo a img {
+  width: 80px;
+  height: 80px;
+}
 /* profile match wrapper */
 .profile-match-wrapper {
   float: left;

view/theme/vier/templates/contact_template.tpl

@@ -7,7 +7,7 @@
 
 			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
-			{{if !$no_contacts_checkbox}}
+			{{if $multiselect}}
 			<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
 			{{/if}}
 			{{if $contact.photo_menu}}