diff --git a/mod/admin.php b/mod/admin.php index 95ab2b0c5a..70ef5f7511 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -160,7 +160,7 @@ function admin_content(&$a) { $aside_tools['plugins_admin']=array(); foreach ($r as $h){ $plugin =$h['name']; - $aside['plugins_admin'][] = array($a->get_baseurl(true)."/admin/plugins/".$plugin, $plugin, "plugin"); + $aside_tools['plugins_admin'][] = array($a->get_baseurl(true)."/admin/plugins/".$plugin, $plugin, "plugin"); // temp plugins with admin $a->plugins_admin[] = $plugin; } diff --git a/view/global.css b/view/global.css index ce69e2e27d..8646bf8e44 100644 --- a/view/global.css +++ b/view/global.css @@ -280,6 +280,18 @@ a { font-weight: bold; color: #00a700; } +.federation-graph { + width: 400px; + height: 400px; + float: right; + margin: 20px; +} +.federation-network-graph { + width: 240px; + height: 240px; + float: left; + margin: 20px; +} ul.federation-stats, ul.credits { list-style: none; @@ -289,6 +301,12 @@ ul.credits li { float: left; width: 240px; } +table#federation-stats { + width: 100%; +} +td.federation-data { + border-bottom: 1px solid #000; +} .contact-entry-photo img { max-width: 80px; diff --git a/view/templates/admin_federation.tpl b/view/templates/admin_federation.tpl index b1c56cd075..fb75157585 100644 --- a/view/templates/admin_federation.tpl +++ b/view/templates/admin_federation.tpl @@ -1,5 +1,5 @@ - +

{{$title}} - {{$page}}

{{$intro}}

@@ -30,7 +30,7 @@ var myDoughnutChart = new Chart(ctx).Doughnut(FedData, document.getElementById('FederationLegend').innerHTML = myDoughnutChart.generateLegend(); - +
{{foreach $counts as $c}} {{if $c[0]['total'] > 0}} @@ -39,9 +39,8 @@ document.getElementById('FederationLegend').innerHTML = myDoughnutChart.generate -
{{$c[0]['network']}}
- + +
    {{foreach $c[1] as $v}}