harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put unreachable federated connections in the archived tab of the connections list page

Browse Source
This commit is contained in:
zotlabs 2017-06-08 19:15:55 -07:00
parent 236b528552
commit cf583168dd
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Connections.php
View File

@ -63,8 +63,8 @@ class Connections extends \Zotlabs\Web\Controller {
$hidden = true; $hidden = true;
break; break;
case 'archived': case 'archived':
$search_flags = " and abook_archived = 1 "; $search_flags = " and ( abook_archived = 1 OR abook_not_here = 1) ";
$head = t('Archived'); $head = t('Archived/Unreachable');
$archived = true; $archived = true;
break; break;
case 'pending': case 'pending':
@ -171,7 +171,7 @@ class Connections extends \Zotlabs\Web\Controller {
'label' => t('Archived'), 'label' => t('Archived'),
'url' => z_root() . '/connections/archived', 'url' => z_root() . '/connections/archived',
'sel' => ($archived) ? 'active' : '', 'sel' => ($archived) ? 'active' : '',
'title' => t('Only show archived connections'), 'title' => t('Only show archived/unreachable connections'),
), ),
'hidden' => array( 'hidden' => array(

1
Zotlabs/Module/Connedit.php
View File

@ -856,6 +856,7 @@ class Connedit extends \Zotlabs\Web\Controller {
'$addr_text' => t('This connection\'s primary address is'), '$addr_text' => t('This connection\'s primary address is'),
'$loc_text' => t('Available locations:'), '$loc_text' => t('Available locations:'),
'$locstr' => $locstr, '$locstr' => $locstr,
'$not_here' => ((intval($contact['abook_not_here'])) ? t('Not connected at this location') : ''),
'$notself' => (($self) ? '' : '1'), '$notself' => (($self) ? '' : '1'),
'$self' => (($self) ? '1' : ''), '$self' => (($self) ? '1' : ''),
'$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'),

5
view/tpl/abook_edit.tpl
View File

@ -59,6 +59,11 @@
{{$loc_text}} {{$locstr}} {{$loc_text}} {{$locstr}}
</div> </div>
{{/if}} {{/if}}
{{if $not_here}}
<div>
<strong>{{$not_here}}</strong>
</div>
{{/if}}
{{if $last_update}} {{if $last_update}}
<div> <div>
{{$lastupdtext}} {{$last_update}} {{$lastupdtext}} {{$last_update}}