Skip to content

Commit 8dd2beb

Browse files
very-twivery-twi
committed
JS updates. Added list / edit / add / delete functionality. Added Helpers methods.
1 parent e92b590 commit 8dd2beb

7 files changed

Lines changed: 539 additions & 161 deletions

File tree

‎web/js/__init__.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
$(document).ready(function(){
22
try{
33
App.Utils.detectBrowser();
4-
5-
App.Env.world = 'USER';
4+
App.Env.world = 'CRON';
65
App.Pages.init();
7-
86
App.Ref.init();
9-
7+
108
//App.View.start();
119
App.Core.listen();
1210
App.Core.initMenu();
1311
App.Helpers.liveValidate();
14-
12+
1513
}catch(e){
1614
fb.error(e);
1715
}

‎web/js/_settings.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ App.i18n.EN = {};
33
App.i18n.EN.incorrect_ip = 'Incorrect ip';
44
App.i18n.EN.confirm = 'Are you sure?';
55
App.i18n.getMessage = function(key)
6-
{
6+
{
77
return 'undefined' != typeof App.i18n[App.Env.lang][key] ? App.i18n[App.Env.lang][key] : '';
88
}
99

1010

1111

1212
// Constants
13-
App.Constants.IP_FORM_ID = 'ip-form';
14-
App.Constants.DNS_FORM_ID = 'dns-form';
15-
App.Constants.USER_FORM_ID = 'user-form';
13+
App.Constants.IP_FORM_ID = 'ip-form';
14+
App.Constants.DNS_FORM_ID = 'dns-form';
15+
App.Constants.USER_FORM_ID = 'user-form';
16+
App.Constants.WEB_DOMAIN_FORM_ID = 'web_domain-form';
17+
App.Constants.DB_FORM_ID = 'db-form';
1618

1719
App.Settings.ajax_url = 1;
1820
App.Settings.uri = location.href.replace('index.html', '');

‎web/js/actions.js‎

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,9 @@ App.Actions.save_form = function(evt) {
104104
var source = $(elm).find('.source').val();
105105
var values = App.Helpers.getFormValues(elm);
106106
if(App.Validate.form(values, $('#'+elm_id))) {
107-
App.Model.add(values, source);
108-
//var form_id = App.Constants[App.Env.world + '_FORM_ID'];
109-
//$('#'+form_id).remove();
107+
App.Model.add(values, source);
110108
App.Model.update(values, source, elm);
111-
}
112-
/*if(App.Validate.form(values, $('#'+elm_id))) {
113-
App.Model.update(values, source);
114-
}*/
109+
}
115110
}
116111
}
117112

@@ -148,6 +143,16 @@ App.Actions.cancel_form = function(evt, params) {
148143
App.Helpers.updateScreen();
149144
}
150145

146+
App.Actions.suspend = function(evt)
147+
{
148+
alert('Suspend?');
149+
}
150+
151+
App.Actions.unsuspend = function(evt)
152+
{
153+
alert('Unsuspend?');
154+
}
155+
151156
// do_action_form_help
152157
App.Actions.showFormHelp = function(evt) {
153158
var tpl_name = App.Env.world + '_form';
@@ -188,3 +193,39 @@ App.Actions.generate_pass = function()
188193
{
189194
$('.password').val(App.Helpers.generatePassword());
190195
}
196+
197+
App.Actions.toggle_section = function(evt)
198+
{
199+
var elm = $(evt.target);
200+
var ref = $(elm).parents('.form-options-group:first');
201+
fb.log(ref);
202+
if ($('.sub_section:first', ref).hasClass('hidden')) {
203+
$('.sub_section:first', ref).removeClass('hidden');
204+
$('.group-header:first', ref).removeClass('collapsed').addClass('expanded');
205+
}
206+
else {
207+
$('.sub_section:first', ref).addClass('hidden');
208+
$('.group-header:first', ref).removeClass('expanded').addClass('collapsed');
209+
}
210+
}
211+
212+
App.Actions.close_inner_popup = function(evt)
213+
{
214+
App.Helpers.closeInnerPopup();
215+
}
216+
217+
App.Actions.open_inner_popup = function(evt)
218+
{
219+
var elm = $(evt.target);
220+
App.Helpers.openInnerPopup(elm, $(elm).next('.inner-popup-html').val());
221+
}
222+
223+
App.Actions.add_db_user = function(evt)
224+
{
225+
alert('TODO');
226+
}
227+
228+
App.Actions.backup_db = function(evt)
229+
{
230+
alert('TODO');
231+
}

‎web/js/helpers.js‎

Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
2+
3+
App.Helpers.getMbHumanMeasure = function(val)
4+
{
5+
return App.Helpers.getMbHuman(val, true);
6+
}
7+
8+
/**
9+
* Currently no bytes are used, minimal value is in MB
10+
* uncomment in case we will use bytes instead
11+
*/
12+
App.Helpers.getMbHuman = function(val, only_measure)
13+
{
14+
var bytes = val * 1024 * 1024;
15+
var kilobyte = 1024;
16+
var megabyte = kilobyte * 1024;
17+
var gigabyte = megabyte * 1024;
18+
var terabyte = gigabyte * 1024;
19+
var precision = 0;
20+
21+
/*if ((bytes >= 0) && (bytes < kilobyte)) {
22+
return bytes + ' B';
23+
24+
} else if ((bytes >= kilobyte) && (bytes < megabyte)) {
25+
return (bytes / kilobyte).toFixed(precision) + ' KB';
26+
27+
} else */
28+
if ((bytes >= megabyte) && (bytes < gigabyte)) {
29+
return only_measure ? 'MB' : (bytes / megabyte).toFixed(precision);
30+
31+
} else if ((bytes >= gigabyte) && (bytes < terabyte)) {
32+
return only_measure ? 'GB' : (bytes / gigabyte).toFixed(precision);
33+
34+
} else if (bytes >= terabyte) {
35+
return only_measure ? 'TB' : (bytes / terabyte).toFixed(precision);
36+
37+
} else {
38+
return only_measure ? 'MB' : bytes;
39+
}
40+
}
41+
142
App.Helpers.getFirst = function(obj)
243
{
344
try{ // TODO: remove try / catch
@@ -101,22 +142,6 @@ App.Helpers.showConsoleHint = function()
101142
// TODO:
102143
}
103144

104-
105-
// UTILS
106-
App.Utils.generatePasswordHash = function(length)
107-
{
108-
var length = length || 11;
109-
var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!~.";
110-
var pass = "";
111-
for(var x=0;x<length;x++)
112-
{
113-
var i = Math.floor(Math.random() * 62);
114-
pass += chars.charAt(i);
115-
}
116-
117-
return pass;
118-
}
119-
120145
App.Helpers.markBrowserDetails = function()
121146
{
122147
var b = App.Env.BROWSER;
@@ -194,12 +219,12 @@ App.Helpers.liveValidate = function()
194219

195220
App.Helpers.generatePassword = function()
196221
{
197-
var length = 12;
198-
var chars = "abcdefghijklmn.-%$#&-opqrstuvwxyz.-%$#&-ABCDEFGHIJKLMNOPQRSTUV.-%$#&-WXYZ1234567890.-%$#&-";
222+
var length = 8;
223+
var chars = "aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ0123456789";
199224
var pass = "";
200225

201226
for (x=0;x<length;x++) {
202-
var i = Math.floor(Math.random() * 62);
227+
var i = Math.floor(Math.random() * chars.length);
203228
pass += chars.charAt(i);
204229
}
205230

@@ -210,3 +235,21 @@ App.Helpers.Warn = function(msg)
210235
{
211236
alert(msg);
212237
}
238+
239+
App.Helpers.openInnerPopup = function(elm, html)
240+
{
241+
App.Helpers.closeInnerPopup();
242+
243+
var offset = $(elm).offset();
244+
var tpl = App.Templates.get('inner_popup', 'general');
245+
tpl.set(':CONTENT', html);
246+
tpl.set(':LEFT', offset.left);
247+
tpl.set(':TOP', offset.top);
248+
249+
$(document.body).append(tpl.finalize());
250+
}
251+
252+
App.Helpers.closeInnerPopup = function(evt)
253+
{
254+
$('#inner-popup').remove();
255+
}

0 commit comments

Comments
 (0)