diff options
| author | friendica <info@friendica.com> | 2014-04-06 21:40:23 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-06 21:40:23 -0700 |
| commit | 75b6aa235e18e9491bc953f43d6d95cf00453406 (patch) | |
| tree | 1860be309e4b3dac035d5605128f78fb139ff4bc | |
| parent | 28b7eedc45695021e96af6112dab20195b118873 (diff) | |
| download | volse-hubzilla-75b6aa235e18e9491bc953f43d6d95cf00453406.tar.gz volse-hubzilla-75b6aa235e18e9491bc953f43d6d95cf00453406.tar.bz2 volse-hubzilla-75b6aa235e18e9491bc953f43d6d95cf00453406.zip | |
more work on #395
| -rw-r--r-- | mod/connections.php | 7 | ||||
| -rw-r--r-- | view/css/mod_connections.css | 4 | ||||
| -rwxr-xr-x | view/tpl/connection_template.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/connections.tpl (renamed from view/tpl/contacts-template.tpl) | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/mod/connections.php b/mod/connections.php index 1b5e08cfe..f0879ae31 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -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), diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css index c460fec28..94373389b 100644 --- a/view/css/mod_connections.css +++ b/view/css/mod_connections.css @@ -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; } diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl new file mode 100755 index 000000000..fc9052d41 --- /dev/null +++ b/view/tpl/connection_template.tpl @@ -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> diff --git a/view/tpl/contacts-template.tpl b/view/tpl/connections.tpl index 0c7e01038..f254ce8c2 100755 --- a/view/tpl/contacts-template.tpl +++ b/view/tpl/connections.tpl @@ -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> |