keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1990 from annando/1510-contact-reworked

Browse source 
The contact search page now shows the connection status
This commit is contained in:
fabrixxm 2015-10-28 12:09:16 +01:00
commit 2205c372db
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mod/dirfind.php
View file

@ -3,6 +3,7 @@ require_once('include/contact_widgets.php');
require_once('include/socgraph.php'); require_once('include/socgraph.php');
require_once('include/Contact.php'); require_once('include/Contact.php');
require_once('include/contact_selectors.php'); require_once('include/contact_selectors.php');
require_once('mod/contacts.php');
function dirfind_init(&$a) { function dirfind_init(&$a) {
@ -77,7 +78,7 @@ function dirfind_content(&$a, $prefix = "") {
$j = new stdClass(); $j = new stdClass();
$j->total = $count[0]["total"]; $j->total = $count[0]["total"];
$j->items_page = $perpage; $j->items_page = $perpage;
$j->page = $a->pager['page']; $j->page = $a->pager['page'];
foreach ($results AS $result) { foreach ($results AS $result) {
if (poco_alternate_ostatus_url($result["url"])) if (poco_alternate_ostatus_url($result["url"]))
continue; continue;
@ -121,15 +122,21 @@ function dirfind_content(&$a, $prefix = "") {
foreach($j->results as $jj) { foreach($j->results as $jj) {
$alt_text = "";
$itemurl = $jj->url;
// If We already know this contact then don't show the "connect" button // If We already know this contact then don't show the "connect" button
if ($jj->cid > 0) { if ($jj->cid > 0) {
$connlnk = ""; $connlnk = "";
$conntxt = ""; $conntxt = "";
$contact = q("SELECT * FROM `contact` WHERE `id` = %d", $contact = q("SELECT * FROM `contact` WHERE `id` = %d",
intval($jj->cid)); intval($jj->cid));
if ($contact) if ($contact) {
$photo_menu = contact_photo_menu($contact[0]); $photo_menu = contact_photo_menu($contact[0]);
else $details = _contact_detail_for_template($contact[0]);
$alt_text = $details['alt_text'];
} else
$photo_menu = array(); $photo_menu = array();
} else { } else {
$connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url); $connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
@ -141,8 +148,9 @@ function dirfind_content(&$a, $prefix = "") {
$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
$entry = array( $entry = array(
'alt_text' => $alt_text,
'url' => zrl($jj->url), 'url' => zrl($jj->url),
'itemurl' => $jj->url, 'itemurl' => $itemurl,
'name' => htmlentities($jj->name), 'name' => htmlentities($jj->name),
'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
'img_hover' => $jj->tags, 'img_hover' => $jj->tags,

5
view/global.css
View file

@ -274,3 +274,8 @@ a {
#poke-recip-label, #poke-action-label, #prvmail-message-label { #poke-recip-label, #poke-action-label, #prvmail-message-label {
margin: 10px 0 10px; margin: 10px 0 10px;
} }
.contact-entry-photo img {
max-width: 80px;
max-height: 80px;
}

3
view/theme/vier/templates/contact_template.tpl
View file

@ -5,7 +5,8 @@
<!-- onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$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)" > --> 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> <!-- <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /></a> -->
<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
{{if $multiselect}} {{if $multiselect}}
<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}"> <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">