Merge branch 'master' of github.com:serghey-rodin/vesta

Author: serghey-rodin

web/css/main.css

@@ -11,9 +11,9 @@ $('document').ready(function() {
         App.Utils.detectBrowser();
         App.Ref.init();    
 
-        App.Env.world = 'USER';
+        //App.Env.world = 'USER';
         // Disabled cookie tab restoring. Enable if needed
-        /*if ('undefined' != typeof App.Tmp.loadTAB) {
+        if ('undefined' != typeof App.Tmp.loadTAB) {
             App.Env.world = App.Tmp.loadTAB;
         }
 
@@ -25,7 +25,7 @@ $('document').ready(function() {
             else {
                 App.Env.world = App.Constants.TABS[0];
             }
-        }*/
+        }
 
         App.Pages.init();        
         App.Core.listen();

web/images/checkbox-selector.png

@@ -59,11 +59,12 @@ App.Messages.get = function(key, plural) {
 }
 
 // Imutable
-App.Settings.Imutable       = {};
-App.Settings.Imutable.USER  = ['LOGIN_NAME'];
-App.Settings.Imutable.DB    = ['DB', 'TYPE', 'USER'];
-App.Settings.Imutable.DNS   = ['DNS_DOMAIN'];
-App.Settings.Imutable.IP    = ['INTERFACE'];
+App.Settings.Imutable               = {};
+App.Settings.Imutable.USER          = ['LOGIN_NAME'];
+App.Settings.Imutable.WEB_DOMAIN    = ['DOMAIN'];
+App.Settings.Imutable.DB            = ['DB', 'TYPE', 'USER', 'CHARSET', 'HOST'];
+App.Settings.Imutable.DNS           = ['DNS_DOMAIN'];
+App.Settings.Imutable.IP            = ['IP_ADDRESS', 'NETMASK', 'INTERFACE'];
 
 
 // Empty

web/images/checkboxes.png

@@ -87,7 +87,7 @@ App.Actions.update_cs_value = function(evt)
 
     if (App.Tmp[App.Env.world + '_selected_records'] > 0) {
         var confirm_message_key = App.Tmp[App.Env.world + '_selected_records'] == 1 ? 1 + ' record' : App.Tmp[App.Env.world + '_selected_records'] + ' records';
-        var confirmed = confirm('This action will ' + val.toLowerCase() + ' ' + confirm_message_key + '. Do you want to proceede?');
+        var confirmed = confirm('This action will ' + val.toLowerCase() + ' ' + confirm_message_key + '. Do you want to proceed?');
         if (confirmed) {
             fb.log('mass_' + val);
             var func_name = val.toLowerCase();
@@ -366,14 +366,13 @@ App.Actions.save_form = function(evt) {
             if (!confirmed) {
                 return true;
             }
-            else {
-                var values = App.Helpers.getFormValues(elm);
-                if(App.Validate.form(values, $('#'+elm_id))) {
-                    App.Model.add(values, source);
-                    var form_id = App.Constants[App.Env.world + '_FORM_ID'];
-                    $('#'+form_id).remove();
-                }
-            }
+        }
+
+        var values = App.Helpers.getFormValues(elm);
+        if(App.Validate.form(values, $('#'+elm_id))) {
+            App.Model.add(values, source);
+            var form_id = App.Constants[App.Env.world + '_FORM_ID'];
+            $('#'+form_id).remove();
         }
     }
     else { // OLD ITEM, UPDATING IT

web/images/chekbox-selector.png

@@ -95,6 +95,7 @@ App.HTML.Build.user_form = function (options, id) {
         tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
     }
     options = !App.Helpers.isEmpty(options) ? options : App.Empty.USER;
+
     if (in_edit == true) {
         options.PASSWORD = App.Settings.PASSWORD_IMMUTE;
         var ns = [];
@@ -146,6 +147,15 @@ App.HTML.Build.web_domain_form = function (options, id) {
         tpl.set(':title', 'Edit WEB domain');
         tpl.set(':save_button', 'SAVE');
         tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
+
+        if(options.SSL_CRT == '' || options.SSL_KEY == ''){
+            options.SSL = '';
+            options.SSL_HOME = '';
+            options.SSL_CRT = '';
+            options.SSL_KEY = '';
+            options.SSL_CA = '';
+        }
+
         if (options.SSL == 'on') {
             tpl.set(':ssl_checked', 'checked="checked"');
         }
@@ -167,7 +177,7 @@ App.HTML.Build.web_domain_form = function (options, id) {
     tpl = App.HTML.setTplKeys(tpl, options, true);
     tpl = App.HTML.Build.web_domain_selects(tpl, options);
     tpl = App.HTML.toggle_suspended_form(tpl, options);
-    if (options.CGI == 'yes') {
+    if (options.CGI == 'yes' || !in_edit) {
         tpl.set(':CHECKED_CGI', 'checked="checked"');
     }
     if (options.ELOG == 'yes') {
@@ -384,8 +394,11 @@ App.HTML.Build.web_domain_entry = function (o, key) {
         'DISK_QUOTA_MEASURE':       App.Helpers.getMbHumanMeasure(App.Env.initialParams.user_data.DISK_QUOTA),
         'BANDWIDTH_MEASURE':        App.Helpers.getMbHumanMeasure(App.Env.initialParams.user_data.BANDWIDTH),
         'BANDWIDTH':                App.Helpers.getMbHuman(App.Env.initialParams.user_data.BANDWIDTH),
-        'DISK_QUOTA':               App.Helpers.getMbHuman(App.Env.initialParams.user_data.DISK_QUOTA)
+        'DISK_QUOTA':               App.Helpers.getMbHuman(App.Env.initialParams.user_data.DISK_QUOTA),
+        'SSL':                      (o.SSL_CRT == '' || o.SSL_KEY == '' || o.SSL != 'on') ? 'off' : 'on'
     };
+
+
     var o = $.extend(o, processed_data);
     o.U_DISK_PERCENTAGE_2 = o.U_DISK_PERCENTAGE;
     o.U_DISK_PERCENTAGE_3 = o.U_DISK_PERCENTAGE;
@@ -651,27 +664,14 @@ App.HTML.Build.db_selects = function (tpl, options) {
     });
     tpl.set(':TYPE_OPTIONS', acc.done());
 
-    acc = [];
-    var items = App.Env.initialParams.DB.HOST;
-    $.each(items, function (val) {
-        var tpl = App.Templates.get('select_option', 'general');
-        tpl.set(':VALUE', val);
-        tpl.set(':TEXT', items[val]);
-        tpl.set(':SELECTED', val == options.HOST ? 'selected="selected"' : '');
-        acc[acc.length++] = tpl.finalize();
-    });
-    tpl.set(':HOST_OPTIONS', acc.done());
+    var obj = App.Env.initialParams.DB.HOST;
+    var opts = App.HTML.Build.options(obj, options.HOST);
+    tpl.set(':HOST_OPTIONS', opts);
 
-    acc = [];
-    var items = App.Env.initialParams.DB.ENCODING;
-    $.each(items, function (val) {
-        var tpl = App.Templates.get('select_option', 'general');
-        tpl.set(':VALUE', val);
-        tpl.set(':TEXT', items[val]);
-        tpl.set(':SELECTED', val == options.ENCODING ? 'selected="selected"' : '');
-        acc[acc.length++] = tpl.finalize();
-    });
-    tpl.set(':ENCODING_OPTIONS', acc.done());
+
+    var obj = App.Env.initialParams.DB.CHARSET;
+    var opts = App.HTML.Build.options(obj, options.CHARSET);
+    tpl.set(':CHARSET_OPTIONS', opts);
 
     return tpl;
 }
@@ -691,9 +691,11 @@ App.HTML.Build.dns_selects = function (tpl, options) {
         $.each(App.Env.initialParams.DNS.TPL, function (key) {
             obj[key] = key;
         });
-        var opts = App.HTML.Build.options(obj, options.PACKAGE);
+
+        var opts = App.HTML.Build.options(obj, options.TPL);
         tpl.set(':TPL', opts);
-        tpl.set(':TPL_DEFAULT_VALUE', options.TPL || App.Helpers.getFirstKey(obj));
+//        tpl.set(':TPL_DEFAULT_VALUE', options.TPL || App.Helpers.getFirstKey(obj));
+
     } catch (e) {
         return tpl;
     }