webui fixes

This commit is contained in:
SJ
2013-02-16 12:33:25 +01:00
parent 78e750fde5
commit d323e076ac
24 changed files with 779 additions and 10 deletions

View File

@ -0,0 +1,79 @@
<p>&nbsp;</p>
<p>
<?php if ($view == 'email') { echo '<strong>'.$text_accounting_email.'</strong>'; } else { echo '<a href="index.php?route=accounting/accounting&amp;view=email">'.$text_accounting_email.'</a>'; } ?> |
<?php if ($view == 'domain') { echo '<strong>'.$text_accounting_domain.'</strong>'; } else { echo '<a href="index.php?route=accounting/accounting&amp;view=domain">'.$text_accounting_domain.'</a>'; } ?>
</p>
<?php if ( $accounting ) { ?>
<div id="pagenav">
<?php if($page > 0){ ?><a href="index.php?route=accounting/accounting&amp;page=0&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &laquo; <?php if($page > 0){ ?></a><?php } ?>
<?php if($page > 0){ ?><a href="index.php?route=accounting/accounting&amp;page=<?php print $prev_page; ?>&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &lsaquo; <?php if($page > 0){ ?></a><?php } ?>
<?php if(count($accounting) > 0) { print $accounting[0]['display']; ?> - <?php print $accounting[count($accounting)-1]['display']; } ?>
<?php if($total_records >= $page_len*($page+1) && $total_records > $page_len){ ?><a href="index.php?route=accounting/accounting&amp;page=<?php print $next_page; ?>&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &rsaquo; <?php if($total_records >= $page_len*($page+1) && $total_records > $page_len){ ?></a><?php } ?>
<?php if($page < $total_pages){ ?><a href="index.php?route=accounting/accounting&amp;page=<?php print $total_pages; ?>&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &raquo; <?php if($page < $total_pages){ ?></a><?php } ?>
</div>
<div id="ss1" style="margin-top: 10px;">
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell">&nbsp;</div>
<div class="domaincell">&nbsp;</div>
<div class="domaincell">Sent</div>
<div class="domaincell">&nbsp;</div>
<div class="domaincell">&nbsp;</div>
<div class="domaincell">Received</div>
<div class="domaincell">&nbsp;</div>
<div class="domaincell">&nbsp;</div>
</div>
<div class="domainrow">
<div class="domaincell"><?php echo $viewname; ?> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=item&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=item&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">Oldest Record <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=oldest&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=oldest&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">Newest Record <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=newest&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=newest&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">Items <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=sent&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=sent&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">Size <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=sentsize&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=sentsize&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">Avg Size <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=sentavg&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=sentavg&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">Items <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=recd&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=recd&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">Size <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=recdsize&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=recdsize&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">Avg Size <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=recdavg&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=accounting/accounting&amp;view=<?php echo $view; ?>&amp;sort=recdavg&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
</div>
<?php foreach($accounting as $details) {?>
<div class="domainrow">
<div class="domaincell"><?php echo $details['item']; ?></div>
<div class="domaincell"><?php echo date("d M Y",$details['oldest']); ?></div>
<div class="domaincell"><?php echo date("d M Y",$details['newest']); ?></div>
<div class="domaincell">
<?php echo $details['sent']; ?>
</div>
<div class="domaincell">
<?php echo nice_size($details['sentsize']); ?>
</div>
<div class="domaincell">
<?php echo nice_size($details['sentavg']); ?>
</div>
<div class="domaincell">
<?php echo $details['recd']; ?>
</div>
<div class="domaincell">
<?php echo nice_size($details['recdsize']); ?>
</div>
<div class="domaincell">
<?php echo nice_size($details['recdavg']); ?>
</div>
</div>
<?php } ?>
</div>
<div id="pagenav">
<?php if($page > 0){ ?><a href="index.php?route=accounting/accounting&amp;page=0&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &laquo; <?php if($page > 0){ ?></a><?php } ?>
<?php if($page > 0){ ?><a href="index.php?route=accounting/accounting&amp;page=<?php print $prev_page; ?>&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &lsaquo; <?php if($page > 0){ ?></a><?php } ?>
<?php if(count($accounting) > 0) { print $accounting[0]['display']; ?> - <?php print $accounting[count($accounting)-1]['display']; } ?>
<?php if($total_records >= $page_len*($page+1) && $total_records > $page_len){ ?><a href="index.php?route=accounting/accounting&amp;page=<?php print $next_page; ?>&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &rsaquo; <?php if($total_records >= $page_len*($page+1) && $total_records > $page_len){ ?></a><?php } ?>
<?php if($page < $total_pages){ ?><a href="index.php?route=accounting/accounting&amp;page=<?php print $total_pages; ?>&amp;view=<?php echo $view; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &raquo; <?php if($page < $total_pages){ ?></a><?php } ?>
</div>
<?php } else { ?>
<p>No <?php echo $viewname; ?> Found</p>
<?php } ?>

View File

@ -20,7 +20,7 @@
<script type="text/javascript" src="/view/javascript/piler.js"></script>
</head>
<body<?php if(isset($this->request->get['route']) && $this->request->get['route'] == 'health/health') { ?> onload="Piler.load_health();"<?php } ?>>
<body<?php if(isset($this->request->get['route']) && $this->request->get['route'] == 'health/health') { ?> onload="Piler.load_health(); setInterval('Piler.load_health()', Piler.health_refresh * 1000);"<?php } ?>>
<div id="piler1">

View File

@ -14,6 +14,7 @@
<ul class="sub_menu">
<li><a href="index.php?route=stat/stat&timespan=daily"><?php print $text_statistics; ?></a></li>
<li><a href="index.php?route=health/health"><?php print $text_health; ?></a></li>
<li><a href="index.php?route=accounting/accounting&view=email"><?php print $text_accounting; ?></a></li>
<?php if(ENABLE_AUDIT == 1) { ?>
<li><a href="index.php?route=audit/audit"><?php print $text_audit; ?></a></li>
<?php } ?>

View File

@ -91,6 +91,17 @@
<div class="cellhealthright"><?php foreach($shortdiskinfo as $partition) { ?><span class="<?php if($partition['utilization'] < HEALTH_RATIO) { ?>ok<?php } else { ?>error<?php } ?>"><?php print $partition['partition']; ?> <?php print $partition['utilization']; ?>%</span> <?php } ?></div>
</div>
<div class="row">
<div class="cellhealthleft"><?php print $text_space_projection; ?></div>
<div class="cellhealthright">
<?php print $averagemessages; ?> (<?php print $text_average_messages_day; ?>)<br/>
<?php print $averagemessagesize; ?> + <?php print $averagesqlsize; ?> + <?php print $averagesphinxsize; ?> (<?php print $text_average_message_size; ?>)<br/>
<?php print $averagesizeday; ?> (<?php print $text_average_size_day; ?>)<br/>
<?php print $daysleftatcurrentrate[0]; ?> years, <?php print $daysleftatcurrentrate[1]; ?> months, <?php print $daysleftatcurrentrate[2]; ?> days ("<?php print DATA_PARTITION; ?>" <?php print $text_partition_full; ?>)<br/>
<?php if ( $usagetrend > 0 ) { print $text_usage_increasing; } elseif( $usagetrend < 0 ) { print $text_useage_decreasing; } else { print $text_usage_neutral; } ?> (<?php print $text_usage_trend; ?>)<br/>
</div>
</div>
</div></div>
</body>

View File

@ -86,6 +86,32 @@
<?php } } ?>
</div>
</div>
<div class="row">
<div class="cellhealthleft"><?php print $text_space_projection; ?></div>
<div class="cellhealthright">
<div class="row">
<div class="cellhealthright"><?php print $text_average_messages_day; ?></div>
<div class="cellhealthright"><?php print $averagemessages; ?></div>
</div>
<div class="row">
<div class="cellhealthright"><?php print $text_average_message_size; ?></div>
<div class="cellhealthright"><?php print $averagemessagesize; ?> + <?php print $averagesqlsize; ?> + <?php print $averagesphinxsize; ?></div>
</div>
<div class="row">
<div class="cellhealthright"><?php print $text_average_size_day; ?></div>
<div class="cellhealthright"><?php print $averagesizeday; ?></div>
</div>
<div class="row">
<div class="cellhealthright">"<?php print DATA_PARTITION; ?>" <?php print $text_partition_full; ?></div>
<div class="cellhealthright"><?php print $daysleftatcurrentrate[0]; ?> years, <?php print $daysleftatcurrentrate[1]; ?> months, <?php print $daysleftatcurrentrate[2]; ?> days</div>
</div>
<div class="row">
<div class="cellhealthright"><?php print $text_usage_trend; ?></div>
<div class="cellhealthright"><?php if ( $usagetrend > 0 ) { print $text_usage_increasing; } elseif( $usagetrend < 0 ) { print $text_usage_decreasing; } else { print $text_usage_neutral; } ?></div>
</div>
</div>
</div>
</div>