Skip to content

Commit f7d1d2c

Browse files
serghey-rodinserghey-rodin
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents fa8cada + 8a91c6e commit f7d1d2c

19 files changed

+1234
-797
lines changed

‎web/css/main.css‎

Lines changed: 199 additions & 56 deletions
Large diffs are not rendered by default.

‎web/js/__init__.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ $('document').ready(function() {
1111
App.Utils.detectBrowser();
1212
App.Ref.init();
1313

14-
App.Env.world = 'USER';
14+
//App.Env.world = 'USER';
1515
// Disabled cookie tab restoring. Enable if needed
16-
/*if ('undefined' != typeof App.Tmp.loadTAB) {
16+
if ('undefined' != typeof App.Tmp.loadTAB) {
1717
App.Env.world = App.Tmp.loadTAB;
1818
}
1919

@@ -25,7 +25,7 @@ $('document').ready(function() {
2525
else {
2626
App.Env.world = App.Constants.TABS[0];
2727
}
28-
}*/
28+
}
2929

3030
App.Pages.init();
3131
App.Core.listen();

‎web/js/actions.js‎

Lines changed: 55 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
App.Actions.toggle_suspend = function(evt)
2+
{
3+
var elm = $(evt.target);
4+
var ref = elm.parents('.form');
5+
ref.removeClass('form-suspended');
6+
fb.warn(ref);
7+
var ref_checkbox = ref.find('input[name="SUSPEND"]');
8+
ref_checkbox.val() == 'on' ? ref_checkbox.val('off') : ref_checkbox.val('on'); // switch state
9+
if (ref_checkbox.val() == 'on') { // set class on new state
10+
ref.addClass('form-suspended');
11+
fb.warn('SUSP');
12+
}
13+
else {
14+
ref.removeClass('form-suspended');
15+
fb.warn('UNSUSP');
16+
}
17+
}
18+
119
App.Actions.toggle_custom_select = function(evt)
220
{
321
var elm = $(evt.target);
@@ -54,10 +72,11 @@ App.Actions.back_to_login = function()
5472
{
5573
$('body').addClass('page-auth');
5674
var tpl = App.Templates.get('login', 'popup');
57-
tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo.png'));
75+
tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo-2011-12-14.png'));
5876
tpl.set(':YEAR', new Date().getFullYear());
5977
tpl.set(':EMAIL_REAL', App.Settings.VestaAbout.company_email);
60-
tpl.set(':EMAIL', App.Settings.VestaAbout.company_name);
78+
tpl.set(':EMAIL', App.Settings.VestaAbout.company_email);
79+
tpl.set(':PRODUCT_NAME', App.Settings.VestaAbout.company_name);
6180
tpl.set(':VERSION', App.Settings.VestaAbout.version_name + ' ' + App.Settings.VestaAbout.version);
6281
$('body').prepend(tpl.finalize());
6382
$('#change-psw-block').remove();
@@ -73,12 +92,13 @@ App.Actions.change_password = function(evt)
7392
}
7493

7594
var tpl = App.Templates.get('change_psw', 'popup');
76-
tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo.png'));
95+
tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo-2011-12-14.png'));
7796
tpl.set(':YEAR', new Date().getFullYear());
7897
tpl.set(':CAPTCHA_URL', App.Helpers.generateUrl('captcha.php?')+Math.floor(Math.random() * 9999));
7998
tpl.set(':CAPTCHA_URL_2', App.Helpers.generateUrl('captcha.php'));
8099
tpl.set(':EMAIL_REAL', App.Settings.VestaAbout.company_email);
81-
tpl.set(':EMAIL', App.Settings.VestaAbout.company_name);
100+
tpl.set(':EMAIL', App.Settings.VestaAbout.company_email);
101+
tpl.set(':PRODUCT_NAME', App.Settings.VestaAbout.company_name);
82102
tpl.set(':VERSION', App.Settings.VestaAbout.version_name + ' ' + App.Settings.VestaAbout.version);
83103
$('#auth-block').remove();
84104
$('body').prepend(tpl.finalize());
@@ -104,10 +124,11 @@ App.Actions.authorize = function()
104124
$('#page').addClass('hidden');
105125
$('body').addClass('page-auth');
106126
var tpl = App.Templates.get('login', 'popup');
107-
tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo.png'));
127+
tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo-2011-12-14.png'));
108128
tpl.set(':YEAR', new Date().getFullYear());
109129
tpl.set(':EMAIL_REAL', App.Settings.VestaAbout.company_email);
110-
tpl.set(':EMAIL', App.Settings.VestaAbout.company_name);
130+
tpl.set(':EMAIL', App.Settings.VestaAbout.company_email);
131+
tpl.set(':PRODUCT_NAME', App.Settings.VestaAbout.company_name);
111132
tpl.set(':VERSION', App.Settings.VestaAbout.version_name + ' ' + App.Settings.VestaAbout.version);
112133
$('body').prepend(tpl.finalize());
113134
$(document).ready(function(){
@@ -123,12 +144,15 @@ App.Actions.authorize = function()
123144
App.Actions.new_entry = function() {
124145
if ('undefined' != typeof App.Pages[App.Env.world].new_entry) {fb.log(1);
125146
App.Pages[App.Env.world].new_entry();
126-
} else {fb.log(2);
147+
} else {
127148
var form_id = App.Constants[App.Env.world + '_FORM_ID'];
128149
$('#'+form_id).remove();
129150
var build_method = App.Env.getWorldName() + '_form';
130151
var tpl = App.HTML.Build[build_method]({}, form_id);
131-
App.Ref.CONTENT.prepend(tpl);
152+
var box = $('<div>').html(tpl);
153+
$(box).find('.suspended').addClass('hidden');
154+
App.Ref.CONTENT.prepend($(box).html());
155+
132156
App.Helpers.updateScreen();
133157
}
134158
}
@@ -158,7 +182,7 @@ App.Actions.delete_entry = function(evt)
158182
return;
159183
}
160184
var elm = $(evt.target);
161-
var elm = elm.hasClass('row') ? elm : elm.parents('.row');
185+
var elm = elm.hasClass('form') ? elm : elm.parents('.form');
162186
App.Model.remove(App.Env.world, elm);
163187
}
164188

@@ -182,19 +206,26 @@ App.Actions.view_template_settings = function(evt)
182206
var elm = $(evt.target);
183207
var ref = elm.hasClass('tpl-item') ? elm : elm.prev('.tpl-item');
184208
var tpl_name = $(ref).val() || $(ref).text();
185-
fb.log(tpl_name);
186-
App.Helpers.openInnerPopup(elm, App.Env.initialParams.WEB_DOMAIN.TPL[tpl_name].DESCR || tpl_name);
209+
App.Helpers.openInnerPopup(elm, App.Env.initialParams.WEB_DOMAIN.TPL[tpl_name].DESCR || tpl_name, 'Template Settings');
187210
}
188211

189212
App.Actions.view_dns_template_settings = function(evt)
190213
{
191214
var elm = $(evt.target);
192-
var ref = elm.prev('.tpl-item');
215+
var ref = elm.hasClass('tpl-item') ? elm : elm.prev('.tpl-item');
193216
var tpl_name = $(ref).val() || $(ref).text();
194-
fb.log(tpl_name);
195-
App.Helpers.openInnerPopup(elm, App.Env.initialParams.DNS.TPL[tpl_name].DESCR || tpl_name);
217+
App.Helpers.openInnerPopup(elm, App.Env.initialParams.DNS.TPL[tpl_name].DESCR || tpl_name, 'Template Settings');
196218
}
197219

220+
/*App.Actions.view_dns_template_settings = function(evt)
221+
{
222+
var elm = $(evt.target);
223+
var ref = elm.prev('.tpl-item');
224+
var tpl_name = $(ref).val() || $(ref).text();
225+
226+
App.Helpers.openInnerPopup(elm, App.Env.initialParams.DNS.TPL[tpl_name].DESCR || tpl_name, '');
227+
}*/
228+
198229
App.Actions.add_subrecord_dns = function(evt)
199230
{
200231
var elm = $(evt.target);
@@ -392,14 +423,16 @@ App.Actions.delete_subentry = function(evt)
392423
$(ref).remove();
393424
}
394425

395-
App.Actions.generate_pass = function()
426+
App.Actions.generate_pass = function(evt)
396427
{
397-
$('.password').val(App.Helpers.generatePassword());
428+
var elm = $(evt.target);
429+
var ref = elm.parents('.form-row');
430+
$('.password', ref).val(App.Helpers.generatePassword());
398431
}
399432

400433
App.Actions.toggle_section = function(evt)
401434
{
402-
var elm = $(evt.target);
435+
var elm = $(evt.target);
403436
var ref = $(elm).parents('.form-options-group:first');
404437
fb.log(ref);
405438
if ($('.sub_section:first', ref).hasClass('hidden')) {
@@ -420,7 +453,7 @@ App.Actions.close_inner_popup = function(evt)
420453
App.Actions.open_inner_popup = function(evt)
421454
{
422455
var elm = $(evt.target);
423-
App.Helpers.openInnerPopup(elm, $(elm).next('.inner-popup-html').val());
456+
App.Helpers.openInnerPopup(elm, $(elm).next('.inner-popup-html').val(), 'Details');
424457
}
425458

426459
App.Actions.add_db_user = function(evt)
@@ -488,7 +521,7 @@ App.Actions.delete_ns = function(evt)
488521
App.Actions.view_full_ns_list = function(evt)
489522
{
490523
var elm = $(evt.target);
491-
App.Helpers.openInnerPopup(elm, $(elm).parents('.prop-box').find('.ns-full-list:first').html());
524+
App.Helpers.openInnerPopup(elm, $(elm).parents('.prop-box').find('.ns-full-list:first').html(), 'NS list');
492525
}
493526

494527
App.Actions.view_template_info = function(evt)
@@ -503,7 +536,7 @@ App.Actions.view_template_info = function(evt)
503536
$.each(reply.data, function(key) {
504537
html += '<li><strong>'+key+':</strong> '+reply.data[key]+'</li>';
505538
});
506-
App.Helpers.openInnerPopup(elm, '<ul>'+html+'</ul>');
539+
App.Helpers.openInnerPopup(elm, '<ul>'+html+'</ul>', 'Template Info');
507540
}
508541
});
509542
}
@@ -522,13 +555,13 @@ App.Actions.toggle_stats_block = function(evt)
522555
App.Actions.exec_v_console = function(evt)
523556
{
524557
evt.preventDefault();
525-
App.Helpers.openInnerPopup(evt.target, 'This functionality will be available in next releases');
558+
App.Helpers.openInnerPopup(evt.target, 'This functionality will be available in next releases', 'Details');
526559
}
527560

528561
App.Actions.view_profile_settings = function(evt)
529562
{
530563
evt.preventDefault();
531-
App.Helpers.openInnerPopup(evt.target, 'This functionality will be available in next releases');
564+
App.Helpers.openInnerPopup(evt.target, 'This functionality will be available in next releases', 'Details');
532565
}
533566

534567
App.Actions.select_all = function(evt)

‎web/js/app.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ var App = {
9393
DB: {},
9494
DNS: {},
9595
IP: {},
96-
CRON: {}
96+
CRON: {},
97+
BACKUPS: {},
98+
STATS: {}
9799
}
98100
},
99101
Messages: {},
@@ -116,7 +118,9 @@ var App = {
116118
DB: {},
117119
DNS: {},
118120
IP: {},
119-
CRON: {}
121+
CRON: {},
122+
BACKUPS: {},
123+
STATS: {}
120124
},
121125
Ref: {},
122126
Tmp: { AJAX_SYNCRONOUS:{} },

‎web/js/helpers.js‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ App.Helpers.getHumanTabName = function()
3838
if (App.Env.world == 'DB') {
3939
return 'DATABASE';
4040
}
41+
if (App.Env.world == 'BACKUPS') {
42+
return 'BACKUP';
43+
}
44+
if (App.Env.world == 'STATS') {
45+
return 'STATS';
46+
}
4147
return App.Env.world;
4248
}
4349

@@ -241,11 +247,11 @@ App.Helpers.getFormValuesFromElement = function(ref)
241247
App.Helpers.updateScreen = function()
242248
{
243249

244-
App.Ajax.request('MAIN.getInitial', {}, function(reply){
250+
/*App.Ajax.request('MAIN.getInitial', {}, function(reply){
245251
App.Env.initialParams = reply.data;
246252
App.Helpers.updateInitial();
247-
});
248-
$('.row:first').addClass('first-row');
253+
});*/
254+
$('.row:first').addClass('first-row');
249255
Custom.init();
250256
}
251257

@@ -256,7 +262,7 @@ App.Helpers.alert = function(msg)
256262

257263
App.Helpers.isEmpty = function(o)
258264
{
259-
return jQuery.isEmptyObject(o);
265+
return 'undefined' == typeof o ? true : jQuery.isEmptyObject(o);
260266
}
261267

262268
App.Helpers.liveValidate = function()
@@ -283,15 +289,17 @@ App.Helpers.Warn = function(msg)
283289
alert(msg);
284290
}
285291

286-
App.Helpers.openInnerPopup = function(elm, html)
292+
App.Helpers.openInnerPopup = function(elm, html, title)
287293
{
294+
var title = title || '';
288295
App.Helpers.closeInnerPopup();
289296

290297
var offset = $(elm).offset();
291298
var tpl = App.Templates.get('inner_popup', 'general');
292299
tpl.set(':CONTENT', html);
293300
tpl.set(':LEFT', offset.left);
294301
tpl.set(':TOP', offset.top);
302+
tpl.set(':POPUP_TITLE', title);
295303

296304
$(document.body).append(tpl.finalize());
297305
}

0 commit comments

Comments
 (0)