github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-14 10:37:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI improvements

Browse source
This commit is contained in:
Serghey Rodin 2015-05-29 19:51:24 +03:00
commit 60f9f276b8
49 changed files with 256 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

33
web/templates/admin/add_package.html
View file

@ -52,7 +52,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('Web Template');?>
<?php print __('Web Template') . "<span class='optional'>" . strtoupper($_SESSION['WEB_SYSTEM']) . "</span>" ;?>
</td>
</tr>
<tr>
@ -73,10 +73,37 @@
</select>
</td>
</tr>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Backend Template') . "<span class='optional'>" . strtoupper($_SESSION['WEB_BACKEND']). "</span>" ;?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_backend_template">
<?php
foreach ($backend_templates as $key => $value) {
echo "\t\t\t\t<option value=\"".$value."\"";
if ((!empty($v_backend_template)) && ( $value == $v_backend_template)){
echo 'selected' ;
}
if ((!empty($v_backend_template)) && ( $value == $_POST['v_backend_template'])){
echo 'selected' ;
}
echo ">".$value."</option>\n";
}
?>
</select>
</td>
</tr>
<?php echo ""; }?>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Proxy Template');?>
<?php print __('Proxy Template') . "<span class='optional'>" .strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>" ;?>
</td>
</tr>
<tr>
@ -100,7 +127,7 @@
<?php echo ""; }?>
<tr>
<td class="vst-text input-label">
<?php print __('DNS Template');?>
<?php print __('DNS Template') . "<span class='optional'>" .strtoupper($_SESSION['DNS_SYSTEM']) . "</span>" ;?>
</td>
</tr>
<tr>

2
web/templates/admin/add_web.html
View file

@ -373,7 +373,7 @@
<table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
<tr>
<td class="vst-text input-label">
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('delete') ?>)</a>
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1" />
</td>

4
web/templates/admin/edit_cron.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_cron" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_cron" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">
@ -41,7 +41,7 @@
<a class="data-date"><?php echo $v_time?></a>
</td>
</tr>
<tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
<tr><td class="data-<?php echo $v_status ?>"><b><?=__($v_status)?></b></td></tr>
</table>
</td>
<td class="data-dotted">

2
web/templates/admin/edit_db.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_db" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_db" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function elementHideShow(elementToHideOrShow) {

4
web/templates/admin/edit_dns.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_dns" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_dns" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
@ -69,7 +69,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('Template');?>
<?php print __('Template') . "<span class='optional'>" . strtoupper($_SESSION['DNS_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>

2
web/templates/admin/edit_dns_rec.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_dns_rec" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_dns_rec" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">

2
web/templates/admin/edit_firewall.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_firewall" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_firewall" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function elementHideShow(elementToHideOrShow) {

2
web/templates/admin/edit_ip.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_ip" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_ip" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function elementHideShow(elementToHideOrShow) {

2
web/templates/admin/edit_mail.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_mail" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_mail" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">

2
web/templates/admin/edit_mail_acc.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_mail_acc" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_mail_acc" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function elementHideShow(elementToHideOrShow) {

33
web/templates/admin/edit_package.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_package" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_package" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">
@ -59,7 +59,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('Web Template');?>
<?php print __('Web Template') . " <span class='optional'> " .strtoupper($_SESSION['WEB_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>
@ -80,10 +80,35 @@
</select>
</td>
</tr>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Backend Template') . "<span class='optional'>" .strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_backend_template">
<?php
foreach ($backend_templates as $key => $value) {
echo "\t\t\t\t<option value=\"".$value."\"";
if ((!empty($v_backend_template)) && ( $value == $v_backend_template)){
echo ' selected' ;
}
if ((!empty($v_backend_template)) && ( $value == $_POST['v_backend_template'])){
echo ' selected' ;
}
echo ">".$value."</option>\n";
}
?>
</select>
</td>
</tr>
<?php echo ""; }?>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Proxy Template');?>
<?php print __('Proxy Template') . "<span class='optional'>" .strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>
@ -107,7 +132,7 @@
<?php echo ""; }?>
<tr>
<td class="vst-text input-label">
<?php print __('DNS Template');?>
<?php print __('DNS Template') . "<span class='optional'>" .strtoupper($_SESSION['DNS_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>

2
web/templates/admin/edit_user.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" method="post" name="v_edit_user" class="<?=__($v_status)?>" class="<?=__($v_status)?>">
<form id="vstobjects" method="post" name="v_edit_user" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function randomString() {

36
web/templates/admin/edit_web.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_web" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_web" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script language="javascript">
function WEBrandom() {
@ -125,7 +125,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('Web Template');?>
<?php print __('Web Template') . "<span class='optional'>" .strtoupper($_SESSION['WEB_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>
@ -144,10 +144,36 @@
</select>
</td>
</tr>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Backend Template') . " <span class='optional''> / " . strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_backend_template">
<?php
foreach ($backend_templates as $key => $value) {
echo "\t\t\t\t<option value=\"".$value."\"";
$svalue = "'".$value."'";
if ((!empty($v_backend_template)) && ( $value == $v_backend_template ) || ($svalue == $v_backend_template)){
echo ' selected' ;
}
if ((empty($v_backend_template)) && ($value == 'default')){
echo ' selected' ;
}
echo ">".$value."</option>\n";
}
?>
</select>
</td>
</tr>
<?php echo ""; }?>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="vst-text step-top">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support');?></label>
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support') . "<span class='optional'>" . strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?></label>
</td>
</tr>
<tr>
@ -323,7 +349,7 @@
<table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" class="ftptable ftptable-nrm" name="v_add_domain_ftp">
<tr>
<td class="vst-text input-label">
<?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
<?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?php print $i ?>][delete]" value="0" />
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?php print $i ?>][is_new]" value="<?php print htmlentities($ftp_user['is_new']) ?>" />
</td>
@ -405,7 +431,7 @@
<table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
<tr>
<td class="vst-text input-label">
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1" />
</td>

2
web/templates/admin/list_backup.html
View file

@ -114,7 +114,7 @@
<div class="l-unit__stat-cols clearfix">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backup Size')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=humanize_usage($data[$key]['SIZE'])?></b> <?=humanize_usage($data[$key]['SIZE'])?>
<b><?=humanize_usage_size($data[$key]['SIZE'])?></b> <?=humanize_usage_measure($data[$key]['SIZE'])?>
</div>
</div>
</td>

2
web/templates/admin/list_cron.html
View file

@ -116,7 +116,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

4
web/templates/admin/list_db.html
View file

@ -113,7 +113,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -130,7 +130,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

2
web/templates/admin/list_dns.html
View file

@ -102,7 +102,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/admin/list_dns_rec.html
View file

@ -98,7 +98,7 @@
<!-- /.l-unit-toolbar -->
<div class="l-unit__col l-unit__col--left clearfix">
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/admin/list_firewall.html
View file

@ -100,7 +100,7 @@
<!-- /.l-unit-toolbar -->
<div class="l-unit__col l-unit__col--left clearfix">
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/admin/list_ip.html
View file

@ -85,7 +85,7 @@
<div class="l-unit__date">
<?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

4
web/templates/admin/list_mail.html
View file

@ -116,7 +116,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -133,7 +133,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

4
web/templates/admin/list_mail_acc.html
View file

@ -112,7 +112,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -129,7 +129,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

6
web/templates/admin/list_packages.html
View file

@ -83,7 +83,7 @@
<div class="l-unit__date">
<?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -145,7 +145,7 @@
<div class="l-unit__stat-cols clearfix last">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Bandwidth')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=humanize_usage($data[$key]['BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['BANDWIDTH'])?>
</div>
</div>
</td>
@ -172,7 +172,7 @@
<div class="l-unit__stat-cols clearfix last">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=humanize_usage($data[$key]['DISK_QUOTA'])?></b> <?=humanize_usage($data[$key]['DISK_QUOTA'])?>
<b><?=humanize_usage_size($data[$key]['DISK_QUOTA'])?></b> <?=humanize_usage_measure($data[$key]['DISK_QUOTA'])?>
</div>
</div>
</td>

2
web/templates/admin/list_search.html
View file

@ -195,7 +195,7 @@
<div class="l-unit__date" u_date="<?=strtotime($data[$key]['DATE'])?>">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/admin/list_services.html
View file

@ -64,7 +64,7 @@
<!-- /.l-unit-toolbar -->
<div class="l-unit__col l-unit__col--left clearfix">
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
<!-- div class="l-unit__date">
</div-->
</div>

12
web/templates/admin/list_stats.html
View file

@ -94,7 +94,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -151,7 +151,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">
@ -181,10 +181,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Web')?>: <b><?=humanize_usage($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage($data[$key]['U_DISK_WEB'])?>
<?=__('Web')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_WEB'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('Databases')?>: <b><?=humanize_usage($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage($data[$key]['U_DISK_DB'])?>
<?=__('Databases')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DB'])?>
</div>
</div>
</td>
@ -210,10 +210,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Mail')?>: <b><?=humanize_usage($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage($data[$key]['U_DISK_MAIL'])?>
<?=__('Mail')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_MAIL'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('User Directories')?>: <b><?=humanize_usage($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage($data[$key]['U_DISK_DIRS'])?>
<?=__('User Directories')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DIRS'])?>
</div>
</div>
</td>

16
web/templates/admin/list_user.html
View file

@ -110,7 +110,7 @@
unset($_SESSION['look_alert']);
}
} else { ?>
<div class="actions-panel__col actions-panel__loginas"><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a></div>
<div class="actions-panel__col actions-panel__loginas"><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>""><?=__('login as').' '.$key?> <i></i></a></div>
<?}?>
<div class="actions-panel__col actions-panel__edit"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('edit')?> <i></i></a></div>
<div class="actions-panel__col actions-panel__suspend">
@ -142,7 +142,7 @@
<div class="l-unit__date">
<?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -165,7 +165,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -222,7 +222,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">
@ -252,10 +252,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Web')?>: <b><?=humanize_usage($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage($data[$key]['U_DISK_WEB'])?>
<?=__('Web')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_WEB'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('Databases')?>: <b><?=humanize_usage($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage($data[$key]['U_DISK_DB'])?>
<?=__('Databases')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DB'])?>
</div>
</div>
</td>
@ -281,10 +281,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Mail')?>: <b><?=humanize_usage($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage($data[$key]['U_DISK_MAIL'])?>
<?=__('Mail')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_MAIL'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('User Directories')?>: <b><?=humanize_usage($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage($data[$key]['U_DISK_DIRS'])?>
<?=__('User Directories')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DIRS'])?>
</div>
</div>
</td>

6
web/templates/admin/list_web.html
View file

@ -160,7 +160,7 @@
<div class="l-unit__date" u_date="<?=strtotime('1/1/2011')?>">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -181,7 +181,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -238,7 +238,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">