diff options
| author | zotlabs <mike@macgirvin.com> | 2017-06-26 22:42:01 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-06-26 22:42:01 -0700 |
| commit | 54c5e03b4f94e07fccf1d67078a534d2e7da99b4 (patch) | |
| tree | d44d09880241e268e0c04aef841df8d552925d0a | |
| parent | a8374b25f15c1c7545748bae26dda5e3c190573c (diff) | |
| download | volse-hubzilla-54c5e03b4f94e07fccf1d67078a534d2e7da99b4.tar.gz volse-hubzilla-54c5e03b4f94e07fccf1d67078a534d2e7da99b4.tar.bz2 volse-hubzilla-54c5e03b4f94e07fccf1d67078a534d2e7da99b4.zip | |
provide more comprehensible information on the admin summary page
| -rw-r--r-- | Zotlabs/Module/Admin.php | 17 | ||||
| -rwxr-xr-x | view/tpl/admin_summary.tpl | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 65ce363c0..f2918dffc 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -91,10 +91,10 @@ class Admin extends \Zotlabs\Web\Controller { intval(ACCOUNT_BLOCKED) ); if ($r) { - $accounts['total'] = array('label' => t('# Accounts'), 'val' => $r[0]['total']); - $accounts['blocked'] = array('label' => t('# blocked accounts'), 'val' => $r[0]['blocked']); - $accounts['expired'] = array('label' => t('# expired accounts'), 'val' => $r[0]['expired']); - $accounts['expiring'] = array('label' => t('# expiring accounts'), 'val' => $r[0]['expiring']); + $accounts['total'] = array('label' => t('Accounts'), 'val' => $r[0]['total']); + $accounts['blocked'] = array('label' => t('Blocked accounts'), 'val' => $r[0]['blocked']); + $accounts['expired'] = array('label' => t('Expired accounts'), 'val' => $r[0]['expired']); + $accounts['expiring'] = array('label' => t('Expiring accounts'), 'val' => $r[0]['expiring']); } // pending registrations @@ -105,9 +105,9 @@ class Admin extends \Zotlabs\Web\Controller { $channels = array(); $r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN channel_primary = 1 THEN 1 ELSE NULL END) AS main, COUNT(CASE WHEN channel_primary = 0 THEN 1 ELSE NULL END) AS clones FROM channel WHERE channel_removed = 0"); if ($r) { - $channels['total'] = array('label' => t('# Channels'), 'val' => $r[0]['total']); - $channels['main'] = array('label' => t('# primary'), 'val' => $r[0]['main']); - $channels['clones'] = array('label' => t('# clones'), 'val' => $r[0]['clones']); + $channels['total'] = array('label' => t('Channels'), 'val' => $r[0]['total']); + $channels['main'] = array('label' => t('Primary'), 'val' => $r[0]['main']); + $channels['clones'] = array('label' => t('Clones'), 'val' => $r[0]['clones']); } // We can do better, but this is a quick queue status @@ -118,6 +118,9 @@ class Admin extends \Zotlabs\Web\Controller { // If no plugins active return 0, otherwise list of plugin names $plugins = (count(\App::$plugins) == 0) ? count(\App::$plugins) : \App::$plugins; + if(is_array($plugins)) + sort($plugins); + // Could be extended to provide also other alerts to the admin $alertmsg = ''; diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index ca94b0ef7..8125703d7 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -12,7 +12,7 @@ </dl> <dl> <dt>{{$accounts.0}}</dt> - <dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd> + <dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}} {{$acc.label}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd> </dl> <dl> <dt>{{$pending.0}}</dt> @@ -20,7 +20,7 @@ </dl> <dl> <dt>{{$channels.0}}</dt> - <dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd> + <dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}} {{$ch.label}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd> </dl> <dl> <dt>{{$plugins.0}}</dt> |