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

more contacts categorisation, page cleanup

Browse source
This commit is contained in:
friendica 2012-02-13 22:48:35 -08:00
parent 4de67d95ce
commit d2a9ce9362
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mod/contacts.php
View file

@ -367,6 +367,7 @@ function contacts_content(&$a) {
$blocked = false; $blocked = false;
$hidden = false; $hidden = false;
$ignored = false;
$all = false; $all = false;
$_SESSION['return_url'] = $a->query_string; $_SESSION['return_url'] = $a->query_string;
@ -383,6 +384,10 @@ function contacts_content(&$a) {
$sql_extra = " AND `hidden` = 1 "; $sql_extra = " AND `hidden` = 1 ";
$hidden = true; $hidden = true;
} }
elseif(($a->argc == 2) && ($a->argv[1] === 'ignored')) {
$sql_extra = " AND `readonly` = 1 ";
$ignored = true;
}
else else
$sql_extra = " AND `blocked` = 0 "; $sql_extra = " AND `blocked` = 0 ";
@ -398,7 +403,7 @@ function contacts_content(&$a) {
array( array(
'label' => t('Unblocked Contacts'), 'label' => t('Unblocked Contacts'),
'url' => $a->get_baseurl() . '/contacts', 'url' => $a->get_baseurl() . '/contacts',
'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets)) ? 'active' : '', 'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored)) ? 'active' : '',
), ),
array( array(
@ -406,11 +411,19 @@ function contacts_content(&$a) {
'url' => $a->get_baseurl() . '/contacts/blocked', 'url' => $a->get_baseurl() . '/contacts/blocked',
'sel' => ($blocked) ? 'active' : '', 'sel' => ($blocked) ? 'active' : '',
), ),
array(
'label' => t('Ignored Contacts'),
'url' => $a->get_baseurl() . '/contacts/ignored',
'sel' => ($ignored) ? 'active' : '',
),
array( array(
'label' => t('Hidden Contacts'), 'label' => t('Hidden Contacts'),
'url' => $a->get_baseurl() . '/contacts/hidden', 'url' => $a->get_baseurl() . '/contacts/hidden',
'sel' => ($hidden) ? 'active' : '', 'sel' => ($hidden) ? 'active' : '',
), ),
); );
$tab_tpl = get_markup_template('common_tabs.tpl'); $tab_tpl = get_markup_template('common_tabs.tpl');
@ -419,8 +432,10 @@ function contacts_content(&$a) {
if($search) if($search) {
$search_hdr = $search;
$search = dbesc($search.'*'); $search = dbesc($search.'*');
}
$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : ""); $sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
if($nets) if($nets)
@ -441,7 +456,7 @@ function contacts_content(&$a) {
'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
'$tabs' => $t, '$tabs' => $t,
'$total' => $r[0]['total'], '$total' => $r[0]['total'],
'$search' => $search, '$search' => $search_hdr,
'$desc' => t('Search your contacts'), '$desc' => t('Search your contacts'),
'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""), '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
'$submit' => t('Find'), '$submit' => t('Find'),

5
view/contacts-top.tpl
View file

@ -2,8 +2,6 @@
$finding $finding
$tabs
<div id="contacts-search-wrapper"> <div id="contacts-search-wrapper">
<form id="contacts-search-form" action="$cmd" method="get" > <form id="contacts-search-form" action="$cmd" method="get" >
<span class="contacts-search-desc">$desc</span> <span class="contacts-search-desc">$desc</span>
@ -13,5 +11,8 @@ $tabs
</div> </div>
<div id="contacts-search-end"></div> <div id="contacts-search-end"></div>
$tabs