keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2261 from tobiasd/20160118-admin

Browse source 
readd plugin features to admin aside
This commit is contained in:
Michael Vogel 2016-01-18 15:46:42 +01:00
commit 0fa7ff623a
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/admin.php
View file

@ -160,7 +160,7 @@ function admin_content(&$a) {
$aside_tools['plugins_admin']=array(); $aside_tools['plugins_admin']=array();
foreach ($r as $h){ foreach ($r as $h){
$plugin =$h['name']; $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 // temp plugins with admin
$a->plugins_admin[] = $plugin; $a->plugins_admin[] = $plugin;
} }

18
view/global.css
View file

@ -280,6 +280,18 @@ a {
font-weight: bold; font-weight: bold;
color: #00a700; 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.federation-stats,
ul.credits { ul.credits {
list-style: none; list-style: none;
@ -289,6 +301,12 @@ ul.credits li {
float: left; float: left;
width: 240px; width: 240px;
} }
table#federation-stats {
width: 100%;
}
td.federation-data {
border-bottom: 1px solid #000;
}
.contact-entry-photo img { .contact-entry-photo img {
max-width: 80px; max-width: 80px;

12
view/templates/admin_federation.tpl
View file

@ -1,5 +1,5 @@
<script src="{{$baseurl}}/library/Chart.js-1.0.2/Chart.min.js"></script> <script src="{{$baseurl}}/library/Chart.js-1.0.2/Chart.min.js"></script>
<canvas id="FederationChart" style="width: 400px; height: 400px; float: right; margin: 20px;"></canvas> <canvas id="FederationChart" class="federation-graph"></canvas>
<div id="adminpage"> <div id="adminpage">
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<p>{{$intro}}</p> <p>{{$intro}}</p>
@ -30,7 +30,7 @@ var myDoughnutChart = new Chart(ctx).Doughnut(FedData,
document.getElementById('FederationLegend').innerHTML = myDoughnutChart.generateLegend(); document.getElementById('FederationLegend').innerHTML = myDoughnutChart.generateLegend();
</script> </script>
<table style="width: 100%"> <table id="federation-stats">
{{foreach $counts as $c}} {{foreach $counts as $c}}
{{if $c[0]['total'] > 0}} {{if $c[0]['total'] > 0}}
<tr> <tr>
@ -39,9 +39,8 @@ document.getElementById('FederationLegend').innerHTML = myDoughnutChart.generate
<td>{{$c[0]['network']}}</td> <td>{{$c[0]['network']}}</td>
</tr> </tr>
<tr> <tr>
<td colspan="3" style="border-bottom: 1px solid #000;"> <td colspan="3" class="federation-data">
<canvas id="{{$c[2]}}Chart" style="width: 240px; height: 240px; float: left; <canvas id="{{$c[2]}}Chart" class="federation-network-graph"></canvas>
margin: 20px;"></canvas>
<script> <script>
var {{$c[2]}}data = [ var {{$c[2]}}data = [
{{foreach $c[1] as $v}} {{foreach $c[1] as $v}}
@ -49,8 +48,7 @@ var {{$c[2]}}data = [
{{/foreach}} {{/foreach}}
]; ];
var ctx = document.getElementById("{{$c[2]}}Chart").getContext("2d"); var ctx = document.getElementById("{{$c[2]}}Chart").getContext("2d");
var my{{$c[2]}}DoughnutChart = new Chart(ctx).Doughnut({{$c[2]}}data, var my{{$c[2]}}DoughnutChart = new Chart(ctx).Doughnut({{$c[2]}}data, {animateRotate : false,});
{animateRotate : false,});
</script> </script>
<ul class="federation-stats"> <ul class="federation-stats">
{{foreach $c[1] as $v}} {{foreach $c[1] as $v}}