From 23460302f5e6b97a5e7b9d6038e77dc4c2d13033 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 5 Mar 2012 18:51:21 -0800 Subject: [PATCH] some admin page fixes and cleanup --- mod/admin.php | 10 +++++++--- view/admin_plugins_details.tpl | 9 +++++++-- view/admin_summary.tpl | 2 +- view/theme/darkzero/theme.php | 2 ++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 94bf44503..2115f9241 100755 --- a/mod/admin.php +++ b/mod/admin.php @@ -145,9 +145,10 @@ function admin_page_summary(&$a) { Array( t('Automatic Friend Account'), 0) ); $users=0; - foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+=$u['count']; } + foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; } + + logger('accounts: ' . print_r($accounts,true)); - $r = q("SELECT COUNT(id) as `count` FROM `register`"); $pending = $r[0]['count']; @@ -574,6 +575,8 @@ function admin_page_plugins(&$a){ '$status' => $status, '$action' => $action, '$info' => get_plugin_info($plugin), + '$str_author' => t('Author: '), + '$str_maintainer' => t('Maintainer: '), '$admin_form' => $admin_form, '$function' => 'plugins', @@ -747,7 +750,8 @@ function admin_page_themes(&$a){ '$info' => get_theme_info($theme), '$function' => 'themes', '$admin_form' => $admin_form, - + '$str_author' => t('Author: '), + '$str_maintainer' => t('Maintainer: '), '$readme' => $readme )); } diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl index d7147b20b..ead356f5b 100755 --- a/view/admin_plugins_details.tpl +++ b/view/admin_plugins_details.tpl @@ -4,13 +4,18 @@

$info.name - $info.version : $action

$info.description

-

+

$str_author {{ for $info.author as $a }} {{ if $a.link }}$a.name{{ else }}$a.name{{ endif }}, {{ endfor }}

- +

$str_maintainer + {{ for $info.maintainer as $a }} + {{ if $a.link }}$a.name{{ else }}$a.name{{ endif }}, + {{ endfor }} +

+ {{ if $admin_form }}

$settings

diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl index 59428986a..eed71fbe0 100755 --- a/view/admin_summary.tpl +++ b/view/admin_summary.tpl @@ -13,7 +13,7 @@ {{ for $accounts as $p }}
$p.0
-
$p.1
+
{{ if $p.1 }}$p.1{{ else }}0{{ endif }}
{{ endfor }} diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php index 37632c4b5..839d862a1 100755 --- a/view/theme/darkzero/theme.php +++ b/view/theme/darkzero/theme.php @@ -4,6 +4,8 @@ * Name: Darkzero * Version: 1.0 * Author: Fabio Communi + * Maintainer: Fabio Communi + * Maintainer: Mike Macgirvin */ $a->theme_info = array(