more work on #395

This commit is contained in:
friendica 2014-04-06 21:40:23 -07:00
parent 28b7eedc45
commit 75b6aa235e
4 changed files with 17 additions and 5 deletions

View File

@ -375,16 +375,14 @@ function connections_content(&$a) {
'username' => $rr['xchan_name'],
'sparkle' => $sparkle,
'link' => z_root() . '/connedit/' . $rr['abook_id'],
'url' => $rr['xchan_url'],
'url' => chanlink_url($rr['xchan_url']),
'network' => network_to_name($rr['network']),
);
}
}
}
$tpl = get_markup_template("contacts-template.tpl");
$o .= replace_macros($tpl,array(
$o .= replace_macros(get_markup_template('connections.tpl'),array(
'$header' => t('Connections') . (($head) ? ' - ' . $head : ''),
'$tabs' => $t,
'$total' => $total,
@ -392,6 +390,7 @@ function connections_content(&$a) {
'$desc' => t('Search your connections'),
'$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
'$submit' => t('Find'),
'$edit' => t('Edit'),
'$cmd' => $a->cmd,
'$contacts' => $contacts,
'$paginate' => paginate($a),

View File

@ -109,6 +109,9 @@
width: 120px;
height: 120px;
padding: 10px;
margin: 8px 10px 0 0;
border-top: 1px solid #eee;
border-left: 2px solid #eee;
}
#contacts-search {
@ -128,6 +131,7 @@
float: left;
margin-left: 0px;
margin-right: 10px;
margin-bottom: 10px;
width: 120px;
overflow: hidden;
}

View File

@ -0,0 +1,9 @@
<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
<div class="contact-entry-photo-wrapper" >
<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
</div>
<div class="contact-entry-photo-end" ></div>
<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a>
<div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$edit}}</a></div>
<div class="contact-entry-end" ></div>
</div>

View File

@ -15,7 +15,7 @@
{{foreach $contacts as $contact}}
{{include file="contact_template.tpl"}}
{{include file="connection_template.tpl"}}
{{/foreach}}
<div id="contact-edit-end"></div>