Skip to content

Commit 1698e42

Browse files
naumov-socolovnaumov-socolov
committed
[js, css, php] all massive operations fixed. link hovers changed
1 parent ba5090c commit 1698e42

File tree

6 files changed

+82
-52
lines changed

6 files changed

+82
-52
lines changed

‎web/css/main.css‎

Lines changed: 59 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,6 @@ input::-moz-focus-inner{
657657
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#f5f4ef',GradientType=0 );
658658
background-image: linear-gradient(top, #cccccc 0%,#f5f4ef 60%);
659659

660-
border-left: 1px solid #c5c4bf;
661660
position: absolute;
662661
right: 0;
663662
top: 0;
@@ -1501,24 +1500,24 @@ input::-moz-focus-inner{
15011500
color:#747668;
15021501
}
15031502
.b-new-entry .form-row{
1504-
position:relative;
1505-
padding:10px 15px;
1503+
position: relative;
1504+
padding: 10px 15px 9px;
15061505
}
15071506
.b-new-entry .field-label,
15081507
.b-new-entry .row-header{
15091508
float:left;
15101509
width:180px;
15111510
font-size:15px;
1512-
line-height:2;
1511+
line-height:35px;
15131512
color:#3d504a;
15141513
}
15151514
.b-new-entry .text-field{
15161515
float:left;
15171516
width:265px;
15181517
margin:0 15px 0 0;
1519-
padding:6px 7px;
1518+
padding: 8px 0 7px 7px;
15201519
border:2px solid #b8c2c3;
1521-
color:#555;
1520+
color:#3B3937;
15221521
font-family:Arial, Helvetica, sans-serif;
15231522
font-size:14px;
15241523
font-weight:bold;
@@ -1549,7 +1548,7 @@ input::-moz-focus-inner{
15491548
-moz-box-shadow:0 0 8px rgba(82, 168, 236, 0.5);
15501549
-webkit-box-shadow:0 0 8px rgba(82, 168, 236, 0.5);
15511550
border-color:rgba(82, 168, 236, 0.75) !important;
1552-
color:#333;
1551+
color:#262523;
15531552
}
15541553

15551554
.b-new-entry .ssl-crtfct-box .textarea{
@@ -1561,7 +1560,7 @@ input::-moz-focus-inner{
15611560
left:195px;
15621561
width: 195px;
15631562
height: 28px;
1564-
padding: 0 24px 0 8px;
1563+
padding: 2px 24px 2px 9px;
15651564
color: #555555;
15661565
font:bold 14px/28px arial,sans-serif;
15671566
background:#fff url(../images/select-arrow.png) no-repeat 100% 50%;
@@ -1707,6 +1706,7 @@ input::-moz-focus-inner{
17071706
line-height:1;
17081707
letter-spacing:0.5px;
17091708
}
1709+
/*
17101710
.generate-pwd:hover,
17111711
.context-settings:hover{
17121712
color:#575757;
@@ -1716,6 +1716,7 @@ input::-moz-focus-inner{
17161716
.context-settings:active{
17171717
color:#b4c775;
17181718
}
1719+
*/
17191720

17201721
.b-new-entry .add-ns{
17211722
display:-moz-inline-stack;
@@ -1745,15 +1746,6 @@ input::-moz-focus-inner{
17451746
display:inline-block;
17461747
border-bottom:1px solid #b5c968;
17471748
}
1748-
.add-ns .btn-title:hover{
1749-
color:#000;
1750-
border-bottom-color:#b85152;
1751-
}
1752-
.add-ns .btn-title:active{
1753-
color:#b85152;
1754-
border-bottom-color:#000;
1755-
}
1756-
17571749

17581750
.b-new-entry .buttons-row{
17591751
position:relative;
@@ -2887,17 +2879,25 @@ input::-moz-focus-inner{
28872879
/* row hover effect
28882880
- - - - - - - - - - - - - - - - - - - */
28892881
.row:hover{
2890-
background-color:#ffffcb;
2882+
// background-color:#ffffcb;
2883+
background-color: #FEFFD9;
28912884
}
28922885
.ip-list .row:hover .ip-adr,
28932886
.domains-list .row:hover .names .primary,
28942887
.dns-list .row:hover .names .primary,
28952888
.cron-list .row:hover .cron-command-line,
28962889
.users-list .row:hover .username-box .nickname,
2897-
.db-list .row:hover .db-name{
2898-
border-bottom-style:dashed;
2899-
border-bottom-color:#e5e5e5;
2900-
border-bottom-color:#bbb;
2890+
.db-list .row:hover .db-name
2891+
{
2892+
border-bottom-style:solid;
2893+
// border-bottom-color:#e5e5e5;
2894+
// border-bottom-color:#ccc;
2895+
// border-bottom-color: #1DB4D6;
2896+
color: #2EAABD;
2897+
// color: #333;
2898+
text-decoration: underline;
2899+
// text-shadow: 1px 1px 3px #3DB8FF;
2900+
// text-shadow: 1px 1px 2px #B4DEFC;
29012901
}
29022902
.ip-list .row:hover .ip-adr:hover,
29032903
.domains-list .row:hover .names .primary:hover,
@@ -2906,8 +2906,14 @@ input::-moz-focus-inner{
29062906
.users-list .row:hover .username-box .nickname:hover,
29072907
.db-list .row:hover .db-name:hover{
29082908
cursor:pointer;
2909-
border-bottom-style:solid;
2910-
border-bottom-color:#b4c775;
2909+
// border-bottom-style:solid;
2910+
// border-bottom-color:#b4c775;
2911+
// border-bottom-color:#333;
2912+
// color: #FF4B4B;
2913+
// color: #E9640B;
2914+
color: #FF5B5B;
2915+
text-decoration: underline;
2916+
text-shadow: 1px 1px 2px #FEFFC7;
29112917
}
29122918
.ip-list .ip-details-suspended:hover .ip-adr,
29132919
.ip-list .ip-details-suspended:hover .ip-adr:hover{
@@ -2965,8 +2971,9 @@ input::-moz-focus-inner{
29652971
.row:hover .db-user-box .change-pwd,
29662972
.row:hover .add-db-user,
29672973
.row:hover .backup-db,
2968-
.row:hover .user-backups-box .prop-title{
2969-
color:#6aa0ac;
2974+
.row:hover .user-backups-box .prop-title,
2975+
.row:hover .group-switcher .group-values-count{
2976+
color: #5BA0AD;
29702977
border-bottom-color:#cacbbd;
29712978
}
29722979

@@ -2984,11 +2991,19 @@ input::-moz-focus-inner{
29842991
.row .db-user-box .change-pwd:hover,
29852992
.row .add-db-user:hover,
29862993
.row .backup-db:hover,
2987-
.row .user-backups-box:hover .prop-title{
2988-
color:#575757;
2994+
.row .user-backups-box:hover .prop-title,
2995+
.row .group-switcher:hover .group-values-count,
2996+
.generate-pwd:hover,
2997+
.context-settings:hover,
2998+
.add-ns .btn-title:hover
2999+
{
3000+
// color: #26A9E0;
3001+
color: #FF8D80;
29893002
border-bottom-color:#b4c775;
29903003
}
2991-
.row .template-box .prop-value:active,
3004+
3005+
.row .template-box:active .prop-value,
3006+
.row .prop-value:active,
29923007
.row .show-records:active,
29933008
.hide-records:active,
29943009
.domains-list .row:hover .stats-box .stats-auth-text:active,
@@ -2998,10 +3013,23 @@ input::-moz-focus-inner{
29983013
.row .db-user-box .change-pwd:active,
29993014
.row .add-db-user:active,
30003015
.row .backup-db:active,
3001-
.row .user-backups-box .prop-title:active{
3002-
color:#b4c775;
3016+
.row .user-backups-box:active .prop-title,
3017+
.row .group-switcher:active .group-values-count,
3018+
.generate-pwd:active,
3019+
.context-settings:active,
3020+
.add-ns .btn-title:active
3021+
{
3022+
color: #FFCC00;
3023+
}
3024+
.add-domain:hover{
3025+
color: #92BD10;
3026+
border-bottom: 1px solid #828477;
3027+
}
3028+
.add-domain:active{
3029+
color: #FFCC00;
30033030
}
30043031

3032+
30053033
/* Checked row
30063034
- - - - - - - - - - - - - - - - - - - */
30073035
.checked-row{

‎web/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ <h1 class="logo"><a href="/">Vesta panel <span>&nbsp;</span></a></h1>
114114
</dt>
115115
<dd class="section-contains">
116116
<span class="def"><span class="num-total">0</span> dns domain(s)</span>
117+
<span class="def"><span class="num-blocked">0</span> suspended</span>
117118
</dd>
118119
</dl>
119120
</div>
@@ -168,7 +169,6 @@ <h1 class="logo"><a href="/">Vesta panel <span>&nbsp;</span></a></h1>
168169
</dt>
169170
<dd class="section-contains">
170171
<span class="def"><span class="num-total">0</span> ip address(es)</span>
171-
<span class="def"><span class="num-blocked">0</span> suspended</span>
172172
</dd>
173173
</dl>
174174
</div>

‎web/js/templates.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ App.Templates.html = {
8888
<form id="login-form" method="post" action="#" class="auth">\
8989
<div class="form-row cc">\
9090
<label for="email" class="field-label">Login</label>\
91-
<input type="text" tabindex="1" id="authorize-login" autocomplete="on" class="field-text">\
91+
<input type="text" tabindex="1" id="authorize-login" autocomplete="on" class="field-text" name="login">\
9292
</div>\
9393
<div class="form-row cc">\
9494
<label for="password" class="field-label">Password</label>\
95-
<input type="password" tabindex="2" id="authorize-password" autocomplete="on" class="field-text">\
95+
<input type="password" tabindex="2" id="authorize-password" autocomplete="on" class="field-text" name="password">\
9696
</div>\
9797
<div id="auth-error" class="error-box hidden"></div>\
9898
<div class="form-row last-row cc">\

‎web/vesta/api/IP.class.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,5 +192,16 @@ public function getSysInterfacesExecute(Request $request)
192192

193193
return $this->reply($result['status'], $reply);
194194
}
195-
195+
196+
public function massiveDeleteExecute(Request $request)
197+
{
198+
$user = $this->getLoggedUser();
199+
$_entities = $request->getParameter('entities');
200+
201+
foreach($_entities as $entity){
202+
$result = Vesta::execute(Vesta::V_DEL_SYS_IP, array($entity['IP_ADDRESS']));
203+
}
204+
205+
return $this->reply($result['status'], $result['data']);
206+
}
196207
}

‎web/vesta/api/MAIN.class.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,24 +178,31 @@ public function getInitialExecute(Request $request)
178178
$totals['USER']['blocked'] += 1;
179179
}
180180
}
181+
181182
// web_domains
182183
$rs = Vesta::execute(Vesta::V_LIST_WEB_DOMAINS, array('USER' => $user['uid']), self::JSON);
183184
$data_web_domain = $rs['data'];
184185
foreach ($data_web_domain as $web) {
185186
$totals['WEB_DOMAIN']['total'] += 1;
187+
$web['SUSPEND'] == 'yes' ? $totals['WEB_DOMAIN']['blocked'] += 1 : false;
186188
}
189+
187190
// db
188191
$rs = Vesta::execute(Vesta::V_LIST_DB_BASES, array('USER' => $user['uid']), self::JSON);
189192
$data_db = $rs['data'];
190193
foreach ($data_db as $db) {
191194
$totals['DB']['total'] += 1;
195+
$db['SUSPEND'] == 'yes' ? $totals['DB']['blocked'] += 1 : false;
192196
}
197+
193198
// dns
194199
$rs = Vesta::execute(Vesta::V_LIST_DNS_DOMAINS, array('USER' => $user['uid']), self::JSON);
195200
$data_dns = $rs['data'];
196201
foreach ($data_dns as $dns) {
197202
$totals['DNS']['total'] += 1;
203+
$dns['SUSPEND'] == 'yes' ? $totals['DNS']['blocked'] += 1 : false;
198204
}
205+
199206
// ip
200207
$global_data['ips'] = array();
201208
$rs = Vesta::execute(Vesta::V_LIST_SYS_IPS, null, self::JSON);
@@ -204,6 +211,7 @@ public function getInitialExecute(Request $request)
204211
$totals['IP']['total'] += 1;
205212
$global_data['ips'][$ip] = $ip;
206213
}
214+
207215
// cron
208216
$rs = Vesta::execute(Vesta::V_LIST_CRON_JOBS, array('USER' => $user['uid']), self::JSON);
209217
$data_cron = $rs['data'];

‎web/vesta/api/WEB_DOMAIN.class.php‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -182,23 +182,6 @@ public function addExecute(Request $request)
182182

183183
if (Utils::getCheckboxBooleanValue($_s['DNS_DOMAIN'])) {
184184

185-
echo 'adding dns domain';
186-
echo '<br>';
187-
188-
/*
189-
require_once V_ROOT_DIR . 'api/DNS.class.php';
190-
191-
$dns = new DNS();
192-
$result = 0;
193-
$result = $dns->addExecute($params);
194-
if (!$result['status']) {
195-
$this->errors['DNS_DOMAIN'] = array($result['error_code'] => $result['error_message']);
196-
}
197-
*/
198-
199-
200-
201-
$_GET['debug'] = 2;
202185
$params = array(
203186
'USER' => $user['uid'],
204187
'DNS_DOMAIN' => $_s['DOMAIN'],

0 commit comments

Comments
 (0)