Improvements to traffic graphs

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2013-12-27 14:13:38 +01:00
parent 1539ad1344
commit 5cb0256a58
10 changed files with 293 additions and 294 deletions

View File

@@ -6,38 +6,43 @@ $header
{$lng['menue']['traffic']['traffic']}
</h2>
</header>
<form action="{$linker->getLink(array('section' => 'traffic'))}" method="post" enctype="application/x-www-form-urlencoded">
<fieldset>
<table class="fullform bradius" id="datatable">
<thead>
<tr>
<th>{$lng['traffic']['month']}</td>
<th>{$lng['traffic']['ftp']}</th>
<th>{$lng['traffic']['http']}</th>
<th>{$lng['traffic']['mail']}</th>
<th class="text-align:right;">{$lng['customer']['traffic']}</th>
</tr>
</thead>
<tbody>
$traffic
</tbody>
<tfoot>
<tr>
<td>{$lng['traffic']['months']['total']}</td>
<td>{$traffic_complete['ftp']}</td>
<td>{$traffic_complete['http']}</td>
<td>{$traffic_complete['mail']}</td>
<td></td>
</tr>
</tfoot>
</table>
</fieldset>
</form>
<section>
<form action="{$linker->getLink(array('section' => 'traffic'))}" method="post" enctype="application/x-www-form-urlencoded">
<fieldset>
<table class="fullform bradius">
<tr>
<th>{$lng['traffic']['sumftp']}</th>
<th>{$lng['traffic']['sumhttp']}</th>
<th>{$lng['traffic']['summail']}</th>
</tr>
<tr>
<td><div style="color:#019522;">{$traffic_complete['ftp']}</div></td>
<td><div style="color:#0000FF;">{$traffic_complete['http']}</div></td>
<td><div style="color:#800000;">{$traffic_complete['mail']}</div></td>
</tr>
</table><br />
<table class="fullform bradius" id="datatable">
<tr id="datalegend">
<th>{$lng['traffic']['month']}</td>
<th>{$lng['traffic']['ftp']}</th>
<th>{$lng['traffic']['http']}</th>
<th>{$lng['traffic']['mail']}</th>
<th class="text-align:right;">{$lng['customer']['traffic']}</th>
<th></th>
</tr>
$traffic
</table>
</fieldset>
</form>
</section>
<div id="chartdiv" style="width:100%"></div>
<div id="charts" style="display: none">
<h3>HTTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['http']})</h3>
<div id="httpchart" class="trafficchart" style="width:100%"></div>
<h3>FTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['ftp']})</h3>
<div id="ftpchart" class="trafficchart" style="width:100%"></div>
<h3>Mail {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['mail']})</h3>
<div id="mailchart" class="trafficchart" style="width:100%"></div>
</div>
</article>
$footer

View File

@@ -7,40 +7,36 @@ $header
</h2>
</header>
<section class="fullform bradius">
<form action="{$linker->getLink(array('section' => 'traffic'))}" method="post" enctype="application/x-www-form-urlencoded">
<fieldset>
<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['traffic']['traffic']} $show</legend>
<table class="formtable">
<thead>
<tr>
<th>{$lng['traffic']['sumftp']}</th>
<th>{$lng['traffic']['sumhttp']}</th>
<th>{$lng['traffic']['summail']}</th>
</tr>
</thead>
<tr>
<td><div style="color:#019522;text-align:center">{$traffic_complete['ftp']}</div></td>
<td><div style="color:#0000FF;text-align:center">{$traffic_complete['http']}</div></td>
<td><div style="color:#800000;text-align:center">{$traffic_complete['mail']}</div></td>
</tr>
</table>
<table class="formtable" id="datatable">
<tr id="datalegend">
<td>{$lng['traffic']['day']}</td>
<td>{$lng['traffic']['ftp']}</td>
<td>{$lng['traffic']['http']}</td>
<td>{$lng['traffic']['mail']}</td>
<td>{$lng['traffic']['mb']}</td>
</tr>
$traffic
</table>
</fieldset>
</form>
</section>
<br />
<div id="chartdiv" style="width:100%"></div>
<table class="bradius" id="datatable">
<thead>
<tr>
<th>{$lng['traffic']['day']}</th>
<th>{$lng['traffic']['ftp']}</th>
<th>{$lng['traffic']['http']}</th>
<th>{$lng['traffic']['mail']}</th>
<th>{$lng['traffic']['mb']}</th>
</tr>
</thead>
<tfoot>
<tr>
<td>{$lng['traffic']['months']['total']}</td>
<td>{$traffic_complete['ftp']}</td>
<td>{$traffic_complete['http']}</td>
<td>{$traffic_complete['mail']}</td>
<td>&nbsp;</td>
</tr>
</tfoot>
<tbody>
$traffic
</tbody>
</table>
<div id="charts" style="display: none">
<h3>HTTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['http']})</h3>
<div id="httpchart" class="trafficchart"></div>
<h3>FTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['ftp']})</h3>
<div id="ftpchart" class="trafficchart"></div>
<h3>Mail {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['mail']})</h3>
<div id="mailchart" class="trafficchart"></div>
</div>
</article>
$footer

View File

@@ -1,8 +1,7 @@
<tr>
<td>{$traf['monthname']}</td>
<td><a href="{$linker->getLink(array('section' => 'traffic', 'month' => $traf['month'], 'year' => $traf['year']))}">{$traf['monthname']}</a></td>
<td>{$traf['ftp']}</td>
<td>{$traf['http']}</td>
<td>{$traf['mail']}</td>
<td style="text-align:right; width:70px;">{$traf['byte']}</td>
<td><a href="{$linker->getLink(array('section' => 'traffic', 'month' => $traf['month'], 'year' => $traf['year']))}">{$traf['monthname']}</a></td>
<td>{$traf['byte']}</td>
</tr>