Skip to content

Commit 4a1fa7c

Browse files
author
Kristan Kenney
committed
Merge branch 'bugfix-stats'
2 parents 3caa3a2 + 60b9dd8 commit 4a1fa7c

File tree

2 files changed

+46
-53
lines changed

2 files changed

+46
-53
lines changed

‎web/templates/admin/list_stats.html‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,35 @@
3232
</div>
3333
</div>
3434

35+
3536
<div class="l-separator"></div>
3637

37-
<div class="l-center units narrow animated fadeIn">
38-
<div class="header table-header">
38+
<div class="l-center units animated fadeIn">
39+
<div class="header table-header">
3940
<div class="l-unit__col l-unit__col--right">
40-
<div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
41-
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Month');?></b></div>
42-
<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
43-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?php print __('IPs');?></b></div>
44-
<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-hdd" title="<?php print __('Disk');?>"></i></b></div>
45-
<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-exchange-alt" title="<?php print __('Bandwidth');?>"></i></b></div>
46-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe-americas" title="<?php print __('Web Domains');?>"></i></b></div>
47-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-link" title="<?php print __('Web Aliases');?>"></i></b></div>
48-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-atlas" title="<?php print __('DNS Domains');?>"></i></b></div>
49-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe" title="<?php print __('DNS Records');?>"></i></b></div>
50-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-mail-bulk" title="<?php print __('Mail Domains');?>"></i></b></div>
51-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-inbox" title="<?php print __('Mail Accounts');?>"></i></b></div>
52-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database" title="<?php print __('Databases');?>"></i></b></div>
53-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock" title="<?php print __('Cron Jobs');?>"></i></b></div>
54-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-file-archive" title="<?php print __('Backups');?>"></i></b></div>
55-
</div>
41+
<div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
42+
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Month');?></b></div>
43+
<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
44+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?php print __('IPs');?></b></div>
45+
<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-hdd" title="<?php print __('Disk');?>"></i></b></div>
46+
<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-exchange-alt" title="<?php print __('Bandwidth');?>"></i></b></div>
47+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe-americas" title="<?php print __('Web Domains');?>"></i></b></div>
48+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-link" title="<?php print __('Web Aliases');?>"></i></b></div>
49+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-atlas" title="<?php print __('DNS Domains');?>"></i></b></div>
50+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe" title="<?php print __('DNS Records');?>"></i></b></div>
51+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-mail-bulk" title="<?php print __('Mail Domains');?>"></i></b></div>
52+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-inbox" title="<?php print __('Mail Accounts');?>"></i></b></div>
53+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database" title="<?php print __('Databases');?>"></i></b></div>
54+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock" title="<?php print __('Cron Jobs');?>"></i></b></div>
55+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-file-archive" title="<?php print __('Backups');?>"></i></b></div>
5656
</div>
5757
</div>
58-
59-
<div class="l-center animated fadeIn">
60-
<?php
58+
59+
<?php
6160
foreach ($data as $key => $value) {
62-
++$i;
61+
++$i;
6362
?>
64-
<div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
63+
<div class="l-unit header">
6564
<div class="l-unit__col l-unit__col--right">
6665
<div class="clearfix l-unit__stat-col--left super-compact"><i class="fas fa-calendar-alt status-icon dim"></i></div>
6766
<div class="clearfix l-unit__stat-col--left wide-2"><b><?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?></b></div>
@@ -83,8 +82,6 @@
8382
<?}?>
8483
</div>
8584

86-
</div>
87-
8885
<div id="vstobjects">
8986
<div class="l-separator"></div>
9087
<div class="l-center">

‎web/templates/user/list_stats.html‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,33 @@
2020
</div>
2121

2222
<div class="l-separator"></div>
23-
24-
<div class="l-center units narrow animated fadeIn">
25-
<div class="header table-header">
23+
24+
<div class="l-center units animated fadeIn">
25+
<div class="header table-header">
2626
<div class="l-unit__col l-unit__col--right">
27-
<div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
28-
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Month');?></b></div>
29-
<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
30-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?php print __('IPs');?></b></div>
31-
<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-hdd" title="<?php print __('Disk');?>"></i></b></div>
32-
<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-exchange-alt" title="<?php print __('Bandwidth');?>"></i></b></div>
33-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe-americas" title="<?php print __('Web Domains');?>"></i></b></div>
34-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-link" title="<?php print __('Web Aliases');?>"></i></b></div>
35-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-atlas" title="<?php print __('DNS Domains');?>"></i></b></div>
36-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe" title="<?php print __('DNS Records');?>"></i></b></div>
37-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-mail-bulk" title="<?php print __('Mail Domains');?>"></i></b></div>
38-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-inbox" title="<?php print __('Mail Accounts');?>"></i></b></div>
39-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database" title="<?php print __('Databases');?>"></i></b></div>
40-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock" title="<?php print __('Cron Jobs');?>"></i></b></div>
41-
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-file-archive" title="<?php print __('Backups');?>"></i></b></div>
42-
</div>
27+
<div class="clearfix l-unit__stat-col--left super-compact">&nbsp;</div>
28+
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print __('Month');?></b></div>
29+
<div class="clearfix l-unit__stat-col--left compact text-right"><b>&nbsp;</b></div>
30+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><?php print __('IPs');?></b></div>
31+
<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-hdd" title="<?php print __('Disk');?>"></i></b></div>
32+
<div class="clearfix l-unit__stat-col--left text-center compact"><b><i class="fas fa-exchange-alt" title="<?php print __('Bandwidth');?>"></i></b></div>
33+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe-americas" title="<?php print __('Web Domains');?>"></i></b></div>
34+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-link" title="<?php print __('Web Aliases');?>"></i></b></div>
35+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-atlas" title="<?php print __('DNS Domains');?>"></i></b></div>
36+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-globe" title="<?php print __('DNS Records');?>"></i></b></div>
37+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-mail-bulk" title="<?php print __('Mail Domains');?>"></i></b></div>
38+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-inbox" title="<?php print __('Mail Accounts');?>"></i></b></div>
39+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-database" title="<?php print __('Databases');?>"></i></b></div>
40+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-clock" title="<?php print __('Cron Jobs');?>"></i></b></div>
41+
<div class="clearfix l-unit__stat-col--left text-center super-compact"><b><i class="fas fa-file-archive" title="<?php print __('Backups');?>"></i></b></div>
4342
</div>
4443
</div>
45-
46-
<div class="l-center animated fadeIn">
47-
<?php
44+
45+
<?php
4846
foreach ($data as $key => $value) {
49-
++$i;
47+
++$i;
5048
?>
51-
<div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
49+
<div class="l-unit header">
5250
<div class="l-unit__col l-unit__col--right">
5351
<div class="clearfix l-unit__stat-col--left super-compact"><i class="fas fa-calendar-alt status-icon dim"></i></div>
5452
<div class="clearfix l-unit__stat-col--left wide-2"><b><?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?></b></div>
@@ -65,13 +63,11 @@
6563
<div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_DATABASES']?></b></span></div>
6664
<div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_CRON_JOBS']?></b></span></div>
6765
<div class="clearfix l-unit__stat-col--left text-center super-compact"><span class="jump-top badge gray raised"><b><?=$data[$key]['U_BACKUPS']?></b></span></div>
68-
</div>
69-
</div>
66+
</div>
67+
</div>
7068
<?}?>
7169
</div>
7270

73-
</div>
74-
7571
<div id="vstobjects">
7672
<div class="l-separator"></div>
7773
<div class="l-center">

0 commit comments

Comments
 (0)