maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Moved customer - traffic - charts to JS and with this fixing the display - errors, refs #696

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-10-07 11:54:26 +02:00
parent e460b7cce9
commit 36faeb3f09
68 changed files with 14569 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/Classic/admin/traffic/index.tpl
View File

@@ -1,5 +1,5 @@
$header
<script type="text/javascript" src="templates/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="js/jquery.tablesorter.min.js"></script>
<script type="text/javascript">
$.tablesorter.addParser( {
id: 'filesize',

2
templates/Classic/header.tpl
View File

@@ -7,7 +7,7 @@
<meta name="GOOGLEBOT" content="nosnippet" />
</if>
<link rel="stylesheet" href="templates/Classic/main.css" type="text/css" />
<script type="text/javascript" src="templates/Classic/js/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="templates/Classic/js/froxlor.js"></script>
<link rel="icon" href="images/favicon.ico" type="image/x-icon" />
<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor</title>

2
templates/Froxlor/admin/traffic/index.tpl
View File

@@ -1,5 +1,5 @@
$header
<script type="text/javascript" src="templates/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="js/jquery.tablesorter.min.js"></script>
<script type="text/javascript">
$.tablesorter.addParser( {
id: 'filesize',

17
templates/Froxlor/customer/traffic/traffic.tpl
View File

@@ -25,24 +25,21 @@ $header
<td><div style="color:#800000;text-align:center">{$traffic_complete['mail']}</div></td>
</tr>
</table>
<br /><br />
<table class="formtable">
<tr>
<table class="formtable" id="datatable">
<tr id="datalegend">
<td>{$lng['traffic']['month']}</td>
<td>{$lng['traffic']['distribution']}</td>
<td>{$lng['traffic']['ftp']}</td>
<td>{$lng['traffic']['http']}</td>
<td>{$lng['traffic']['mail']}</td>
<td class="text-align:right;">{$lng['customer']['traffic']}</td>
<td></td>
</tr>
$traffic
</table>
<p style="display: none;">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="send" value="send" />
</p>
</fieldset>
</form>
</section>
<div id="chartdiv"></div>
</article>
$footer

19
templates/Froxlor/customer/traffic/traffic_details.tpl
View File

@@ -25,24 +25,19 @@ $header
<td><div style="color:#800000;text-align:center">{$traffic_complete['mail']}</div></td>
</tr>
</table>
<br /><br />
<table class="formtable">
<tr>
<table class="formtable" id="datatable">
<tr id="datalegend">
<td>{$lng['traffic']['day']}</td>
<td>{$lng['traffic']['distribution']}</td>
<td style="text-align:right;">{$lng['traffic']['mb']}</td>
<td>{$lng['traffic']['ftp']}</td>
<td>{$lng['traffic']['http']}</td>
<td>{$lng['traffic']['mail']}</td>
<td>{$lng['traffic']['mb']}</td>
</tr>
$traffic
</table>
<p style="display: none;">
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="send" value="send" />
</p>
</fieldset>
</form>
</section>
<div id="chartdiv"></div>
</article>
$footer

10
templates/Froxlor/customer/traffic/traffic_month.tpl
View File

@@ -1,6 +1,8 @@
<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
<td style="width:30px;">{$traf['day']}.&nbsp;&nbsp;</td>
<td><img src="images/Froxlor/traffic_green.gif" width="{$traf['ftp']}%" height="9" alt="" border="0" align="" title="{$traf['ftptext']}"><br><img src="images/Froxlor/traffic_blue.gif" width="{$traf['http']}%" height="9" alt="" border="0" align="" title="{$traf['httptext']}"><br><img src="images/Froxlor/traffic_red.gif" width="{$traf['mail']}%" height="9" alt="" border="0" align="" title="{$traf['mailtext']}"></td>
<td style="text-align:right; width:80px;">{$traf['byte']}</td>
<tr>
<td>{$traf['day']}</td>
<td>{$traf['ftp']}</td>
<td>{$traf['http']}</td>
<td>{$traf['mail']}</td>
<td>{$traf['byte']}</td>
</tr>

11
templates/Froxlor/customer/traffic/traffic_traffic.tpl
View File

@@ -1,7 +1,8 @@
<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
<td style="width:80px;">
<a href="{$linker->getLink(array('section' => 'traffic', 'month' => $traf['month'], 'year' => $traf['year']))}">{$traf['monthname']}</a>
</td>
<td><img src="images/Froxlor/traffic_green.gif" width="{$traf['ftp']}%" height="9" alt="{$traf['ftptext']}" border="0" align="" title="{$traf['ftptext']}"><br><img src="images/Froxlor/traffic_blue.gif" width="{$traf['http']}%" height="9" alt="{$traf['httptext']}" border="0" align="" title="{$traf['httptext']}"><br><img src="images/Froxlor/traffic_red.gif" width="{$traf['mail']}%" height="9" alt="{$traf['mailtext']}" border="0" align="" title="{$traf['mailtext']}"></td>
<tr>
<td>{$traf['monthname']}</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>
</tr>

13
templates/Froxlor/header.tpl
View File

@@ -7,10 +7,19 @@
<meta name="robots" content="noindex, nofollow, noarchive" />
<meta name="GOOGLEBOT" content="nosnippet" />
</if>
<script type="text/javascript" src="js/jquery.min.js"></script>
<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<if isset($intrafficpage)>
<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="js/excanvas.js"></script><![endif]-->
<script language="javascript" type="text/javascript" src="js/jquery.jqplot.min.js"></script>
<script language="javascript" type="text/javascript" src="js/plugins/jqplot.barRenderer.min.js"></script>
<script language="javascript" type="text/javascript" src="js/plugins/jqplot.categoryAxisRenderer.min.js"></script>
<script language="javascript" type="text/javascript" src="js/plugins/jqplot.pointLabels.min.js"></script>
<link rel="stylesheet" type="text/css" href="css/jquery.jqplot.css" />
<script language="javascript" type="text/javascript" src="js/traffic.js"></script>
</if>
<link rel="stylesheet" href="templates/Froxlor/froxlor.css" />
<!--[if IE]><link rel="stylesheet" href="templates/Froxlor/froxlor_ie.css" /><![endif]-->
<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<script type="text/javascript" src="templates/Froxlor/js/jquery.min.js"></script>
<script type="text/javascript" src="templates/Froxlor/js/froxlor.js"></script>
<link rel="icon" href="images/favicon.ico" type="image/x-icon" />
<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>

18
templates/Froxlor/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
templates/jquery.tablesorter.min.js vendored
View File

File diff suppressed because one or more lines are too long