Skip to content

Commit 6817a96

Browse files
naumov-socolovnaumov-socolov
committed
Merge branch 'ja2015' of https://github.com/ja2015/vesta into ja2015-ja2015
2 parents 741d447 + 5939012 commit 6817a96

File tree

4 files changed

+148
-122
lines changed

4 files changed

+148
-122
lines changed

‎web/css/styles.min.css‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -916,16 +916,18 @@ input[type="checkbox"] {
916916

917917
.l-stat {
918918
margin: 0 auto;
919-
display: table;
920919
margin: 34px auto;
921920
position: fixed;
922921
background-color: #fff;
923922
z-index: 100;
924923
padding-top: 30px;
924+
width: 100%;
925+
overflow: hidden;
925926
}
926927
.l-stat__col {
927-
display: table-cell;
928+
display: block;
928929
vertical-align: top;
930+
float: left;
929931
}
930932
.l-stat__col a {
931933
display: inline-block;
@@ -2512,7 +2514,7 @@ label:hover {
25122514
}
25132515

25142516
.vst-list.flat {
2515-
border: 1px solid #fff;
2517+
border: 1px solid #fff;
25162518
color: #2c9491;
25172519
text-transform: uppercase;
25182520
font-weight: bold;

‎web/templates/admin/add_web.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@
7171
</select>
7272
</td>
7373
</tr>
74-
<tr>
74+
<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?><tr>
7575
<td class="vst-text input-label">
76-
<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>
76+
<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>
7777
</td>
78-
</tr>
79-
<tr>
78+
</tr><?php } ?>
79+
<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?><tr>
8080
<td class="vst-text input-label">
81-
<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>
81+
<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>
8282
</td>
83-
</tr>
83+
</tr><?php } ?>
8484
<tr>
8585
<td class="step-top vst-text" style="/*padding: 32px 0 20px 0;*/">
8686
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
@@ -214,7 +214,7 @@
214214
</tr>
215215
<tr class="stats-auth" style="<? if (trim($v_stats, "'") == 'none') { ?>display:none<? } ?>">
216216
<td class="step-left vst-text input-label">
217-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?>
217+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?>
218218
onclick="javascript:elementHideShow('statstable');"> <?=__('Statistics Authorization')?></label>
219219
</td>
220220
</tr>

‎web/templates/admin/panel.html‎

Lines changed: 68 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -48,62 +48,74 @@
4848
</ul>
4949
</a>
5050
</div>
51-
<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
52-
<a href="/list/web/">
53-
<div class="l-stat__col-title"><?=__('WEB')?></div>
54-
<ul>
55-
<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
56-
<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
57-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
58-
</ul>
59-
</a>
60-
</div>
61-
<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
62-
<a href="/list/dns/">
63-
<div class="l-stat__col-title"><?=__('DNS')?></div>
64-
<ul>
65-
<li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
66-
<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
67-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
68-
</ul>
69-
</a>
70-
</div>
71-
<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
72-
<a href="/list/mail/">
73-
<div class="l-stat__col-title"><?=__('MAIL')?></div>
74-
<ul>
75-
<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
76-
<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
77-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
78-
</ul>
79-
</a>
80-
</div>
81-
<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
82-
<a href="/list/db/">
83-
<div class="l-stat__col-title"><?=__('DB')?></div>
84-
<ul>
85-
<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
86-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
87-
</ul>
88-
</a>
89-
</div>
90-
<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
91-
<a href="/list/cron/">
92-
<div class="l-stat__col-title"><?=__('CRON')?></div>
93-
<ul>
94-
<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
95-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
96-
</ul>
97-
</a>
98-
</div>
99-
<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
100-
<a href="/list/backup/">
101-
<div class="l-stat__col-title"><?=__('BACKUP')?></div>
102-
<ul>
103-
<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
104-
</ul>
105-
</a>
106-
</div>
51+
<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
52+
<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
53+
<a href="/list/web/">
54+
<div class="l-stat__col-title"><?=__('WEB')?></div>
55+
<ul>
56+
<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
57+
<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
58+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
59+
</ul>
60+
</a>
61+
</div>
62+
<?php } ?>
63+
<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
64+
<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
65+
<a href="/list/dns/">
66+
<div class="l-stat__col-title"><?=__('DNS')?></div>
67+
<ul>
68+
<li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
69+
<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
70+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
71+
</ul>
72+
</a>
73+
</div>
74+
<?php } ?>
75+
<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
76+
<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
77+
<a href="/list/mail/">
78+
<div class="l-stat__col-title"><?=__('MAIL')?></div>
79+
<ul>
80+
<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
81+
<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
82+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
83+
</ul>
84+
</a>
85+
</div>
86+
<?php } ?>
87+
<?php if($panel[$user]['DATABASES'] != "0") { ?>
88+
<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
89+
<a href="/list/db/">
90+
<div class="l-stat__col-title"><?=__('DB')?></div>
91+
<ul>
92+
<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
93+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
94+
</ul>
95+
</a>
96+
</div>
97+
<?php } ?>
98+
<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
99+
<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
100+
<a href="/list/cron/">
101+
<div class="l-stat__col-title"><?=__('CRON')?></div>
102+
<ul>
103+
<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
104+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
105+
</ul>
106+
</a>
107+
</div>
108+
<?php } ?>
109+
<?php if($panel[$user]['BACKUPS'] != "0") { ?>
110+
<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
111+
<a href="/list/backup/">
112+
<div class="l-stat__col-title"><?=__('BACKUP')?></div>
113+
<ul>
114+
<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
115+
</ul>
116+
</a>
117+
</div>
118+
<?php } ?>
107119
</div>
108120
<!-- /.l-stats -->
109121
</div>

‎web/templates/user/panel.html‎

Lines changed: 68 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -41,62 +41,74 @@
4141
</ul>
4242
</a>
4343
</div>
44-
<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
45-
<a href="/list/web/">
46-
<div class="l-stat__col-title"><?=__('WEB')?></div>
47-
<ul>
48-
<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
49-
<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
50-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
51-
</ul>
52-
</a>
53-
</div>
54-
<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
55-
<a href="/list/dns/">
56-
<div class="l-stat__col-title"><?=__('DNS')?></div>
57-
<ul>
58-
<li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
59-
<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
60-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
61-
</ul>
62-
</a>
63-
</div>
64-
<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
65-
<a href="/list/mail/">
66-
<div class="l-stat__col-title"><?=__('MAIL')?></div>
67-
<ul>
68-
<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
69-
<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
70-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
71-
</ul>
72-
</a>
73-
</div>
74-
<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
75-
<a href="/list/db/">
76-
<div class="l-stat__col-title"><?=__('DB')?></div>
77-
<ul>
78-
<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
79-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
80-
</ul>
81-
</a>
82-
</div>
83-
<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
84-
<a href="/list/cron/">
85-
<div class="l-stat__col-title"><?=__('CRON')?></div>
86-
<ul>
87-
<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
88-
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
89-
</ul>
90-
</a>
91-
</div>
92-
<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
93-
<a href="/list/backup/">
94-
<div class="l-stat__col-title"><?=__('BACKUP')?></div>
95-
<ul>
96-
<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
97-
</ul>
98-
</a>
99-
</div>
44+
<?php if($panel[$user]['WEB_DOMAINS'] != "0") { ?>
45+
<div class="l-stat__col <?php if($TAB == 'WEB' ) echo 'l-stat__col--active' ?>">
46+
<a href="/list/web/">
47+
<div class="l-stat__col-title"><?=__('WEB')?></div>
48+
<ul>
49+
<li><?=__('domains')?>: <span><?=$panel[$user]['U_WEB_DOMAINS']?></span></li>
50+
<li><?=__('aliases')?>: <span><?=$panel[$user]['U_WEB_ALIASES']?></span></li>
51+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_WEB']?></span></li>
52+
</ul>
53+
</a>
54+
</div>
55+
<?php } ?>
56+
<?php if($panel[$user]['DNS_DOMAINS'] != "0") { ?>
57+
<div class="l-stat__col <?php if($TAB == 'DNS' ) echo 'l-stat__col--active' ?>">
58+
<a href="/list/dns/">
59+
<div class="l-stat__col-title"><?=__('DNS')?></div>
60+
<ul>
61+
<li><?=__('domains')?>: <span><?=$panel[$user]['U_DNS_DOMAINS']?></span></li>
62+
<li><?=__('records')?>: <span><?=$panel[$user]['U_DNS_RECORDS']?></span></li>
63+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DNS']?></span></li>
64+
</ul>
65+
</a>
66+
</div>
67+
<?php } ?>
68+
<?php if($panel[$user]['MAIL_DOMAINS'] != "0") { ?>
69+
<div class="l-stat__col <?php if($TAB == 'MAIL' ) echo 'l-stat__col--active' ?>">
70+
<a href="/list/mail/">
71+
<div class="l-stat__col-title"><?=__('MAIL')?></div>
72+
<ul>
73+
<li><?=__('domains')?>: <span><?=$panel[$user]['U_MAIL_DOMAINS']?></span></li>
74+
<li><?=__('accounts')?>: <span><?=$panel[$user]['U_MAIL_ACCOUNTS']?></span></li>
75+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_MAIL']?></span></li>
76+
</ul>
77+
</a>
78+
</div>
79+
<?php } ?>
80+
<?php if($panel[$user]['DATABASES'] != "0") { ?>
81+
<div class="l-stat__col <?php if($TAB == 'DB' ) echo 'l-stat__col--active' ?>">
82+
<a href="/list/db/">
83+
<div class="l-stat__col-title"><?=__('DB')?></div>
84+
<ul>
85+
<li><?=__('databases')?>: <span><?=$panel[$user]['U_DATABASES']?></span></li>
86+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_DB']?></span></li>
87+
</ul>
88+
</a>
89+
</div>
90+
<?php } ?>
91+
<?php if($panel[$user]['CRON_JOBS'] != "0") { ?>
92+
<div class="l-stat__col <?php if($TAB == 'CRON' ) echo 'l-stat__col--active' ?>">
93+
<a href="/list/cron/">
94+
<div class="l-stat__col-title"><?=__('CRON')?></div>
95+
<ul>
96+
<li><?=__('jobs')?>: <span><?=$panel[$user]['U_CRON_JOBS']?></span></li>
97+
<li><?=__('spnd')?>: <span><?=$panel[$user]['SUSPENDED_CRON']?></span></li>
98+
</ul>
99+
</a>
100+
</div>
101+
<?php } ?>
102+
<?php if($panel[$user]['BACKUPS'] != "0") { ?>
103+
<div class="l-stat__col <?php if($TAB == 'BACKUP' ) echo 'l-stat__col--active' ?>">
104+
<a href="/list/backup/">
105+
<div class="l-stat__col-title"><?=__('BACKUP')?></div>
106+
<ul>
107+
<li><?=__('backups')?>: <span><?=$panel[$user]['U_BACKUPS']?></span></li>
108+
</ul>
109+
</a>
110+
</div>
111+
<?php } ?>
100112
</div>
101113
<!-- /.l-stats -->
102114
</div>

0 commit comments

Comments
 (0)