diff options
| author | zotlabs <mike@macgirvin.com> | 2017-06-08 19:15:55 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-06-08 19:15:55 -0700 |
| commit | cf583168dd1b3ea461e07918eda404546d8136f4 (patch) | |
| tree | 90aeb12252ba931f8f68d0ae6b9960a810a05b22 | |
| parent | 236b5285521cb4dbe207a11c0adb005b2ef05c87 (diff) | |
| download | volse-hubzilla-cf583168dd1b3ea461e07918eda404546d8136f4.tar.gz volse-hubzilla-cf583168dd1b3ea461e07918eda404546d8136f4.tar.bz2 volse-hubzilla-cf583168dd1b3ea461e07918eda404546d8136f4.zip | |
put unreachable federated connections in the archived tab of the connections list page
| -rw-r--r-- | Zotlabs/Module/Connections.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 1 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index bb223fb01..a880fc643 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -19,7 +19,7 @@ class Connections extends \Zotlabs\Web\Controller { } - function get() { + function get() { $sort_type = 0; $o = ''; @@ -63,8 +63,8 @@ class Connections extends \Zotlabs\Web\Controller { $hidden = true; break; case 'archived': - $search_flags = " and abook_archived = 1 "; - $head = t('Archived'); + $search_flags = " and ( abook_archived = 1 OR abook_not_here = 1) "; + $head = t('Archived/Unreachable'); $archived = true; break; case 'pending': @@ -171,7 +171,7 @@ class Connections extends \Zotlabs\Web\Controller { 'label' => t('Archived'), 'url' => z_root() . '/connections/archived', 'sel' => ($archived) ? 'active' : '', - 'title' => t('Only show archived connections'), + 'title' => t('Only show archived/unreachable connections'), ), 'hidden' => array( diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 484e69b52..a42987fcf 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -856,6 +856,7 @@ class Connedit extends \Zotlabs\Web\Controller { '$addr_text' => t('This connection\'s primary address is'), '$loc_text' => t('Available locations:'), '$locstr' => $locstr, + '$not_here' => ((intval($contact['abook_not_here'])) ? t('Not connected at this location') : ''), '$notself' => (($self) ? '' : '1'), '$self' => (($self) ? '1' : ''), '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 9fb5c4b18..8d44e8b16 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -59,6 +59,11 @@ {{$loc_text}} {{$locstr}} </div> {{/if}} + {{if $not_here}} + <div> + <strong>{{$not_here}}</strong> + </div> + {{/if}} {{if $last_update}} <div> {{$lastupdtext}} {{$last_update}} |