new grid

web/templates/admin/list_backup.html

@@ -91,15 +91,13 @@
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:100%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                </div>
+                                            <td class="counter-name">
+                                                <?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_backup_detail.html

@@ -58,11 +58,11 @@
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td class="cron" width="239px">
+                                <td class="cron" style="font-size:12pt" width="239px">
                                     <?php echo 'web ' . __('domain') ?> 
                                 </td>
-                                <td class="domain">
-                                    <b><?php echo $key ?></b>
+                                <td class="domain" style="font-weight:normal">
+                                    <?php echo $key ?>
                                 </td>
                             </tr>
                         </table>
@@ -95,11 +95,11 @@
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td class="cron" width="239px">
+                                <td class="cron" style="font-size:12pt" width="239px">
                                     <?php echo 'dns ' . __('domain') ?>
                                 </td>
-                                <td class="domain">
-                                    <b><?php echo $key ?></b>
+                                <td class="domain" style="font-weight:normal"">
+                                    <?php echo $key ?>
                                 </td>
                             </tr>
                         </table>
@@ -132,11 +132,11 @@
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td class="cron" width="239px">
+                                <td class="cron" style="font-size:12pt" width="239px">
                                     <?php echo 'mail ' . __('domain') ?>
                                 </td>
-                                <td class="domain">
-                                    <b><?php echo $key ?></b>
+                                <td class="domain" style="font-weight:normal">
+                                    <?php echo $key ?>
                                 </td>
                             </tr>
                         </table>
@@ -169,11 +169,11 @@
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td class="cron" width="239px">
+                                <td class="cron" style="font-size:12pt" width="239px">
                                     <?php echo __('database') ?>
                                 </td>
-                                <td class="domain">
-                                    <b><?php echo $key ?></b>
+                                <td class="domain" style="font-weight:normal">
+                                    <?php echo $key ?>
                                 </td>
                             </tr>
                         </table>
@@ -206,11 +206,11 @@
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td class="cron" width="239px">
+                                <td class="cron" style="font-size:12pt" width="239px">
                                     <?php echo __('cron') ?>
                                 </td>
-                                <td class="domain">
-                                    <b><?php echo 'cron ' . __('records') ?></b>
+                                <td class="domain" style="font-weight:normal">
+                                    <?php echo 'cron ' . __('records') ?>
                                 </td>
                             </tr>
                         </table>
@@ -243,11 +243,11 @@
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td class="cron" width="239px">
+                                <td class="cron" style="font-size:12pt" width="239px">
                                     <?php echo __('user dir') ?>
                                 </td>
-                                <td class="domain">
-                                    <b><?php echo $key ?></b>
+                                <td class="domain" style="font-weight:normal">
+                                    <?php echo $key ?>
                                 </td>
                             </tr>
                         </table>

web/templates/admin/list_db.html

@@ -94,22 +94,24 @@
                         <table class="data-col2">
                             <tr>
                                 <td colspan=3 class="domain">
-                                    <b><?php echo $key ?></b>
+                                    <?php echo $key ?> 
                                 </td>
                             </tr>
                             <tr>
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
+                                        <tr><td colspan=2><div style="height:10px;"></div></td></tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <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>
+                                            <td class="chart">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_dns.html

@@ -92,7 +92,8 @@
                         <table class="data-col2">
                             <tr>
                                 <td colspan=3 class="domain">
-                                    <b><?php echo $key ?></b>
+                                    <?php echo $key ?>
+                                    <a class="aliases"> <?php if(!empty($data[$key]['SRC'])) echo "⇢ ".$data[$key]['SRC'] ?></a>
                                 </td>
                             </tr>
                             <tr>
@@ -104,33 +105,28 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name">
-                                                <?php print $data[$key]['SRC'] ?> 
-                                            </td>
+                                            <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
                                         </tr>
+
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Template') ?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
+                                            <td class="counter-name"><?php print __('TTL') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('SOA') ?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
+                                            <td class="counter-name"><?php print __('Expire');?>:</td>
+                                            <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
                                         </tr>
                                     </table>
                                 </td>
                                 <td style="vertical-align:top;">
                                     <table>
                                         <tr>
-                                            <td class="counter-name"><?php print __('TTL') ?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('Expire');?>:</td>
-                                            <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
+                                            <td class="counter-name"><?php print __('Template') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
                                         </tr>
                                     </table>
                                 </td>

web/templates/admin/list_ip.html

@@ -83,7 +83,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_log.html

@@ -32,7 +32,7 @@
                         <div style="height:20px; width:20px;"></div>
                     <table class="data-col5">
                         <tr>
-                            <td class="username">
+                            <td class="domain" style="font-size: 14pt; font-weight:normal">
                                 <?php echo $data[$key]['CMD'] ?>
                             </td>
                         </tr>

web/templates/admin/list_mail.html

@@ -105,23 +105,24 @@
                         <table class="data-col2">
                             <tr>
                                 <td colspan=3 class="domain">
-                                    <b><?php echo $key ?></b>
+                                    <?php echo $key ?>
                                 </td>
                             </tr>
                             <tr>
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
+                                        <tr><td colspan=2><div style="height:10px;"></div></td></tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0">
+                                            <td class="chart">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <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>
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_mail_acc.html

@@ -86,21 +86,27 @@
                             </span>
                         </a>
                         <table class="data-col2">
-                            <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>
+                            <tr>
+                                <td colspan=3 class="domain">
+                                    <?php echo $key."@".$_GET['domain'] ?> 
+                                    <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                </td>
+                            </tr>
                             <tr>
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
+                                        <tr><td colspan=2><div style="height:10px;"></div></td></tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0">
+                                            <td class="chart">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <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>
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_packages.html

@@ -60,8 +60,8 @@
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="username">
-                                    <b><?php echo $key?></b>
+                                <td colspan=3 class="domain">
+                                    <?php echo $key?>
                                 </td>
                             </tr>
                             <tr>
@@ -79,26 +79,10 @@
                                             <td class="counter-name"><?php print __('DNS Template');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['DNS_TEMPLATE'] ?> </td>
                                         </tr>
-                                        <tr>
-                                            <td class="chart1" colspan=2 style="padding: 8px 0 0 0">
-                                                <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                </div>
-                                            </td>
                                         </tr>
-                                        <tr>
-                                            <td class="chart1" colspan=2>
-                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
-                                                </div>
-                                            </td>
+                                            <td class="counter-name"><?php print __('SSH Access');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
                                         </tr>
-                                    </table>
-                                </td>
-                                <td style="vertical-align:top;" width="297px">
-                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['WEB_DOMAINS'] ?> </td>
@@ -107,6 +91,10 @@
                                             <td class="counter-name"><?php print __('Web Aliases');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?> </td>
                                         </tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;" width="238px">
+                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('DNS domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['DNS_DOMAINS'] ?> </td>
@@ -115,14 +103,6 @@
                                             <td class="counter-name"><?php print __('DNS records');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?> </td>
                                         </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('Name Servers');?>:</td>
-                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?> </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                                <td style="vertical-align:top;">
-                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Mail Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['MAIL_DOMAINS'] ?> </td>
@@ -138,14 +118,26 @@
                                         <tr>
                                             <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['CRON_JOBS'] ?> </td>
-                                        </tr>
-                                            <td class="counter-name"><?php print __('SSH Access');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
-                                        </tr>
                                         <tr>
+                                    </table>
+                                </td>
+                                <td style="vertical-align:top;">
+                                    <table>
                                             <td class="counter-name"><?php print __('Backups');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['BACKUPS'] ?></td>
                                         </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Bandwidth');?>:</td>
+                                            <td class="counter-value"><?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Disk');?>:</td>
+                                            <td class="counter-value"><?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?> </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="counter-name"><?php print __('Name Servers');?>:</td>
+                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?> </td>
+                                        </tr>
                                     </table>
                                 </td>
                             </tr>

web/templates/admin/list_search.html

@@ -159,7 +159,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_services.html

@@ -46,12 +46,12 @@
                         </a>
                         <table class="data-col2">
                             <tr>
-                                <td colspan=4 class="domain hostname">
+                                <td colspan=4 class="domain hostname"">
                                     <b><?php echo $sys['sysinfo']['HOSTNAME'] ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" width="239px">
+                                <td style="vertical-align:top;" width="240px">
                                     <table>
                                         <tr>
                                             <td>
@@ -65,7 +65,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="358px">
+                                <td style="vertical-align:top;" width="290px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -140,7 +140,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="step-left" style="vertical-align:top;" width="239px">
+                                <td class="step-left" style="vertical-align:top;" width="189px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -149,7 +149,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="119px">
+                                <td style="vertical-align:top;" width="120px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -161,7 +161,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="239px">
+                                <td style="vertical-align:top;" width="170px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_stats.html

@@ -56,23 +56,23 @@
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 14px 0 0 0px;">
-                                                <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart" colspan=2" style="padding: 10px 0 0 0">
+                                                <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>
+                                                <div class="bar" title="<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%">
+                                                    <div class="fill" style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2>
-                                                <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                <div style="width:160px; height:8px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart" colspan=2>
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                                <div class="bar" title="<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 4px 0 0 0;">
+                                            <td class="mini-info" colspan=2>
                                                 <table class="chart2">
                                                     <tr>
                                                         <td>
@@ -95,7 +95,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_updates.html

@@ -89,7 +89,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/admin/list_user.html

@@ -133,30 +133,31 @@
 
                         <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="username"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>
+                                <td colspan=3 class="username"><b><?php echo $key ?></b>
                             </tr>
                             <tr>
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
-                                        <tr><td colspan=2 class="counter-name"><?php echo $data[$key]['CONTACT']?></td></tr>
-                                        <tr><td colspan=2 class="counter-name" style="padding: 2px 0 14px 0;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
+                                        <tr><td colspan=2 class="counter-name"><?php echo $data[$key]['FNAME'] ?> <?php echo $data[$key]['LNAME'] ?></td></tr>
+                                        <tr><td colspan=2><div style="height:10px;"></div></td></tr>
                                         <tr>
-                                            <td class="chart1" colspan=2><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart" colspan=2>
+                                                <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
+                                                <div class="bar" title="<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%">
+                                                    <div class="fill" style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 0px 0 0 0;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart" colspan=2 style="padding: 0px 0 0 0;"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div class="bar" title="<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan=2 style="padding: 4px 0 0 0;">
-                                                <table class="chart2">
+                                            <td class="mini-info" colspan=2>
+                                                <table>
                                                     <tr>
                                                         <td>
                                                             <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?> 
@@ -179,51 +180,43 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('SSL Domains');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
+                                            <td class="counter-name"><?php print __('DNS Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Web Aliases');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?></td>
+                                            <td class="counter-name"><?php print __('Mail Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('DNS domains');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
+                                            <td class="counter-name"><?php print __('Databases');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('DNS records');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?></td>
+                                            <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
-                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?></td>
+                                            <td class="counter-name"><?php print __('Backups');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
                                         </tr>
                                     </table>
                                 </td>
                                 <td style="vertical-align:top;">
                                     <table>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Mail Domains');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('Databases');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
+                                            <td class="counter-name"><?php print __('Email');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['CONTACT'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
+                                            <td class="counter-name"><?php print __('Package');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['PACKAGE'] ?></td>
                                         </tr>
                                         <tr>
                                             <td class="counter-name"><?php print __('SSH Access');?>:</td>
@@ -234,8 +227,8 @@
                                             <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Backups');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
+                                            <td class="counter-name"><?php print __('Name Servers');?>:</td>
+                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?></td>
                                         </tr>
                                     </table>
                                 </td>

web/templates/admin/list_web.html

@@ -59,9 +59,9 @@
                             $ftp_user=$data[$key]['FTP_USER'];
 
                         }
-                        if (strlen($ftp_user) > 16 ) {
+                        if (strlen($ftp_user) > 24 ) {
                             $ftp_user = str_replace(':', ', ', $ftp_user);
-                            $ftp_user = substr($ftp_user, 0, 16);
+                            $ftp_user = substr($ftp_user, 0, 24);
                             $ftp_user = trim($ftp_user, ":");
                             $ftp_user = str_replace(':', ', ', $ftp_user);
                             $ftp_user = $ftp_user.", ...";
@@ -73,9 +73,9 @@
                         if (!empty($data[$key]['PROXY'])) {
                             $proxy_support='yes';
                         }
-                        if (strlen($data[$key]['PROXY_EXT']) > 16 ) {
+                        if (strlen($data[$key]['PROXY_EXT']) > 24 ) {
                             $proxy_ext_title = str_replace(',', ', ', $data[$key]['PROXY_EXT']);
-                            $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 16);
+                            $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 24);
                             $proxy_ext = trim($proxy_ext, ",");
                             $proxy_ext = str_replace(',', ', ', $proxy_ext);
                             $proxy_ext = $proxy_ext.", ...";
@@ -141,7 +141,8 @@
                         <table class="data-col2">
                             <tr>
                                 <td colspan=3 class="domain">
-                                    <b><?php echo $key ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                    <?php echo $key ?>
+                                    <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
                                 </td>
                             </tr>
                             <tr>
@@ -151,25 +152,27 @@
                                             <td class="counter-name">
                                                 <?php echo $data[$key]['IP'] ?> 
                                             </td>
+                                        </tr>
+                                        <tr><td colspan=2><div style="height:5px;"></div></td></tr>
                                         <tr>
-                                        <tr>
-                                            <td class="chart1" style="padding: 8px 0 0 0">
+                                            <td class="chart" style="padding: 4px 0 0 0;">
                                                 <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <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>
-                                            </div>
+                                            <td class="chart">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%"></div>
+                                                </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Template');?>:</td>
@@ -179,30 +182,28 @@
                                             <td class="counter-name"><?php print __('SSL Support');?>:</td>
                                             <td class="counter-value"><?php print __($data[$key]['SSL']) ?></td>
                                         </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('SSL Home Directory');?>:</td>
-                                            <td class="counter-value"><?php print $ssl_home ?></td>
-                                        </tr>
+
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Statistics');?>: </td>
                                             <td class="counter-value"> <?php print __($web_stats) ?></td>
                                         </tr>
 
-                                    </table>
-                                </td>
-                                <td rowspan=4 style="vertical-align:top;">
-                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Proxy Support');?>:</td>
                                             <td class="counter-value"><?php print __($proxy_support);?></td>
                                         </tr>
+
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;">
+                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Proxy Template');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Proxy Extentions');?>:</td>
-                                            <td class="counter-value" <?php if (!empty($proxy_ext_title)) echo "title='".$proxy_ext_title."'" ?>><?php echo $proxy_ext ?></td>
+                                            <td class="counter-name"><?php print __('Proxy Extensions');?>:</td>
+                                            <td class="counter-value"><?php echo $proxy_ext;?></td>
                                         </tr>
                                         <tr>
                                             <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>

web/templates/user/list_db.html

@@ -82,22 +82,24 @@
                         <table class="data-col2">
                             <tr>
                                 <td colspan=3 class="domain">
-                                    <b><?php echo $key ?></b>
+                                    <?php echo $key ?> 
                                 </td>
                             </tr>
                             <tr>
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
+                                        <tr><td colspan=2><div style="height:10px;"></div></td></tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <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>
+                                            <td class="chart">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/user/list_dns.html

@@ -77,10 +77,12 @@
                                 <?php print __('list records',$data[$key]['RECORDS']); ?> 
                             </span>
                         </a>
+
                         <table class="data-col2">
                             <tr>
                                 <td colspan=3 class="domain">
-                                    <b><?php echo $key ?></b>
+                                    <?php echo $key ?>
+                                    <a class="aliases"> <?php if(!empty($data[$key]['SRC'])) echo "⇢ ".$data[$key]['SRC'] ?></a>
                                 </td>
                             </tr>
                             <tr>
@@ -92,33 +94,28 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name">
-                                                <?php print $data[$key]['SRC'] ?> 
-                                            </td>
+                                            <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
                                         </tr>
+
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Template') ?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
+                                            <td class="counter-name"><?php print __('TTL') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('SOA') ?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
+                                            <td class="counter-name"><?php print __('Expire');?>:</td>
+                                            <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
                                         </tr>
                                     </table>
                                 </td>
                                 <td style="vertical-align:top;">
                                     <table>
                                         <tr>
-                                            <td class="counter-name"><?php print __('TTL') ?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('Expire');?>:</td>
-                                            <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
+                                            <td class="counter-name"><?php print __('Template') ?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
                                         </tr>
                                     </table>
                                 </td>

web/templates/user/list_mail.html

@@ -93,23 +93,24 @@
                         <table class="data-col2">
                             <tr>
                                 <td colspan=3 class="domain">
-                                    <b><?php echo $key ?></b>
+                                    <?php echo $key ?>
                                 </td>
                             </tr>
                             <tr>
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
+                                        <tr><td colspan=2><div style="height:10px;"></div></td></tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0">
+                                            <td class="chart">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <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>
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/user/list_mail_acc.html

@@ -74,21 +74,27 @@
                             </span>
                         </a>
                         <table class="data-col2">
-                            <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>
+                            <tr>
+                                <td colspan=3 class="domain">
+                                    <?php echo $key."@".$_GET['domain'] ?> 
+                                    <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                </td>
+                            </tr>
                             <tr>
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
+                                        <tr><td colspan=2><div style="height:10px;"></div></td></tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0">
+                                            <td class="chart">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <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>
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/user/list_search.html

@@ -136,7 +136,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/user/list_stats.html

@@ -41,23 +41,23 @@
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 14px 0 0 0px;">
-                                                <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart" colspan=2" style="padding: 10px 0 0 0">
+                                                <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>
+                                                <div class="bar" title="<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%">
+                                                    <div class="fill" style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2>
-                                                <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                <div style="width:160px; height:8px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart" colspan=2>
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?>
+                                                <div class="bar" title="<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 4px 0 0 0;">
+                                            <td class="mini-info" colspan=2>
                                                 <table class="chart2">
                                                     <tr>
                                                         <td>
@@ -80,7 +80,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">

web/templates/user/list_user.html

@@ -58,30 +58,31 @@
 
                         <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="username"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>
+                                <td colspan=3 class="username"><b><?php echo $key ?></b>
                             </tr>
                             <tr>
                                 <td style="vertical-align:top;" width="239px">
                                     <table>
-                                        <tr><td colspan=2 class="counter-name"><?php echo $data[$key]['CONTACT']?></td></tr>
-                                        <tr><td colspan=2 class="counter-name" style="padding: 2px 0 14px 0;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
+                                        <tr><td colspan=2 class="counter-name"><?php echo $data[$key]['FNAME'] ?> <?php echo $data[$key]['LNAME'] ?></td></tr>
+                                        <tr><td colspan=2><div style="height:10px;"></div></td></tr>
                                         <tr>
-                                            <td class="chart1" colspan=2><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart" colspan=2>
+                                                <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
+                                                <div class="bar" title="<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%">
+                                                    <div class="fill" style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 0px 0 0 0;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                                                <div style="width:160px; height:7px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart" colspan=2 style="padding: 0px 0 0 0;"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div class="bar" title="<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan=2 style="padding: 4px 0 0 0;">
-                                                <table class="chart2">
+                                            <td class="mini-info" colspan=2>
+                                                <table>
                                                     <tr>
                                                         <td>
                                                             <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?> 
@@ -104,51 +105,43 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('SSL Domains');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
+                                            <td class="counter-name"><?php print __('DNS Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Web Aliases');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?></td>
+                                            <td class="counter-name"><?php print __('Mail Domains');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('DNS domains');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
+                                            <td class="counter-name"><?php print __('Databases');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('DNS records');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?></td>
+                                            <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
-                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?></td>
+                                            <td class="counter-name"><?php print __('Backups');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
                                         </tr>
                                     </table>
                                 </td>
                                 <td style="vertical-align:top;">
                                     <table>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Mail Domains');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('Databases');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
+                                            <td class="counter-name"><?php print __('Email');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['CONTACT'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
+                                            <td class="counter-name"><?php print __('Package');?>:</td>
+                                            <td class="counter-value"><?php echo $data[$key]['PACKAGE'] ?></td>
                                         </tr>
                                         <tr>
                                             <td class="counter-name"><?php print __('SSH Access');?>:</td>
@@ -159,8 +152,8 @@
                                             <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Backups');?>:</td>
-                                            <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
+                                            <td class="counter-name"><?php print __('Name Servers');?>:</td>
+                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?></td>
                                         </tr>
                                     </table>
                                 </td>

web/templates/user/list_web.html

@@ -115,10 +115,12 @@
                         <?php
                                 }
                          ?> 
+
                         <table class="data-col2">
                             <tr>
                                 <td colspan=3 class="domain">
-                                    <b><?php echo $key ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                    <?php echo $key ?>
+                                    <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
                                 </td>
                             </tr>
                             <tr>
@@ -128,25 +130,27 @@
                                             <td class="counter-name">
                                                 <?php echo $data[$key]['IP'] ?> 
                                             </td>
+                                        </tr>
+                                        <tr><td colspan=2><div style="height:5px;"></div></td></tr>
                                         <tr>
-                                        <tr>
-                                            <td class="chart1" style="padding: 8px 0 0 0">
+                                            <td class="chart" style="padding: 4px 0 0 0;">
                                                 <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:6px; font-size:0;background-color:#ddd;">
-                                                    <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>
-                                            </div>
+                                            <td class="chart">
+                                                <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                <div class="bar mini" title="<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%">
+                                                    <div class="fill mini" style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%"></div>
+                                                </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="297px">
+                                <td style="vertical-align:top;" width="238px">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Template');?>:</td>
@@ -156,30 +160,28 @@
                                             <td class="counter-name"><?php print __('SSL Support');?>:</td>
                                             <td class="counter-value"><?php print __($data[$key]['SSL']) ?></td>
                                         </tr>
-                                        <tr>
-                                            <td class="counter-name"><?php print __('SSL Home Directory');?>:</td>
-                                            <td class="counter-value"><?php print $ssl_home ?></td>
-                                        </tr>
+
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Statistics');?>: </td>
                                             <td class="counter-value"> <?php print __($web_stats) ?></td>
                                         </tr>
 
-                                    </table>
-                                </td>
-                                <td rowspan=4 style="vertical-align:top;">
-                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Proxy Support');?>:</td>
                                             <td class="counter-value"><?php print __($proxy_support);?></td>
                                         </tr>
+
+                                    </table>
+                                </td>
+                                <td rowspan=4 style="vertical-align:top;">
+                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Proxy Template');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Proxy Extentions');?>:</td>
-                                            <td class="counter-value" <?php if (!empty($proxy_ext_title)) echo "title='".$proxy_ext_title."'" ?>><?php echo $proxy_ext ?></td>
+                                            <td class="counter-name"><?php print __('Proxy Extensions');?>:</td>
+                                            <td class="counter-value"><?php echo $proxy_ext;?></td>
                                         </tr>
                                         <tr>
                                             <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>