UI improvements

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

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'>
<tr class="data-add">

View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" method="post" name="v_edit_user" 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() {

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() {
@ -323,7 +323,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 +405,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>

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">

View file

@ -115,7 +115,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">
@ -132,7 +132,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">

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">

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">

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">

View file

@ -111,7 +111,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">
@ -128,7 +128,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">

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">

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>

View file

@ -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>

View file

@ -161,7 +161,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">
@ -182,7 +182,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">
@ -239,7 +239,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">

View file

@ -29,8 +29,8 @@
<a href="/list/user/">
<div class="l-stat__col-title"><?=__('USER')?></div>
<ul>
<li><?=__('Disk')?>: <span><?=humanize_usage($panel[$user]['U_DISK'])?></span></li>
<li><?=__('Bandwidth');?>: <span><?=humanize_usage($panel[$user]['U_BANDWIDTH'])?></span></li>
<li><?=__('Disk')?>: <span><?=humanize_usage_size($panel[$user]['U_DISK'])?> <?=humanize_usage_measure($panel[$user]['U_DISK'])?></span></li>
<li><?=__('Bandwidth');?>: <span> <?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?></span></li>
</ul>
</a>
</div>