Skip to content

Commit 1b2dc86

Browse files
serghey-rodinserghey-rodin
committed
new grid
1 parent a5a4b24 commit 1b2dc86

23 files changed

+252
-262
lines changed

‎web/templates/admin/list_backup.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@
9191
<td style="vertical-align:top;" width="239px">
9292
<table>
9393
<tr>
94-
<td class="chart1" style="padding: 4px 0 0 0"><?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
95-
<div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
96-
<div style="width:100%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
97-
</div>
94+
<td class="counter-name">
95+
<?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
9896
</td>
9997
</tr>
10098
</table>
10199
</td>
102-
<td style="vertical-align:top;" width="297px">
100+
<td style="vertical-align:top;" width="238px">
103101
<table>
104102
<tr>
105103
<td class="counter-name">

‎web/templates/admin/list_backup_detail.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
</a>
5959
<table class="data-col2">
6060
<tr>
61-
<td class="cron" width="239px">
61+
<td class="cron" style="font-size:12pt" width="239px">
6262
<?php echo 'web ' . __('domain') ?>
6363
</td>
64-
<td class="domain">
65-
<b><?php echo $key ?></b>
64+
<td class="domain" style="font-weight:normal">
65+
<?php echo $key ?>
6666
</td>
6767
</tr>
6868
</table>
@@ -95,11 +95,11 @@
9595
</a>
9696
<table class="data-col2">
9797
<tr>
98-
<td class="cron" width="239px">
98+
<td class="cron" style="font-size:12pt" width="239px">
9999
<?php echo 'dns ' . __('domain') ?>
100100
</td>
101-
<td class="domain">
102-
<b><?php echo $key ?></b>
101+
<td class="domain" style="font-weight:normal"">
102+
<?php echo $key ?>
103103
</td>
104104
</tr>
105105
</table>
@@ -132,11 +132,11 @@
132132
</a>
133133
<table class="data-col2">
134134
<tr>
135-
<td class="cron" width="239px">
135+
<td class="cron" style="font-size:12pt" width="239px">
136136
<?php echo 'mail ' . __('domain') ?>
137137
</td>
138-
<td class="domain">
139-
<b><?php echo $key ?></b>
138+
<td class="domain" style="font-weight:normal">
139+
<?php echo $key ?>
140140
</td>
141141
</tr>
142142
</table>
@@ -169,11 +169,11 @@
169169
</a>
170170
<table class="data-col2">
171171
<tr>
172-
<td class="cron" width="239px">
172+
<td class="cron" style="font-size:12pt" width="239px">
173173
<?php echo __('database') ?>
174174
</td>
175-
<td class="domain">
176-
<b><?php echo $key ?></b>
175+
<td class="domain" style="font-weight:normal">
176+
<?php echo $key ?>
177177
</td>
178178
</tr>
179179
</table>
@@ -206,11 +206,11 @@
206206
</a>
207207
<table class="data-col2">
208208
<tr>
209-
<td class="cron" width="239px">
209+
<td class="cron" style="font-size:12pt" width="239px">
210210
<?php echo __('cron') ?>
211211
</td>
212-
<td class="domain">
213-
<b><?php echo 'cron ' . __('records') ?></b>
212+
<td class="domain" style="font-weight:normal">
213+
<?php echo 'cron ' . __('records') ?>
214214
</td>
215215
</tr>
216216
</table>
@@ -243,11 +243,11 @@
243243
</a>
244244
<table class="data-col2">
245245
<tr>
246-
<td class="cron" width="239px">
246+
<td class="cron" style="font-size:12pt" width="239px">
247247
<?php echo __('user dir') ?>
248248
</td>
249-
<td class="domain">
250-
<b><?php echo $key ?></b>
249+
<td class="domain" style="font-weight:normal">
250+
<?php echo $key ?>
251251
</td>
252252
</tr>
253253
</table>

‎web/templates/admin/list_db.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,24 @@
9494
<table class="data-col2">
9595
<tr>
9696
<td colspan=3 class="domain">
97-
<b><?php echo $key ?></b>
97+
<?php echo $key ?>
9898
</td>
9999
</tr>
100100
<tr>
101101
<td style="vertical-align:top;" width="239px">
102102
<table>
103+
<tr><td colspan=2><div style="height:10px;"></div></td></tr>
103104
<tr>
104-
<td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
105-
<div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
106-
<div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
105+
<td class="chart">
106+
<?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
107+
<div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%">
108+
<div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%;"></div>
107109
</div>
108110
</td>
109111
</tr>
110112
</table>
111113
</td>
112-
<td style="vertical-align:top;" width="297px">
114+
<td style="vertical-align:top;" width="238px">
113115
<table>
114116
<tr>
115117
<td class="counter-name">

‎web/templates/admin/list_dns.html‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@
9292
<table class="data-col2">
9393
<tr>
9494
<td colspan=3 class="domain">
95-
<b><?php echo $key ?></b>
95+
<?php echo $key ?>
96+
<a class="aliases"> <?php if(!empty($data[$key]['SRC'])) echo "⇢ ".$data[$key]['SRC'] ?></a>
9697
</td>
9798
</tr>
9899
<tr>
@@ -104,33 +105,28 @@
104105
</td>
105106
</tr>
106107
<tr>
107-
<td class="counter-name">
108-
<?php print $data[$key]['SRC'] ?>
109-
</td>
108+
<td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
110109
</tr>
110+
111111
</table>
112112
</td>
113-
<td style="vertical-align:top;" width="297px">
113+
<td style="vertical-align:top;" width="238px">
114114
<table>
115115
<tr>
116-
<td class="counter-name"><?php print __('Template') ?>:</td>
117-
<td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
116+
<td class="counter-name"><?php print __('TTL') ?>:</td>
117+
<td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
118118
</tr>
119119
<tr>
120-
<td class="counter-name"><?php print __('SOA') ?>:</td>
121-
<td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
120+
<td class="counter-name"><?php print __('Expire');?>:</td>
121+
<td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
122122
</tr>
123123
</table>
124124
</td>
125125
<td style="vertical-align:top;">
126126
<table>
127127
<tr>
128-
<td class="counter-name"><?php print __('TTL') ?>:</td>
129-
<td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
130-
</tr>
131-
<tr>
132-
<td class="counter-name"><?php print __('Expire');?>:</td>
133-
<td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
128+
<td class="counter-name"><?php print __('Template') ?>:</td>
129+
<td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
134130
</tr>
135131
</table>
136132
</td>

‎web/templates/admin/list_ip.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</tr>
8484
</table>
8585
</td>
86-
<td style="vertical-align:top;" width="297px">
86+
<td style="vertical-align:top;" width="238px">
8787
<table>
8888
<tr>
8989
<td class="counter-name">

‎web/templates/admin/list_log.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div style="height:20px; width:20px;"></div>
3333
<table class="data-col5">
3434
<tr>
35-
<td class="username">
35+
<td class="domain" style="font-size: 14pt; font-weight:normal">
3636
<?php echo $data[$key]['CMD'] ?>
3737
</td>
3838
</tr>

‎web/templates/admin/list_mail.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,24 @@
105105
<table class="data-col2">
106106
<tr>
107107
<td colspan=3 class="domain">
108-
<b><?php echo $key ?></b>
108+
<?php echo $key ?>
109109
</td>
110110
</tr>
111111
<tr>
112112
<td style="vertical-align:top;" width="239px">
113113
<table>
114+
<tr><td colspan=2><div style="height:10px;"></div></td></tr>
114115
<tr>
115-
<td class="chart1" style="padding: 4px 0 0 0">
116+
<td class="chart">
116117
<?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
117-
<div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
118-
<div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
118+
<div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%">
119+
<div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%;"></div>
119120
</div>
120121
</td>
121122
</tr>
122123
</table>
123124
</td>
124-
<td style="vertical-align:top;" width="297px">
125+
<td style="vertical-align:top;" width="238px">
125126
<table>
126127
<tr>
127128
<td class="counter-name">

‎web/templates/admin/list_mail_acc.html‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,27 @@
8686
</span>
8787
</a>
8888
<table class="data-col2">
89-
<tr><td colspan=3 class="domain"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
89+
<tr>
90+
<td colspan=3 class="domain">
91+
<?php echo $key."@".$_GET['domain'] ?>
92+
<a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
93+
</td>
94+
</tr>
9095
<tr>
9196
<td style="vertical-align:top;" width="239px">
9297
<table>
98+
<tr><td colspan=2><div style="height:10px;"></div></td></tr>
9399
<tr>
94-
<td class="chart1" style="padding: 4px 0 0 0">
100+
<td class="chart">
95101
<?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
96-
<div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
97-
<div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
102+
<div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%">
103+
<div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%"></div>
98104
</div>
99105
</td>
100106
</tr>
101107
</table>
102108
</td>
103-
<td style="vertical-align:top;" width="297px">
109+
<td style="vertical-align:top;" width="238px">
104110
<table>
105111
<tr>
106112
<td class="counter-name">

0 commit comments

Comments
 (0)