Skip to content

Commit 8082225

Browse files
very-twivery-twi
committed
js updates. captcha + change password base
1 parent 52dad1d commit 8082225

32 files changed

+1393
-2031
lines changed

‎web/images/vesta-logo.png‎

3.1 KB
Loading

‎web/index.html‎

Lines changed: 83 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru">
33

44
<head>
5-
<title>Vesta | IP</title>
5+
<title>Vesta Control Panel</title>
66
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
77
<meta http-equiv="imagetoolbar" content="false" />
8+
9+
<link rel="shortcut icon" href="images/fav.ico" type="image/x-icon">
810

911
<link rel="stylesheet" media="all" type="text/css" href="css/reset2.css" />
10-
<link rel="stylesheet" media="all" type="text/css" href="css/main.css" />
12+
<link rel="stylesheet" media="all" type="text/css" href="css/main.css" />
1113
<link rel="stylesheet" media="all" type="text/css" href="css/popup.css" />
14+
<link rel="stylesheet" media="all" type="text/css" href="css/vesta-login-form.css" />
1215

1316
<!--[if lt IE 8]>
1417
<link rel="stylesheet" type="text/css" href="http://dl.dropbox.com/u/1750887/projects/vesta2/css/ie.css" />
@@ -46,17 +49,30 @@
4649
</head>
4750

4851
<body>
49-
<div id="page">
52+
<div id="page" class="hidden">
5053
<div class="outer">
5154
<div id="header">
5255
<div class="logo-box">
5356
<h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
5457
</div>
5558
<ul class="settings">
56-
<li><a href="#">settings</a></li>
57-
<li><a href="#">exit</a></li>
58-
</ul>
59+
<li class="settings-item"><a href="#" class="item-title logged-as" id="user-name">...</a></li>
60+
<li class="settings-item"><a href="#" class="item-title">profile</a></li>
61+
<li class="settings-item"><a href="#" class="item-title do_action_view_profile_settings">settings</a></li>
62+
<li class="settings-item"><a href="#" class="item-title do_action_profile_exit">exit</a></li>
63+
</ul>
64+
<ul class="extra-services">
65+
<li class="service-item service-item_backups">
66+
<span class="item-title">Backups</span>
67+
<i class="item-devider"></i>
68+
</li>
69+
<li class="service-item">
70+
<span class="item-title">Stats</span>
71+
<i class="item-devider"></i>
72+
</li>
73+
</ul>
5974
</div>
75+
6076
<div id="primary-nav-box">
6177
<ul class="primary-nav cc">
6278
<li class="section" id="USER">
@@ -68,26 +84,27 @@ <h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
6884
</dt>
6985
<dd class="section-contains">
7086
<span class="def"><span class="num-total">0</span> users</span>
71-
<span class="def"><span class="num-blocked">0</span> blocked</span>
87+
<span class="def"><span class="num-blocked">0</span> suspended</span>
7288
</dd>
7389
</dl>
7490
</div>
75-
</li>
76-
77-
91+
92+
<i class="section-devider"></i>
93+
</li>
7894
<li class="section" id="WEB_DOMAIN">
7995
<div class="section-inner">
8096
<dl class="users-nav-item">
8197
<dt class="section-title cc">
82-
<span class="to-section">Web Domain</span>
98+
<span class="to-section">Web</span>
8399
<i class="add-entry do_action_new_entry">&nbsp;</i>
84100
</dt>
85101
<dd class="section-contains">
86102
<span class="def"><span class="num-total">0</span> web domains</span>
87-
<span class="def"><span class="num-blocked">0</span> blocked</span>
103+
<span class="def"><span class="num-blocked">0</span> suspended</span>
88104
</dd>
89105
</dl>
90106
</div>
107+
<i class="section-devider"></i>
91108
</li>
92109
<li class="section" id="MAIL">
93110
<div class="section-inner">
@@ -97,10 +114,11 @@ <h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
97114
<i class="add-entry do_action_new_entry">&nbsp;</i>
98115
</dt>
99116
<dd class="section-contains">
100-
<span class="def"><span class="num-total">0</span> mails</span>
117+
<span class="def"><span class="num-total">0</span> mail domain(s)</span>
101118
</dd>
102119
</dl>
103120
</div>
121+
<i class="section-devider"></i>
104122
</li>
105123
<li class="section" id="DB">
106124
<div class="section-inner">
@@ -111,10 +129,11 @@ <h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
111129
</dt>
112130
<dd class="section-contains">
113131
<span class="def"><span class="num-total">0</span> databases</span>
114-
<span class="def"><span class="num-blocked">0</span> blocked</span>
132+
<span class="def"><span class="num-blocked">0</span> suspended</span>
115133
</dd>
116134
</dl>
117135
</div>
136+
<i class="section-devider"></i>
118137
</li>
119138
<li class="section active" id="DNS">
120139
<div class="section-inner">
@@ -124,10 +143,11 @@ <h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
124143
<i class="add-entry do_action_new_entry">&nbsp;</i>
125144
</dt>
126145
<dd class="section-contains">
127-
<span class="def"><span class="num-total">0</span> total records</span>
146+
<span class="def"><span class="num-total">0</span> dns domain(s)</span>
128147
</dd>
129148
</dl>
130149
</div>
150+
<i class="section-devider"></i>
131151
</li>
132152
<li class="section" id="IP">
133153
<div class="section-inner">
@@ -137,11 +157,12 @@ <h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
137157
<i class="add-entry do_action_new_entry">&nbsp;</i>
138158
</dt>
139159
<dd class="section-contains">
140-
<span class="def"><span class="num-total">0</span> ip entries</span>
141-
<span class="def"><span class="num-blocked">0</span> blocked</span>
160+
<span class="def"><span class="num-total">0</span> ip address(es)</span>
161+
<span class="def"><span class="num-blocked">0</span> suspended</span>
142162
</dd>
143163
</dl>
144164
</div>
165+
<i class="section-devider"></i>
145166
</li>
146167
<li class="section last-section" id="CRON">
147168
<div class="section-inner">
@@ -151,28 +172,29 @@ <h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
151172
<i class="add-entry do_action_new_entry">&nbsp;</i>
152173
</dt>
153174
<dd class="section-contains">
154-
<span class="def"><span class="num-total">0</span> cron records</span>
155-
<span class="def"><span class="num-blocked">0</span> blocked</span>
175+
<span class="def"><span class="num-total">0</span> cron job(s)</span>
176+
<span class="def"><span class="num-blocked">0</span> suspended</span>
156177
</dd>
157178
</dl>
158179
</div>
180+
<i class="section-devider"></i>
159181
</li>
160182
</ul>
161183
</div>
162184
<div id="console">
163185
<div class="b-console">
164186

165187
<div class="b-console-wrap">
166-
<form class="b-console-form cc" action="#" method="post">
188+
<form class="b-console-form cc" action="" method="post">
167189
<fieldset>
168190
<input class="b-console-field" type="text" value="/"/>
169-
<input class="b-console-btn" type="submit" value="Go" />
191+
<input class="b-console-btn do_action_exec_v_console" type="submit" value="Go"/>
170192
</fieldset>
171193
</form>
172194
<div class="b-console-statuses hidden">
173195
<div class="b-console-status cc">
174196

175-
<p class="b-console-status-message">domain <b>google.com</b> have been added <br />
197+
<p class="b-console-status-message">domain <b>test.com</b> have been added <br />
176198

177199
</p>
178200
<span class="b-console-status-action">cancel</span>
@@ -189,30 +211,53 @@ <h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
189211
<i class="icon do_action_new_entry">&nbsp;</i>
190212
add new <span id="new-entry-keyword" class="do_action_new_entry">entry</span>
191213
</a>
214+
<div class="row-filters cc">
215+
<div class="b-row-selector">
216+
<div class="checkbox-selector cc">
217+
<input class="styled" type="checkbox" value="" />
218+
<span class="selector-title">385 Selected</span>
219+
</div>
220+
<div class="context-actions c-s-box">
221+
<div class="b-cust-sel complex-select c-s-opt">
222+
<input type="hidden" name="" value="" class="c-s-value-ref">
223+
<span class="title c-s-opt c-s-title do_action_toggle_custom_select">Action</span>
224+
<div class="cust-sel-arrow do_action_toggle_custom_select c-s-opt"><i>&nbsp;</i></div>
225+
<div class="cust-sel-options complex-select-content c-s-opt hidden">
226+
<div class="cust-sel-option ico_gray c-s-opt do_action_update_cs_value">
227+
<input type="hidden" class="c-s-value" value="Suspend">
228+
Suspend
229+
</div>
230+
<div class="cust-sel-option ico_green c-s-opt do_action_update_cs_value">
231+
<input type="hidden" class="c-s-value" value="Unsuspended">
232+
Unsuspend
233+
</div>
234+
<div class="cust-sel-option ico_red c-s-opt do_action_update_cs_value">
235+
<input type="hidden" class="c-s-value" value="Delete">
236+
Delete
237+
</div>
238+
</div>
239+
</div>
240+
</div>
241+
</div>
242+
</div>
192243
</div>
193244

194-
<div id="content">
195-
196-
<!-- -->
197-
198-
<!-- -->
199-
200-
</div>
245+
<div id="content">
246+
<div class="content-inner">
247+
248+
</div>
201249
</div>
202-
</div>
203-
204-
205-
250+
</div>
251+
</div>
206252
<script type="text/javascript" src="js/lib/cookie.js"></script>
207253
<script type="text/javascript" src="js/lib/jquery-1.6.1.js"></script>
208254
<script type="text/javascript" src="js/lib/jquery-ui-1.8.13.custom.min.js"></script>
255+
<script type="text/javascript" src="js/lib/auth.js"></script>
209256
<script type="text/javascript" src="js/date_format.js"></script>
210257
<script type="text/javascript" src="js/lib/custom-form-elements.js"></script>
211258
<script type="text/javascript" src="js/lib/browser.js"></script>
212-
<script type="text/javascript" src="js/lib/popup.js"></script>
213-
<script type="text/javascript" src="js/tech.js"></script>
214-
<script type="text/javascript" src="js/app.js"></script>
215-
<script type="text/javascript" src="js/tech.js"></script>
259+
<script type="text/javascript" src="js/lib/popup.js"></script>
260+
<script type="text/javascript" src="js/app.js"></script>
216261
<script type="text/javascript" src="js/_settings.js"></script>
217262
<script type="text/javascript" src="js/actions.js"></script>
218263
<script type="text/javascript" src="js/helpers.js"></script>
@@ -223,9 +268,7 @@ <h1 class="logo"><a href="#">Vesta panel <span>&nbsp;</span></a></h1>
223268
<script type="text/javascript" src="js/pages.js"></script>
224269
<script type="text/javascript" src="js/model.js"></script>
225270
<script type="text/javascript" src="js/core.js"></script>
226-
<script type="text/javascript" src="js/validators.js"></script>
227-
271+
<script type="text/javascript" src="js/validators.js"></script>
228272
<script type="text/javascript" src="js/__init__.js"></script>
229273
</body>
230-
231274
</html>

‎web/js/__init__.js‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
$(document).ready(function(){
2-
try{
1+
App.Ajax.request('MAIN.about', {}, function(reply) {
2+
if (reply) {
3+
App.Settings.VestaAbout.company_name = reply.data.company_name;
4+
App.Settings.VestaAbout.company_email = reply.data.company_email;
5+
App.Settings.VestaAbout.version = reply.data.version;
6+
App.Settings.VestaAbout.version_name = reply.data.version_name;
7+
}
8+
});
9+
$('document').ready(function() {
10+
try {
311
App.Utils.detectBrowser();
12+
App.Ref.init();
413

5-
if ('undefined' != typeof App.Tmp.loadTAB) {
14+
App.Env.world = 'USER';
15+
// Disabled cookie tab restoring. Enable if needed
16+
/*if ('undefined' != typeof App.Tmp.loadTAB) {
617
App.Env.world = App.Tmp.loadTAB;
718
}
819
@@ -14,17 +25,17 @@ $(document).ready(function(){
1425
else {
1526
App.Env.world = App.Constants.TABS[0];
1627
}
17-
}
28+
}*/
1829

19-
App.Pages.init();
20-
App.Ref.init();
21-
22-
//App.View.start();
30+
App.Pages.init();
2331
App.Core.listen();
2432
App.Core.initMenu();
2533
App.Helpers.liveValidate();
26-
27-
}catch(e){
34+
$(document).bind('submit', function(evt) {
35+
evt.preventDefault();
36+
});
37+
}
38+
catch(e) {
2839
fb.error(e);
2940
}
3041
});

‎web/js/_settings.js‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,34 @@ App.Constants.DNS = 'DNS';
2020
App.Constants.SUSPENDED_YES = 'yes';
2121
App.Constants.DNS_TEMPLATES = {'default': 'Default'};
2222

23+
App.Constants.KEY = {};
24+
App.Constants.KEY.ESC = 27;
25+
App.Constants.KEY.ENTER = 13;
26+
App.Constants.KEY.SPACE = 32;
27+
App.Constants.KEY.BACKSPACE = 8;
28+
App.Constants.KEY.UP = 38;
29+
App.Constants.KEY.DOWN = 40;
30+
App.Constants.KEY.CODED_NAME = {'27':'ESC', '13':'ENTER','32':'SPACE','8':'BACKSPACE','38':'UP','40':'DOWN'};
31+
2332
// Settings
24-
App.Settings.FIELD_MAX_LEN = 32;
25-
App.Settings.DAY_MAX_LEN = 2;
26-
App.Settings.MONTH_MAX_LEN = 2;
27-
App.Settings.WDAY_MAX_LEN = 2;
28-
App.Settings.HOURS_MAX_LEN = 2;
29-
App.Settings.MINUTE_MAX_LEN = 2;
30-
App.Settings.USER_VISIBLE_NS = 2;
31-
App.Settings.NS_MIN = 2;
32-
App.Settings.NS_MAX = 8;
33-
App.Settings.ajax_url = 1;
34-
App.Settings.uri = location.href.replace('index.html', '');
35-
App.Settings.popup_conf = { 'centered' : true, 'bgcolor' : '#FF0000', 'lightboxSpeed' : 'fast', 'destroyOnClose': true };
33+
App.Settings.PSW_MIN_LEN = 6;
34+
App.Settings.FIELD_MAX_LEN = 32;
35+
App.Settings.DAY_MAX_LEN = 2;
36+
App.Settings.MONTH_MAX_LEN = 2;
37+
App.Settings.WDAY_MAX_LEN = 2;
38+
App.Settings.HOURS_MAX_LEN = 2;
39+
App.Settings.MINUTE_MAX_LEN = 2;
40+
App.Settings.USER_VISIBLE_NS = 2;
41+
App.Settings.USER_VISIBLE_WEB_TPL = 2;
42+
App.Settings.NS_MIN = 2;
43+
App.Settings.NS_MAX = 8;
44+
App.Settings.ajax_url = 1;
45+
App.Settings.uri = location.href.replace('index.html', '');
46+
App.Settings.popup_conf = { 'centered' : true, 'bgcolor' : '#FF0000', 'lightboxSpeed' : 'fast', 'destroyOnClose': true };
47+
48+
App.Settings.PASSWORD_IMMUTE = '********';
3649

37-
App.Settings.PASSWORD_IMMUTE = '********';
50+
App.Settings.AJAX_SYNCRONOUS = ['MAIN.getInitial'];
3851

3952
// Messages
4053
App.Messages.total_dns_records = {single: 'total record', plural: 'total records'};

0 commit comments

Comments
 (0)