Merge branch 'ja2015' of https://github.com/ja2015/vesta into ja2015-ja2015

This commit is contained in:
Dmitry Naumov-Socolov 2016-11-28 16:12:48 -05:00
commit 6817a96953
4 changed files with 148 additions and 122 deletions

View file

@ -916,16 +916,18 @@ input[type="checkbox"] {
.l-stat {
margin: 0 auto;
display: table;
margin: 34px auto;
position: fixed;
background-color: #fff;
z-index: 100;
padding-top: 30px;
width: 100%;
overflow: hidden;
}
.l-stat__col {
display: table-cell;
display: block;
vertical-align: top;
float: left;
}
.l-stat__col a {
display: inline-block;

View file

@ -71,16 +71,16 @@
</select>
</td>
</tr>
<tr>
<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?><tr>
<td class="vst-text input-label">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>> <?php print __('DNS Support');?></label>
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)&&$panel[$user]['DNS_DOMAINS'] != "0") echo "checked=yes"; ?>> <?php print __('DNS Support');?></label>
</td>
</tr>
<tr>
</tr><?php } ?>
<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?><tr>
<td class="vst-text input-label">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>> <?php print __('Mail Support');?></label>
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)&&$panel[$user]['MAIL_DOMAINS'] != "0") echo "checked=yes"; ?>> <?php print __('Mail Support');?></label>
</td>
</tr>
</tr><?php } ?>
<tr>
<td class="step-top vst-text" style="/*padding: 32px 0 20px 0;*/">
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>

View file

@ -48,6 +48,7 @@
</ul>
</a>
</div>
<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
<a href="/list/web/">
<div class="l-stat__col-title"><?=__('WEB')?></div>
@ -58,6 +59,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
<a href="/list/dns/">
<div class="l-stat__col-title"><?=__('DNS')?></div>
@ -68,6 +71,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
<a href="/list/mail/">
<div class="l-stat__col-title"><?=__('MAIL')?></div>
@ -78,6 +83,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['DATABASES'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
<a href="/list/db/">
<div class="l-stat__col-title"><?=__('DB')?></div>
@ -87,6 +94,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
<a href="/list/cron/">
<div class="l-stat__col-title"><?=__('CRON')?></div>
@ -96,6 +105,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['BACKUPS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
<a href="/list/backup/">
<div class="l-stat__col-title"><?=__('BACKUP')?></div>
@ -104,6 +115,7 @@
</ul>
</a>
</div>
<?php } ?>
</div>
<!-- /.l-stats -->
</div>

View file

@ -41,6 +41,7 @@
</ul>
</a>
</div>
<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
<a href="/list/web/">
<div class="l-stat__col-title"><?=__('WEB')?></div>
@ -51,6 +52,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
<a href="/list/dns/">
<div class="l-stat__col-title"><?=__('DNS')?></div>
@ -61,6 +64,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
<a href="/list/mail/">
<div class="l-stat__col-title"><?=__('MAIL')?></div>
@ -71,6 +76,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['DATABASES'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
<a href="/list/db/">
<div class="l-stat__col-title"><?=__('DB')?></div>
@ -80,6 +87,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
<a href="/list/cron/">
<div class="l-stat__col-title"><?=__('CRON')?></div>
@ -89,6 +98,8 @@
</ul>
</a>
</div>
<?php } ?>
<?php if($panel[$user]['BACKUPS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
<a href="/list/backup/">
<div class="l-stat__col-title"><?=__('BACKUP')?></div>
@ -97,6 +108,7 @@
</ul>
</a>
</div>
<?php } ?>
</div>
<!-- /.l-stats -->
</div>