diff --git a/mod/contacts.php b/mod/contacts.php index 0ecc5a76db..934472b39f 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -27,6 +27,9 @@ function contacts_init(&$a) { require_once('include/group.php'); require_once('include/contact_widgets.php'); + if ($_GET['nets'] == "all") + $_GET['nets'] = ""; + if(! x($a->page,'aside')) $a->page['aside'] = ''; @@ -35,29 +38,30 @@ function contacts_init(&$a) { $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( '$name' => htmlentities($a->data['contact']['name']), '$photo' => $a->data['contact']['photo'], - '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'] + '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'] )); + $finpeople_widget = ''; $follow_widget = ''; + $networks_widget = ''; } else { $vcard_widget = ''; + $networks_widget .= networks_widget('contacts',$_GET['nets']); if (isset($_GET['add'])) $follow_widget = follow_widget($_GET['add']); else $follow_widget = follow_widget(); + + $findpeople_widget .= findpeople_widget(); } - if ($_GET['nets'] == "all") - $_GET['nets'] = ""; - $groups_widget .= group_side('contacts','group',false,0,$contact_id); - $findpeople_widget .= findpeople_widget(); - $networks_widget .= networks_widget('contacts',$_GET['nets']); + $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array( '$vcard_widget' => $vcard_widget, + '$findpeople_widget' => $findpeople_widget, '$follow_widget' => $follow_widget, '$groups_widget' => $groups_widget, - '$findpeople_widget' => $findpeople_widget, '$networks_widget' => $networks_widget )); @@ -810,6 +814,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"), diff --git a/mod/directory.php b/mod/directory.php index 6fd99256f0..ef80b082a4 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -8,6 +8,8 @@ function directory_init(&$a) { $a->page['aside'] .= findpeople_widget(); + $a->page['aside'] .= follow_widget(); + } else { unset($_SESSION['theme']); @@ -31,7 +33,7 @@ function directory_content(&$a) { require_once("mod/proxy.php"); if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || - (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) { + (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -44,27 +46,12 @@ function directory_content(&$a) { else $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); - $tpl = get_markup_template('directory_header.tpl'); - - $globaldir = ''; - $gdirpath = get_config('system','directory'); - if(strlen($gdirpath)) { - $globaldir = ''; + $gdirpath = ''; + $dirurl = get_config('system','directory'); + if(strlen($dirurl)) { + $gdirpath = zrl($dirurl,true); } - $admin = ''; - - $o .= replace_macros($tpl, array( - '$search' => $search, - '$globaldir' => $globaldir, - '$desc' => t('Find on this site'), - '$admin' => $admin, - '$finding' => (strlen($search) ? '

' . t('Finding: ') . "'" . $search . "'" . '

' : ""), - '$sitedir' => t('Site Directory'), - '$submit' => t('Find') - )); - if($search) { $search = dbesc($search); @@ -159,8 +146,6 @@ function directory_content(&$a) { $about = ((x($profile,'about') == 1) ? t('About:') : False); - $tpl = get_markup_template('directory_item.tpl'); - if($a->theme['template_engine'] === 'internal') { $location_e = template_escape($location); } @@ -168,23 +153,23 @@ function directory_content(&$a) { $location_e = $location; } - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile_link' => $profile_link, - '$photo' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB), - '$alt_text' => $rr['name'], - '$name' => $rr['name'], - '$details' => $pdesc . $details, - '$page_type' => $page_type, - '$profile' => $profile, - '$location' => $location_e, - '$gender' => $gender, - '$pdesc' => $pdesc, - '$marital' => $marital, - '$homepage' => $homepage, - '$about' => $about, + $entry = array( + 'id' => $rr['id'], + 'url' => $profile_link, + 'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB), + 'img_hover' => $rr['name'], + 'name' => $rr['name'], + 'details' => $pdesc . $details, + 'page_type' => $page_type, + 'profile' => $profile, + 'location' => $location_e, + 'gender' => $gender, + 'pdesc' => $pdesc, + 'marital' => $marital, + 'homepage' => $homepage, + 'about' => $about, - )); + ); $arr = array('contact' => $rr, 'entry' => $entry); @@ -193,12 +178,27 @@ function directory_content(&$a) { unset($profile); unset($location); - $o .= $entry; + if(! $arr['entry']) + continue; + + $entries[] = $arr['entry']; } - $o .= "
\r\n"; - $o .= paginate($a); + $tpl = get_markup_template('directory_header.tpl'); + + $o .= replace_macros($tpl, array( + '$search' => $search, + '$globaldir' => t('Global Directory'), + '$gdirpath' => $gdirpath, + '$desc' => t('Find on this site'), + '$contacts' => $entries, + '$finding' => t('Finding:'), + '$findterm' => (strlen($search) ? $search : ""), + '$title' => t('Site Directory'), + '$submit' => t('Find'), + '$paginate' => paginate($a), + )); } else diff --git a/mod/dirfind.php b/mod/dirfind.php index 95f9bf53a8..492f39d5a6 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -2,6 +2,7 @@ require_once('include/contact_widgets.php'); require_once('include/socgraph.php'); require_once('include/Contact.php'); +require_once('include/contact_selectors.php'); function dirfind_init(&$a) { @@ -13,9 +14,9 @@ function dirfind_init(&$a) { if(! x($a->page,'aside')) $a->page['aside'] = ''; - $a->page['aside'] .= follow_widget(); - $a->page['aside'] .= findpeople_widget(); + + $a->page['aside'] .= follow_widget(); } @@ -38,10 +39,6 @@ function dirfind_content(&$a, $prefix = "") { $o = ''; - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => sprintf( t('People Search - %s'), $search) - )); - if($search) { if ($local) { @@ -61,7 +58,7 @@ function dirfind_content(&$a, $prefix = "") { dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search))); - $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`keywords` + $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network` , `gcontact`.`keywords` FROM `gcontact` LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` AND `contact`.`uid` = %d AND NOT `contact`.`blocked` @@ -80,7 +77,7 @@ function dirfind_content(&$a, $prefix = "") { $j = new stdClass(); $j->total = $count[0]["total"]; $j->items_page = $perpage; - $j->page = $a->pager['page']; + $j->page = $a->pager['page']; foreach ($results AS $result) { if (poco_alternate_ostatus_url($result["url"])) continue; @@ -96,6 +93,7 @@ function dirfind_content(&$a, $prefix = "") { $objresult->url = $result["url"]; $objresult->photo = $result["photo"]; $objresult->tags = $result["keywords"]; + $objresult->network = $result["network"]; $j->results[] = $objresult; } @@ -121,7 +119,6 @@ function dirfind_content(&$a, $prefix = "") { $id = 0; - $tpl = get_markup_template('match.tpl'); foreach($j->results as $jj) { // If We already know this contact then don't show the "connect" button @@ -143,17 +140,29 @@ function dirfind_content(&$a, $prefix = "") { $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); - $o .= replace_macros($tpl,array( - '$url' => zrl($jj->url), - '$name' => htmlentities($jj->name), - '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - '$tags' => $jj->tags, - '$conntxt' => $conntxt, - '$connlnk' => $connlnk, - '$photo_menu' => $photo_menu, - '$id' => ++$id, - )); + $entry = array( + 'url' => zrl($jj->url), + 'itemurl' => $jj->url, + 'name' => htmlentities($jj->name), + 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), + 'img_hover' => $jj->tags, + 'conntxt' => $conntxt, + 'connlnk' => $connlnk, + 'photo_menu' => $photo_menu, + 'network' => network_to_name($jj->network, $jj->url), + 'id' => ++$id, + ); + $entries[] = $entry; } + + $tpl = get_markup_template('viewcontact_template.tpl'); + + $o .= replace_macros($tpl,array( + 'title' => sprintf( t('People Search - %s'), $search), + '$contacts' => $entries, + '$paginate' => paginate($a), + )); + } else { info( t('No matches') . EOL); @@ -161,7 +170,5 @@ function dirfind_content(&$a, $prefix = "") { } - $o .= '
'; - $o .= paginate($a); return $o; } diff --git a/mod/match.php b/mod/match.php index f31b0f67a4..bbf1a6c634 100644 --- a/mod/match.php +++ b/mod/match.php @@ -4,21 +4,26 @@ require_once('include/socgraph.php'); require_once('include/contact_widgets.php'); require_once('mod/proxy.php'); +/** + * @brief Controller for /match. + * + * It takes keywords from your profile and queries the directory server for + * matching keywords from other profiles. + * + * @param App &$a + * @return void|string + */ function match_content(&$a) { $o = ''; if(! local_user()) return; - $a->page['aside'] .= follow_widget(); $a->page['aside'] .= findpeople_widget(); + $a->page['aside'] .= follow_widget(); $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Profile Match') - )); - $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", intval(local_user()) ); @@ -27,7 +32,6 @@ function match_content(&$a) { if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { notice( t('No keywords to match. Please add keywords to your default profile.') . EOL); return; - } $params = array(); @@ -52,35 +56,50 @@ function match_content(&$a) { if(count($j->results)) { + $id = 0; - - $tpl = get_markup_template('match.tpl'); 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; - $o .= replace_macros($tpl,array( - '$url' => zrl($jj->url), - '$name' => $jj->name, - '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - '$inttxt' => ' ' . t('is interested in:'), - '$conntxt' => t('Connect'), - '$connlnk' => $connlnk, - '$tags' => $jj->tags - )); + $photo_menu = array(array(t("View Profile"), zrl($jj->url))); + $photo_menu[] = array(t("Connect/Follow"), $connlnk); + + $entry = array( + 'url' => zrl($jj->url), + 'itemurl' => $jj->url, + 'name' => $jj->name, + 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), + 'inttxt' => ' ' . t('is interested in:'), + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'img_hover' => $jj->tags, + 'photo_menu' => $photo_menu, + 'id' => ++$id, + ); + $entries[] = $entry; } } - } else { + + $tpl = get_markup_template('viewcontact_template.tpl'); + + $o .= replace_macros($tpl,array( + '$title' => t('Profile Match'), + '$contacts' => $entries, + '$paginate' => paginate($a), + )); + + } + else { info( t('No matches') . EOL); } } - $o .= cleardiv(); - $o .= paginate($a); return $o; } diff --git a/mod/suggest.php b/mod/suggest.php index 8bf31ca8e5..8870c65df8 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -61,13 +61,8 @@ function suggest_content(&$a) { $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; - $a->page['aside'] .= follow_widget(); $a->page['aside'] .= findpeople_widget(); - - - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Friend Suggestions') - )); + $a->page['aside'] .= follow_widget(); $r = suggestion_query(local_user()); @@ -77,25 +72,41 @@ function suggest_content(&$a) { return $o; } - $tpl = get_markup_template('suggest_friends.tpl'); + 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); - $o .= replace_macros($tpl,array( - '$url' => zrl($rr['url']), - '$name' => $rr['name'], - '$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), - '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], - '$ignid' => $rr['id'], - '$conntxt' => t('Connect'), - '$connlnk' => $connlnk, - '$ignore' => t('Ignore/Hide') - )); + $entry = array( + 'url' => zrl($rr['url']), + 'itemurl' => $rr['url'], + 'img_hover' => $rr['url'], + 'name' => $rr['name'], + 'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), + 'ignlnk' => $ignlnk, + 'ignid' => $rr['id'], + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'photo_menu' => $photo_menu, + 'ignore' => t('Ignore/Hide'), + 'network' => network_to_name($rr['network'], $rr['url']), + 'id' => ++$id, + ); + $entries[] = $entry; } - $o .= cleardiv(); -// $o .= paginate($a); + $tpl = get_markup_template('viewcontact_template.tpl'); + + $o .= replace_macros($tpl,array( + '$title' => t('Friend Suggestions'), + '$contacts' => $entries, + + )); + return $o; } diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index a6bf74b288..927a597524 100644 --- a/mod/viewcontacts.php +++ b/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 diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl index d4f65f70f9..75f49653b0 100644 --- a/view/templates/contact_template.tpl +++ b/view/templates/contact_template.tpl @@ -7,9 +7,10 @@ {{$contact.name}} - {{if !$no_contacts_checkbox}} + {{if $multiselect}} {{/if}} + {{if $contact.photo_menu}} menu
@@ -27,8 +28,14 @@
-
-
{{$contact.name}}
+ +
+
{{$contact.name}}
+ {{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} + {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.details}}
{{$contact.details}}
{{/if}} +
diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl index 896f9af4c9..bec295924e 100644 --- a/view/templates/contacts-template.tpl +++ b/view/templates/contacts-template.tpl @@ -1,5 +1,5 @@ -

{{$header}}{{if $total}} ({{$total}}){{/if}}

+

{{$header}}{{if $total}} ({{$total}}){{/if}}

{{if $finding}}

{{$finding}}

{{/if}} diff --git a/view/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl index 5c52f4329a..5b0610fcbd 100644 --- a/view/templates/contacts-widget-sidebar.tpl +++ b/view/templates/contacts-widget-sidebar.tpl @@ -1,7 +1,7 @@ {{$vcard_widget}} +{{$findpeople_widget}} {{$follow_widget}} {{$groups_widget}} -{{$findpeople_widget}} {{$networks_widget}} diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index 2274f2e1f8..46f17de40e 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -1,17 +1,31 @@ -

{{$sitedir}}

+{{include file="section_title.tpl"}} -{{$globaldir}} -{{$admin}} +{{if $gdirpath}} + +{{/if}} -{{$finding}}
-
-{{$desc}} - - -
+
+ {{$desc}} + + +
+ +{{if $findterm}} +

{{$finding}} '{{$findterm}}'

+{{/if}} +
+{{foreach $contacts as $contact}} + {{include file="contact_template.tpl"}} +{{/foreach}} + +
+ +{{$paginate}} diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl index b43fcd28cf..4dbe8a951f 100644 --- a/view/templates/directory_item.tpl +++ b/view/templates/directory_item.tpl @@ -1,12 +1,14 @@ -
-
-
- {{$alt_text}} +
+
+
-
{{$name}}
-
{{$details}}
+
{{$entry.name}}
+
{{$entry.details}}
diff --git a/view/templates/match.tpl b/view/templates/match.tpl deleted file mode 100644 index 3ebabf1854..0000000000 --- a/view/templates/match.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
-
- - {{$name}} - - {{if $photo_menu}} - menu -
-
    - {{foreach $photo_menu as $k=>$c}} - {{if $c.2}} -
  • {{$c.0}}
    • - {{else}} -
  • {{$c.0}}
    • - {{/if}} - {{/foreach}} -
-
- {{/if}} -
-
-
- {{$name}} -
-
- {{if $connlnk}} -
{{$conntxt}}
- {{/if}} - -
diff --git a/view/templates/suggest_friends.tpl b/view/templates/suggest_friends.tpl deleted file mode 100644 index a64c05dd83..0000000000 --- a/view/templates/suggest_friends.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -
- -
- - {{$name}} - -
-
-
- {{$name}} -
-
- {{if $connlnk}} -
{{$conntxt}}
- {{/if}} -
\ No newline at end of file diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl index ff33d65213..455551c680 100644 --- a/view/templates/viewcontact_template.tpl +++ b/view/templates/viewcontact_template.tpl @@ -1,5 +1,5 @@ -

{{$title}}

+{{include file="section_title.tpl"}} {{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 16c01c6df4..62b248e8c4 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -876,8 +876,14 @@ input#dfrn-url { .contact-entry-wrapper { float: left; - width: 120px; - height: 120px; + min-width: 363px; + height: 90px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; } #contacts-search-end { margin-bottom: 10px; @@ -891,15 +897,22 @@ 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; - margin-left: 0px; - margin-right: 10px; - width: 120px; + font-weight: bold; +} +.contact-entry-details { + font-size: 13px; + color: #999999; + white-space: nowrap; overflow: hidden; + text-overflow: ellipsis; } .contact-entry-edit-links { margin-top: 6px; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 6d7acd3715..f1901d1a16 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1110,8 +1110,13 @@ input#dfrn-url { height: 120px;*/ padding-left: 15px; padding-right: 15px; - width: 95px; - height: 200px; + max-width: 262px; + height: 90px; + margin: 0 10px 10px 0px; +} +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; } #contacts-search-end { margin-bottom: 10px; @@ -1124,12 +1129,16 @@ input#dfrn-url { .contact-entry-photo img { border: none; + width: 80px; + height: 80px; } .contact-entry-photo-end { clear: both; } +.contact-entry-desc { + overflow: hidden; +} .contact-entry-name { - float: left; margin-left: 0px; margin-right: 10px; padding-bottom: 5px; @@ -1141,6 +1150,9 @@ input#dfrn-url { font-style: italic; font-size: 10px; font-weight: 500; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .contact-entry-network { font-size: 10px; @@ -2135,7 +2147,7 @@ input#profile-jot-email { border: 1px solid #AAA; background: #FFFFFF; position: absolute; - left: -30px; top: 80px; + /*left: -30px;*/ top: 80px; display: none; z-index: 101; -moz-box-shadow: 3px 3px 5px #555; diff --git a/view/theme/frost-mobile/templates/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl index a2506fc17e..198b24746f 100644 --- a/view/theme/frost-mobile/templates/contact_template.tpl +++ b/view/theme/frost-mobile/templates/contact_template.tpl @@ -28,10 +28,14 @@
-
-
{{$contact.name}}

-{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} -
{{$contact.network}}
+ +
+
{{$contact.name}}
+ {{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} + {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.details}}
{{$contact.details}}
{{/if}} +
diff --git a/view/theme/frost-mobile/templates/contacts-template.tpl b/view/theme/frost-mobile/templates/contacts-template.tpl index 94e9afbe56..f776222f32 100644 --- a/view/theme/frost-mobile/templates/contacts-template.tpl +++ b/view/theme/frost-mobile/templates/contacts-template.tpl @@ -15,11 +15,10 @@ {{$tabs}} -
+ {{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} {{/foreach}} -
{{$paginate}} diff --git a/view/theme/frost-mobile/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl deleted file mode 100644 index e39cca6e59..0000000000 --- a/view/theme/frost-mobile/templates/suggest_friends.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -
-
- - {{$name}} - -
-
-
- {{$name}} -
-
- {{if $connlnk}} -
{{$conntxt}}
- {{/if}} - -
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index a4661b2df5..74b5dde0b6 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -1074,12 +1074,14 @@ input#dfrn-url { .contact-entry-wrapper { float: left; -/* width: 120px; - height: 120px;*/ - padding-left: 8px; - padding-right: 8px; - width: 95px; - height: 170px; + width: 262px; + height: 90px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; } #contacts-search-end { margin-bottom: 10px; @@ -1093,15 +1095,22 @@ 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-desc { + overflow: hidden; +} .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; } @@ -1109,6 +1118,9 @@ input#dfrn-url { font-style: italic; font-size: 10px; font-weight: 500; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .contact-entry-network { font-size: 10px; diff --git a/view/theme/frost/templates/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl index 7a29bd0455..777ed50179 100644 --- a/view/theme/frost/templates/contact_template.tpl +++ b/view/theme/frost/templates/contact_template.tpl @@ -10,8 +10,8 @@ {{if $contact.photo_menu}} menu -
- +
{{/if}} -
-
{{$contact.name}}

-{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} -
{{$contact.network}}
+ +
+
{{$contact.name}}
+ {{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} + {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.details}}
{{$contact.details}}
{{/if}} +
diff --git a/view/theme/frost/templates/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl deleted file mode 100644 index e39cca6e59..0000000000 --- a/view/theme/frost/templates/suggest_friends.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -
-
- - {{$name}} - -
-
-
- {{$name}} -
-
- {{if $connlnk}} -
{{$conntxt}}
- {{/if}} - -
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 1eda67de13..b0489af808 100644 --- a/view/theme/quattro/dark/style.css +++ b/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; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 71569971e5..0c7050045d 100644 --- a/view/theme/quattro/green/style.css +++ b/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; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 55b81e5daf..c5f655427a 100644 --- a/view/theme/quattro/lilac/style.css +++ b/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; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 3c9915576f..cd604b656a 100644 --- a/view/theme/quattro/quattro.less +++ b/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; diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl index 0f0207b2bf..7060505e9f 100644 --- a/view/theme/quattro/templates/contact_template.tpl +++ b/view/theme/quattro/templates/contact_template.tpl @@ -1,5 +1,6 @@
+ {{if $contact.ignlnk}}{{/if}}
{{$contact.name}} - {{if !$no_contacts_checkbox}} + {{if $multiselect}} {{/if}} {{if $contact.photo_menu}} @@ -27,8 +28,13 @@
{{$contact.name}}
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} -
{{$contact.itemurl}}
-
{{$contact.network}}
+ {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.details}}
{{$contact.details}}
{{/if}} + + {{if $contact.connlnk}} +
{{$contact.conntxt}}
+ {{/if}}
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index bcb47367f9..2553c57a9e 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -115,6 +115,10 @@ input[type=submit]:active { #search-save { } +#directory-search-end { + clear: both; +} + .dirsearch-desc { } @@ -2760,11 +2764,10 @@ margin-left: 0px; .view-contact-wrapper, .contact-entry-wrapper { float: left; - margin-right: 30px; - margin-bottom: 20px; - width: 88px; + padding-right: 10px; + width: 345px; height: 120px; - position: relative; + margin: 0 10px 10px 0px; } #view-contact-end { @@ -2775,6 +2778,10 @@ margin-left: 0px; margin-top: 15px; } +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; +} .contact-entry-direction-wrapper { position: absolute; top: 20px; @@ -2791,17 +2798,27 @@ margin-left: 0px; font-weight: bold; } -.contact-entry-name { - width: 100px; +.contact-entry-desc { + overflow: hidden; +} + +.contact-entry-name, .contact-entry-connect { overflow: hidden; font: #999; font-size: 12px; - text-align: center; font-weight: bold; margin-top: 5px; } -.contact-entry-photo { +.contact-entry-details { + font-size: 13px; + color: #999999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.contact-entry-photo-wrapper { position: relative; /*border: 1px solid #7C7D7B; border-radius: 3px; @@ -2812,6 +2829,15 @@ margin-left: 0px; -webkit-box-shadow: 0 0 8px #BDBDBD;*/ } +.contact-entry-photo { + width: 80px; +} + +.contact-entry-photo a img { + width: 80px; + height: 80px; +} + .contact-entry-edit-links .icon { border: 1px solid #babdb6; border-radius: 3px; diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index a35e6d21df..a4c0420ca4 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -351,7 +351,7 @@ code { margin: 0px; padding: 1em; list-style: none; - border: 3px solid #364e59; + /*border: 3px solid #364e59;*/ z-index: 100000; box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); } @@ -2270,18 +2270,50 @@ aside #id_password { float: left; } /* contacts */ -.contact-entry-wrapper { +/*.contact-entry-wrapper { width: 120px; height: 130px; float: left; -/* overflow: hidden; */ + overflow: hidden; margin-left: 5px; +}*/ + +.contact-entry-wrapper { + float: left; + width: 363px; + height: 90px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; +} +.contact-entry-photo-wrapper { + position: relative; +} +.contact-entry-desc { + overflow: hidden; +} +.contact-entry-name { + font-weight: bold; +} +.contact-entry-details { + font-size: 13px; + color: #999999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } /* photo */ .lframe { float: left; margin: 0px 10px 10px 0px; } +.contact-entry-photo a img { + width: 80px; + height: 80px; +} /* profile match wrapper */ .profile-match-wrapper { float: left; @@ -2319,14 +2351,15 @@ aside #id_password { } .contact-photo-menu { width: 11em; - border: 3px solid #364e59; + /*border: 3px solid #364e59;*/ color: #2d2d2d; background: #FFFFFF; -/* position: absolute;*/ - position: relative; - left: 0px; top: 0px; + position: absolute; + /*position: relative;*/ + left: 0px; /*top: 0px;*/ display: none; z-index: 10000; + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); } .contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } .contact-photo-menu li a { diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl index 5271112d83..add2eff5c1 100644 --- a/view/theme/vier/templates/contact_template.tpl +++ b/view/theme/vier/templates/contact_template.tpl @@ -7,18 +7,18 @@ {{$contact.name}} - {{if !$no_contacts_checkbox}} + {{if $multiselect}} {{/if}} {{if $contact.photo_menu}}
-
-
{{$contact.name}}
+ +
+
{{$contact.name}}
+ {{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} + {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.details}}
{{$contact.details}}
{{/if}} +
+