github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 13:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dmitry Naumov-Socolov 2016-11-29 05:12:28 -05:00
commit 9550550555
4 changed files with 148 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/css/styles.min.css vendored
View file

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

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

@ -71,16 +71,16 @@
</select> </select>
</td> </td>
</tr> </tr>
<tr> <?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?><tr>
<td class="vst-text input-label"> <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> </td>
</tr> </tr><?php } ?>
<tr> <?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?><tr>
<td class="vst-text input-label"> <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> </td>
</tr> </tr><?php } ?>
<tr> <tr>
<td class="step-top vst-text" style="/*padding: 32px 0 20px 0;*/"> <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> <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>

124
web/templates/admin/panel.html
View file

@ -48,62 +48,74 @@
</ul> </ul>
</a> </a>
</div> </div>
<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>"> <?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
<a href="/list/web/"> <div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
<div class="l-stat__col-title"><?=__('WEB')?></div> <a href="/list/web/">
<ul> <div class="l-stat__col-title"><?=__('WEB')?></div>
<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li> <ul>
<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li> <li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li> <li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
</ul> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
</a> </ul>
</div> </a>
<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>"> </div>
<a href="/list/dns/"> <?php } ?>
<div class="l-stat__col-title"><?=__('DNS')?></div> <?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
<ul> <div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
<li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li> <a href="/list/dns/">
<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li> <div class="l-stat__col-title"><?=__('DNS')?></div>
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li> <ul>
</ul> <li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
</a> <li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
</div> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>"> </ul>
<a href="/list/mail/"> </a>
<div class="l-stat__col-title"><?=__('MAIL')?></div> </div>
<ul> <?php } ?>
<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li> <?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li> <div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li> <a href="/list/mail/">
</ul> <div class="l-stat__col-title"><?=__('MAIL')?></div>
</a> <ul>
</div> <li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>"> <li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
<a href="/list/db/"> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
<div class="l-stat__col-title"><?=__('DB')?></div> </ul>
<ul> </a>
<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li> </div>
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li> <?php } ?>
</ul> <?php if($panel[$user]['DATABASES'] != "0") { ?>
</a> <div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
</div> <a href="/list/db/">
<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>"> <div class="l-stat__col-title"><?=__('DB')?></div>
<a href="/list/cron/"> <ul>
<div class="l-stat__col-title"><?=__('CRON')?></div> <li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
<ul> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li> </ul>
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li> </a>
</ul> </div>
</a> <?php } ?>
</div> <?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>"> <div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
<a href="/list/backup/"> <a href="/list/cron/">
<div class="l-stat__col-title"><?=__('BACKUP')?></div> <div class="l-stat__col-title"><?=__('CRON')?></div>
<ul> <ul>
<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li> <li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
</ul> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
</a> </ul>
</div> </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>
<ul>
<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
</ul>
</a>
</div>
<?php } ?>
</div> </div>
<!-- /.l-stats --> <!-- /.l-stats -->
</div> </div>

124
web/templates/user/panel.html
View file

@ -41,62 +41,74 @@
</ul> </ul>
</a> </a>
</div> </div>
<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>"> <?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
<a href="/list/web/"> <div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
<div class="l-stat__col-title"><?=__('WEB')?></div> <a href="/list/web/">
<ul> <div class="l-stat__col-title"><?=__('WEB')?></div>
<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li> <ul>
<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li> <li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li> <li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
</ul> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
</a> </ul>
</div> </a>
<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>"> </div>
<a href="/list/dns/"> <?php } ?>
<div class="l-stat__col-title"><?=__('DNS')?></div> <?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
<ul> <div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
<li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li> <a href="/list/dns/">
<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li> <div class="l-stat__col-title"><?=__('DNS')?></div>
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li> <ul>
</ul> <li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
</a> <li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
</div> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>"> </ul>
<a href="/list/mail/"> </a>
<div class="l-stat__col-title"><?=__('MAIL')?></div> </div>
<ul> <?php } ?>
<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li> <?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li> <div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li> <a href="/list/mail/">
</ul> <div class="l-stat__col-title"><?=__('MAIL')?></div>
</a> <ul>
</div> <li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>"> <li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
<a href="/list/db/"> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
<div class="l-stat__col-title"><?=__('DB')?></div> </ul>
<ul> </a>
<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li> </div>
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li> <?php } ?>
</ul> <?php if($panel[$user]['DATABASES'] != "0") { ?>
</a> <div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
</div> <a href="/list/db/">
<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>"> <div class="l-stat__col-title"><?=__('DB')?></div>
<a href="/list/cron/"> <ul>
<div class="l-stat__col-title"><?=__('CRON')?></div> <li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
<ul> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li> </ul>
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li> </a>
</ul> </div>
</a> <?php } ?>
</div> <?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>"> <div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
<a href="/list/backup/"> <a href="/list/cron/">
<div class="l-stat__col-title"><?=__('BACKUP')?></div> <div class="l-stat__col-title"><?=__('CRON')?></div>
<ul> <ul>
<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li> <li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
</ul> <li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
</a> </ul>
</div> </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>
<ul>
<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
</ul>
</a>
</div>
<?php } ?>
</div> </div>
<!-- /.l-stats --> <!-- /.l-stats -->
</div> </div>