User page functionality merger (80%)

web/js/__init__.js

@@ -2,7 +2,7 @@ $(document).ready(function(){
     try{
         App.Utils.detectBrowser();
         
-    App.Env.world = 'DNS';
+        App.Env.world = 'USER';
         App.Pages.init();
         
         App.Ref.init();

web/js/_settings.js

@@ -12,6 +12,7 @@ App.i18n.getMessage = function(key)
 // Constants
 App.Constants.IP_FORM_ID    = 'ip-form';
 App.Constants.DNS_FORM_ID   = 'dns-form';
+App.Constants.USER_FORM_ID  = 'user-form';
 
 App.Settings.ajax_url = 1;
 App.Settings.uri = location.href.replace('index.html', '');

web/js/actions.js

@@ -1,6 +1,13 @@
-/*App.Actions.cancel_ip_form = function(){
+App.Actions.delete_entry = function(evt) 
-    alert(1);
+{
-}*/
+    var confirmed = confirm(App.i18n.getMessage('confirm'));
+    if (!confirmed) {
+        return;
+    }
+    var elm = $(evt.target);
+    var elm = elm.hasClass('row') ? elm : elm.parents('.row');    
+    App.Model.remove(App.Env.world, elm);
+}
 
 App.Actions.show_subform = function(evt)
 {
@@ -81,32 +88,47 @@ App.Actions.save_form = function(evt) {
     var elm_id = App.Env.world + '_FORM_ID';
     var build_method = App.Env.getWorldName() + '_entry';
     
+    if (!App.Validate.form(App.Env.world, elm)) {
+        return App.Validate.displayFormErrors(App.Env.world, elm);
+    }
+    
     if (elm.attr('id') == App.Constants[elm_id]) { // NEW ITEM
         var values = App.Helpers.getFormValues(elm);
         if(App.Validate.form(values, $('#'+elm_id))) {
             App.Model.add(values, source);
-            var tpl = App.HTML.Build[build_method](values, 'new');
+            var form_id = App.Constants[App.Env.world + '_FORM_ID'];
-            $('#' + App.Constants[elm_id]).replaceWith(tpl);
+            $('#'+form_id).remove();
         }
     }
     else { // OLD ITEM, UPDATING IT
         var source = $(elm).find('.source').val();
         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();
+            App.Model.update(values, source, elm);         
+        }
+        /*if(App.Validate.form(values, $('#'+elm_id))) {
             App.Model.update(values, source);           
-            var tpl = App.HTML.Build[build_method](values);
+        }*/
-            elm.replaceWith(tpl);
     }    
 }
-    App.Helpers.updateScreen();
-}
 
 // do_action_edit
 App.Actions.edit = function(evt) {
     var elm = $(evt.target);
     elm = elm.hasClass('row') ? elm : elm.parents('.row');
-    App.Pages[App.Env.world].edit(elm);
+    
-    App.Helpers.updateScreen();
+    var options = elm.find('.source').val();
+    fb.warn(elm);
+    fb.warn(options);
+    var build_method = App.Env.getWorldName() + '_form';    
+    var tpl = App.HTML.Build[build_method](options);
+    elm.replaceWith(tpl);
+    
+    //App.Pages[App.Env.world].edit(elm);
+    //App.Helpers.updateScreen();
 }
 
 // do_cancel_form
@@ -161,3 +183,8 @@ App.Actions.save_dns_subrecords = function(evt)
     
     fb.warn($.toJSON(records));
 }
+
+App.Actions.generate_pass = function()
+{
+    $('.password').val(App.Helpers.generatePassword());
+}

web/js/app.js

@@ -1,5 +1,10 @@
 var _DEBUG = true;
 
+window.jsonParse=function(){var r="(?:-?\\b(?:0|[1-9][0-9]*)(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\\b)",k='(?:[^\\0-\\x08\\x0a-\\x1f"\\\\]|\\\\(?:["/\\\\bfnrt]|u[0-9A-Fa-f]{4}))';k='(?:"'+k+'*")';var s=new RegExp("(?:false|true|null|[\\{\\}\\[\\]]|"+r+"|"+k+")","g"),t=new RegExp("\\\\(?:([^u])|u(.{4}))","g"),u={'"':'"',"/":"/","\\":"\\",b:"\u0008",f:"\u000c",n:"\n",r:"\r",t:"\t"};function v(h,j,e){return j?u[j]:String.fromCharCode(parseInt(e,16))}var w=new String(""),x=Object.hasOwnProperty;return function(h,
+j){h=h.match(s);var e,c=h[0],l=false;if("{"===c)e={};else if("["===c)e=[];else{e=[];l=true}for(var b,d=[e],m=1-l,y=h.length;m<y;++m){c=h[m];var a;switch(c.charCodeAt(0)){default:a=d[0];a[b||a.length]=+c;b=void 0;break;case 34:c=c.substring(1,c.length-1);if(c.indexOf("\\")!==-1)c=c.replace(t,v);a=d[0];if(!b)if(a instanceof Array)b=a.length;else{b=c||w;break}a[b]=c;b=void 0;break;case 91:a=d[0];d.unshift(a[b||a.length]=[]);b=void 0;break;case 93:d.shift();break;case 102:a=d[0];a[b||a.length]=false;
+b=void 0;break;case 110:a=d[0];a[b||a.length]=null;b=void 0;break;case 116:a=d[0];a[b||a.length]=true;b=void 0;break;case 123:a=d[0];d.unshift(a[b||a.length]={});b=void 0;break;case 125:d.shift();break}}if(l){if(d.length!==1)throw new Error;e=e[0]}else if(d.length)throw new Error;if(j){var p=function(n,o){var f=n[o];if(f&&typeof f==="object"){var i=null;for(var g in f)if(x.call(f,g)&&f!==n){var q=p(f,g);if(q!==void 0)f[g]=q;else{i||(i=[]);i.push(g)}}if(i)for(g=i.length;--g>=0;)delete f[i[g]]}return j.call(n,
+o,f)};e=p({"":e},"")}return e}}();
+
 
 (function($){$.toJSON=function(o)
 {if(typeof(JSON)=='object'&&JSON.stringify)
@@ -86,7 +91,7 @@ var App = {
         // pages related views
         Pages: {
             USER: {},
-            WEBDOMAIN: {},
+            WEB_DOMAIN: {},
             MAIL: {},
             DB: {},
             DNS: {},
@@ -97,7 +102,7 @@ var App = {
     Messages: {},
     Model: {
         USER: {},
-        WEBDOMAIN: {},
+        WEB_DOMAIN: {},
         MAIL: {},
         DB: {},
         DNS: {},
@@ -109,7 +114,7 @@ var App = {
     },
     Pages: {
         USER: {},
-        WEBDOMAIN: {},
+        WEB_DOMAIN: {},
         MAIL: {},
         DB: {},
         DNS: {},
@@ -119,8 +124,10 @@ var App = {
     Ref: {},
     Tmp: {},
     Thread: {
-        run: function(delay, ref){
+        run: function(delay, ref)
-            setTimeout(function(){
+        {
+            setTimeout(function()
+            {
                 ref();
             }, delay*10);
         }
@@ -136,7 +143,8 @@ var App = {
 };
 
 // Internals
-Array.prototype.set = function(key, value){
+Array.prototype.set = function(key, value)
+{
     var index = this[0][key];
     this[1][index] = value;
 }
@@ -144,23 +152,27 @@ Array.prototype.get = function(key){
     var index = this[0][key];
     return this[1][index];
 }
-Array.prototype.finalize = function(){
+Array.prototype.finalize = function()
+{
     this.shift();
     this[0] = this[0].join('');
     return this[0];
 }
-Array.prototype.done = function(){
+Array.prototype.done = function()
+{
     return this.join('');
 }
 
-String.prototype.wrapperize = function(key, ns){
+String.prototype.wrapperize = function(key, ns)
+{
     var tpl = App.Templates.get(key, ns);
     tpl.set(':content', this);
     
     return tpl.finalize();
 }
 
-App.Ajax.request = function(jedi_method, data, callback){
+App.Ajax.request = function(jedi_method, data, callback)
+{   
     App.Helpers.beforeAjax(jedi_method);
     $.ajax({
         url: function() {
@@ -176,13 +188,17 @@ App.Ajax.request = function(jedi_method, data, callback){
         global: false,
         type: data.request_method || "POST",
         data: $.extend(data, {'jedi_method': jedi_method}),
-        dataType: "json",
+        dataType: "text",
         async:true,
-        success: function(reply){
+        success: function(reply)
+        {                
+            timer.start();        
+            callback && callback(jsonParse(reply));
             App.Helpers.afterAjax();
-            callback && callback(reply);
+            timer.stop(jedi_method);            
         },
-        error: function() {
+        error: function() 
+        {
             App.View.popup('error');
         }
     });
@@ -207,7 +223,7 @@ timer.stop = function( msg )
 timer.print = function( msg )
 {
     var passed = timer.stop_time - timer.start_time;
-    fb.info( msg || '' + passed / 1000 );
+    fb.info( (msg || '') + ': ' + passed / 1000 );
 }
 
 

web/js/helpers.js

@@ -46,6 +46,7 @@ App.Helpers.beforeAjax = function(jedi_method)
             App.Helpers.showLoading();
             break;
         default:
+            App.Helpers.showLoading();
             break;
     }
 }
@@ -190,3 +191,22 @@ App.Helpers.liveValidate = function()
         fb.log(elm.attr('TAGNAME'));
     });
 }
+
+App.Helpers.generatePassword = function()
+{   
+   var length = 12; 
+   var chars = "abcdefghijklmn.-%$#&-opqrstuvwxyz.-%$#&-ABCDEFGHIJKLMNOPQRSTUV.-%$#&-WXYZ1234567890.-%$#&-";
+   var pass = "";
+
+   for (x=0;x<length;x++) {
+      var i = Math.floor(Math.random() * 62);
+      pass += chars.charAt(i);
+   }
+
+   return pass;
+}
+
+App.Helpers.Warn = function(msg)
+{
+    alert(msg);
+}

web/js/html.js

@@ -1,6 +1,30 @@
-App.HTML.makeDatabases = function(databases){
+App.HTML.setTplKeys = function(tpl, o, empty)
+{
+    var empty = empty || '-';
+    fb.log(empty);
+    tpl.set(':source', $.toJSON(o))
+    $(o).each(function(i, object)
+    {              
+        $.each(o, function(key)
+        {  
+            var val = o[key];     
+            if (empty == true) {       
+                tpl.set(':' + key, val || '');
+            }
+            else {
+                tpl.set(':' + key, val || '-');
+            }
+        });
+    });    
+    
+    return tpl;
+}
+
+App.HTML.makeDatabases = function(databases)
+{
     var acc = [];
-    $(databases).each(function(i, o){
+    $(databases).each(function(i, o)
+    {
         var tpl = App.Templates.get('database', 'database');
         tpl.set(':name', o.Database);
         tpl.set(':db_name', o.Database);
@@ -10,9 +34,11 @@ App.HTML.makeDatabases = function(databases){
     return acc.done();
 }
 
-App.HTML.makeDbTableList = function(data){
+App.HTML.makeDbTableList = function(data)
+{
     var acc = [];
-    $(data).each(function(i, o){
+    $(data).each(function(i, o)
+    {
         var name = App.Helpers.getFirstValue(o);
         var tpl = App.Templates.get('database_table', 'database');
         tpl.set(':name', name);
@@ -23,9 +49,11 @@ App.HTML.makeDbTableList = function(data){
     return acc.done();
 }
 
-App.HTML.makeDbFieldsList = function(data){
+App.HTML.makeDbFieldsList = function(data)
+{
     var acc = [];
-    $(data).each(function(i, o){
+    $(data).each(function(i, o)
+    {
         var details = [o['Type'], o['Null'], o['Key'], o['Default'], o['Extra']].join(' ');
         var tpl = App.Templates.get('database_field', 'database');
         tpl.set(':name', o.Field);
@@ -36,7 +64,8 @@ App.HTML.makeDbFieldsList = function(data){
     return acc.done();
 }
 
-App.HTML.Build.dns_form = function(options, id) {
+App.HTML.Build.dns_form = function(options, id) 
+{
     if('undefined' == typeof App.Env.initialParams) {
         return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
     }
@@ -65,7 +94,8 @@ App.HTML.Build.dns_form = function(options, id) {
     return tpl.finalize();
 }
 
-App.HTML.Build.ip_form = function(options, id) {
+App.HTML.Build.ip_form = function(options, id) 
+{
     if('undefined' == typeof App.Env.initialParams) {
         return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
     }
@@ -92,7 +122,8 @@ App.HTML.Build.ip_form = function(options, id) {
     return tpl.finalize();
 }
 
-App.HTML.Build.ip_selects = function(tpl, options) {
+App.HTML.Build.ip_selects = function(tpl, options) 
+{
     // OWNER
     var opts = App.HTML.Build.options(App.Env.initialParams.IP.SYS_USERS, options.OWNER);
     tpl.set(':owner_options', opts);
@@ -108,7 +139,8 @@ App.HTML.Build.ip_selects = function(tpl, options) {
     return tpl;
 }
 
-App.HTML.Build.dns_selects = function(tpl, options) {    
+App.HTML.Build.dns_selects = function(tpl, options) 
+{    
     try {
         // TPL
         var obj = App.Env.initialParams.DNS.TPL;
@@ -123,7 +155,8 @@ App.HTML.Build.dns_selects = function(tpl, options) {
     return tpl;
 }
 
-App.HTML.Build.options = function(initial, default_value) {
+App.HTML.Build.options = function(initial, default_value) 
+{
     var opts = [];
     $.each(initial, function(key){
        var selected = key == default_value ? 'selected="selected"' : ''; 
@@ -132,20 +165,10 @@ App.HTML.Build.options = function(initial, default_value) {
     return opts.join('');
 }
 
-App.HTML.Build.ip_entry = function(o){
+App.HTML.Build.ip_entry = function(o)
+{
     var tpl = App.Templates.get('ENTRY', 'ip');
-    tpl.set(':source',$.toJSON(o));
+    tpl = App.HTML.setTplKeys(tpl, o);      
-    tpl.set(':NETMASK', o.NETMASK);
-    tpl.set(':IP_ADDRESS', o.IP_ADDRESS);
-    tpl.set(':SYS_USERS', o.U_SYS_USERS);
-    tpl.set(':WEB_DOMAINS', o.U_WEB_DOMAINS);
-    tpl.set(':DATE', o.DATE);
-    tpl.set(':INTERFACE', o.INTERFACE);
-    tpl.set(':NAME', o.NAME);
-    tpl.set(':OWNER', o.OWNER);
-    tpl.set(':STATUS', o.STATUS);
-    tpl.set(':U_SYS_USERS', o.U_SYS_USERS);
-    tpl.set(':U_WEB_DOMAINS', o.U_WEB_DOMAINS);
        
     if (App.Constants.SUSPENDED_YES == o.SUSPENDED) {
         var sub_tpl = App.Templates.get('SUSPENDED_TPL_ENABLED', 'ip');
@@ -159,34 +182,19 @@ App.HTML.Build.ip_entry = function(o){
     return tpl.finalize();
 }
 
-App.HTML.Build.dns_entry = function(o, is_new){
+App.HTML.Build.dns_entry = function(o, is_new)
+{
     var tpl = App.Templates.get('ENTRY', 'dns');
-    tpl.set(':source', App.Helpers.toJSON(o));
+    tpl = App.HTML.setTplKeys(tpl, o);      
-    tpl.set(':DNS_DOMAIN', o.DNS_DOMAIN);
+    
     var ip = o.IP.split('.');
     tpl.set(':IP', ip.join('<span class="dot">.</span>'));    
-    tpl.set(':TTL', o.TTL);
-    tpl.set(':TPL', o.TPL);
-    tpl.set(':SOA', o.SOA);
-    tpl.set(':TTL', o.TTL);
-    tpl.set(':DATE', o.DATE);
     tpl.set(':CHECKED', '');
     if (is_new) {
         var now = new Date();
         tpl.set(':DATE', now.format("d.mm.yyyy"));
     }
-    /*tpl.set(':NETMASK', o.NETMASK);
+    
-    tpl.set(':IP_ADDRESS', o.IP_ADDRESS);
-    tpl.set(':SYS_USERS', o.U_SYS_USERS);
-    tpl.set(':WEB_DOMAINS', o.U_WEB_DOMAINS);
-    tpl.set(':DATE', o.DATE);
-    tpl.set(':INTERFACE', o.INTERFACE);
-    tpl.set(':NAME', o.NAME);
-    tpl.set(':OWNER', o.OWNER);
-    tpl.set(':STATUS', o.STATUS);
-    tpl.set(':U_SYS_USERS', o.U_SYS_USERS);
-    tpl.set(':U_WEB_DOMAINS', o.U_WEB_DOMAINS);
-    */
     if (App.Constants.SUSPENDED_YES == o.SUSPEND) {
         var sub_tpl = App.Templates.get('SUSPENDED_TPL_ENABLED', 'dns');
     }
@@ -199,6 +207,118 @@ App.HTML.Build.dns_entry = function(o, is_new){
     return tpl.finalize();
 }
 
+App.HTML.Build.user_entry = function(o, key)
+{
+    var processed_data = {
+        'NICKNAME': key,
+        'BANDWIDTH_PERCENTS': 90,
+        'U_DISK_PERCENTS': 80
+    };
+    var o = $.extend(o, processed_data);
+    var tpl = App.Templates.get('ENTRY', 'user');  
+    tpl = App.HTML.setTplKeys(tpl, o);
+       
+    if (App.Constants.SUSPENDED_YES == o.SUSPENDED) {
+        var sub_tpl = App.Templates.get('SUSPENDED_TPL_ENABLED', 'ip');
+    }
+    else {
+        var sub_tpl = App.Templates.get('SUSPENDED_TPL_DISABLED', 'ip');
+    }
+    tpl.set(':SUSPENDED_TPL', sub_tpl.finalize());
+    
+    return tpl.finalize();
+}
+
+
+App.HTML.Build.user_form = function(options, id) 
+{
+    if('undefined' == typeof App.Env.initialParams) {
+        return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
+    }
+    var tpl = App.Templates.get('FORM', 'user');
+    tpl.set(':source', options);
+    tpl.set(':id', id || '');
+    options = App.Helpers.evalJSON(options) || {};
+    if (App.Helpers.isEmpty(options)) {
+       tpl.set(':title', 'New user'); 
+       tpl.set(':save_button', 'ADD'); 
+    }
+    else {
+        tpl.set(':title', 'Edit user'); 
+        tpl.set(':save_button', 'SAVE'); 
+    }
+    
+    options = !App.Helpers.isEmpty(options) ? options : {'CONTACT':'', 'PASSWORD':'','LOGIN_NAME':'','NS':''};
+    
+    tpl = App.HTML.setTplKeys(tpl, options, true);        
+    tpl = App.HTML.Build.user_selects(tpl, options);
+    
+    return tpl.finalize();
+}
+
+App.HTML.Build.web_domain_entry = function(o, key)
+{    
+    // TODO:
+    /*<span class="domain-name">~!:ALIAS~!,</span>\
+								<span class="domain-name">naumov-socolov.org.md,</span>\
+								<span class="domain-name">naumov-socolov.to</span>\*/
+    var processed_data = {
+        DOMAIN: key
+    };
+    var o = $.extend(o, processed_data);
+    //fb.info(o);
+    var tpl = App.Templates.get('ENTRY', 'web_domain');
+    tpl = App.HTML.setTplKeys(tpl, o);      
+    
+    /*if (App.Constants.SUSPENDED_YES == o.SUSPENDED) {
+        var sub_tpl = App.Templates.get('SUSPENDED_TPL_ENABLED', 'ip');
+    }
+    else {
+        var sub_tpl = App.Templates.get('SUSPENDED_TPL_DISABLED', 'ip');
+    }
+    
+    tpl.set(':SUSPENDED_TPL', sub_tpl.finalize());
+    */
+    return tpl.finalize();
+}
+
+App.HTML.Build.mail_entry = function(o, key)
+{        
+    var processed_data = {
+        DOMAIN: key
+    };
+    var o = $.extend(o, processed_data);
+    var tpl = App.Templates.get('ENTRY', 'mail');
+    tpl = App.HTML.setTplKeys(tpl, o);      
+    
+    return tpl.finalize();
+}
+
+App.HTML.Build.db_entry = function(o, key)
+{        
+    var processed_data = {
+        DOMAIN: key
+    };
+    var o = $.extend(o, processed_data);
+    var tpl = App.Templates.get('ENTRY', 'db');
+    tpl = App.HTML.setTplKeys(tpl, o);      
+    
+    return tpl.finalize();
+}
+
+App.HTML.Build.cron_entry = function(o, key)
+{        
+    var processed_data = {
+        DOMAIN: key
+    };
+    var o = $.extend(o, processed_data);    
+    var tpl = App.Templates.get('ENTRY', 'cron');
+    tpl = App.HTML.setTplKeys(tpl, o);      
+    
+    return tpl.finalize();
+}
+    
+
 App.HTML.Build.dns_records = function(records)
 {
     var acc = [];
@@ -206,7 +326,7 @@ App.HTML.Build.dns_records = function(records)
     {
         var record = records[i];
         var tpl = App.HTML.Build.dns_subrecord(record);
-        acc[acc.length] = tpl.finalize();
+        acc[acc.length++] = tpl.finalize();
     });
     
     return acc.done();
@@ -224,3 +344,42 @@ App.HTML.Build.dns_subrecord = function(record)
     return tpl;
 }
 
+App.HTML.Build.user_selects = function(tpl, options)
+{
+    var acc = [];
+    // PACKAGE
+    var pkg = App.Env.initialParams.USERS.PACKAGE;
+    $.each(pkg, function(val)
+    {
+        var tpl = App.Templates.get('select_option', 'general');
+        tpl.set(':VALUE', val);
+        tpl.set(':TEXT', pkg[val]);
+        acc[acc.length++] = tpl.finalize();
+    });
+    tpl.set(':PACKAGE_OPTIONS', acc.done());
+    // ROLE
+    acc = [];
+    var roles = App.Env.initialParams.USERS.ROLE;
+    $.each(roles, function(val)
+    {
+        var tpl = App.Templates.get('select_option', 'general');
+        tpl.set(':VALUE', val);
+        tpl.set(':TEXT', roles[val]);
+        acc[acc.length++] = tpl.finalize();
+    });
+    tpl.set(':ROLE_OPTIONS', acc.done());
+    // SHELL
+    acc = [];
+    var shell = App.Env.initialParams.USERS.SHELL;
+    $.each(shell, function(val)
+    {
+        var tpl = App.Templates.get('select_option', 'general');
+        tpl.set(':VALUE', val);
+        tpl.set(':TEXT', shell[val]);
+        acc[acc.length++] = tpl.finalize();
+    });
+    tpl.set(':SHELL_OPTIONS', acc.done());
+    
+    return tpl;
+}
+

web/js/model.js

@@ -1,31 +1,95 @@
-App.Model.DNS.loadList = function(){
+App.Model.DNS.loadList = function()
+{
     App.Ajax.request('DNS.getList', {}, App.View.listItems);
 }
 
-App.Model.IP.loadList = function(){
+App.Model.IP.loadList = function()
+{
     App.Ajax.request('IP.getList', {}, App.View.listItems);
 }
 
-App.Model.add = function(values, source_json) {    
+App.Model.USER.loadList = function()
+{
+    App.Ajax.request('USER.getList', {}, App.View.listItems);
+}
+
+App.Model.WEB_DOMAIN.loadList = function()
+{
+    App.Ajax.request('WEB_DOMAIN.getList', {}, App.View.listItems);
+}
+
+App.Model.MAIL.loadList = function()
+{
+    App.Ajax.request('MAIL.getList', {}, App.View.listItems);
+}
+
+App.Model.DB.loadList = function()
+{
+    App.Ajax.request('DB.getList', {}, App.View.listItems);
+}
+
+App.Model.CRON.loadList = function()
+{
+    App.Ajax.request('CRON.getList', {}, App.View.listItems);
+}
+
+
+App.Model.add = function(values, source_json) 
+{    
     var method = App.Settings.getMethodName('add');
     App.Ajax.request(method, {
         spell: $.toJSON(values)
     }, function(reply){
         if(!reply.result) {
-            alert('FALSE');
+            App.Helpers.Warn('Changes were not applied');
+        }
+        else {
+            var build_method = App.Env.getWorldName() + '_entry';
+            var tpl = App.HTML.Build[build_method](values, 'new');
+            App.Ref.CONTENT..replaceWith(tpl);
+            // todo: reply.data;
         }
     });
 }
 
-App.Model.update = function(values, source_json) {    
+App.Model.remove = function(world, elm)
+{
+    var method = App.Settings.getMethodName('delete');     
+    App.Ajax.request(method,
+    {
+        spell: $('.source', elm).val()
+    },
+    function(reply) 
+    {
+        if (!reply.result) {
+            App.Helpers.Warn('Changes were not applied');
+        }
+        else {
+            $(elm).remove();
+        }
+    });
+}
+
+App.Model.update = function(values, source_json, elm) 
+{    alert(source_json);
     var method = App.Settings.getMethodName('update');
+    var build_method = App.Env.getWorldName() + '_entry';
     App.Ajax.request(method, {
         'old': source_json,
         'new': App.Helpers.toJSON(values)
     }, function(reply){
         if(!reply.result) {
-            alert('FALSE');
+            var tpl = App.HTML.Build[build_method](App.Helpers.evalJSON(source_json));
+            $(elm).replaceWith(tpl);
+            App.Helpers.updateScreen();
+            App.Helpers.Warn('Changes were not applied');            
         }
+        else {
+            var tpl = App.HTML.Build[build_method](reply.data);
+            $(elm).replaceWith(tpl);
+            App.Helpers.updateScreen();
+        }
+        // TODO: !
     });
 }
 

web/js/pages.js

@@ -44,91 +44,3 @@ App.Pages.DNS.edit = function(elm) {
     var tpl = App.HTML.Build.dns_form(options);
     elm.replaceWith(tpl);
 }
-
-/*
-
-
-
-//
-//  DNS
-
-
-App.Pages.DNS.saveForm = function(evt, params){
-    var elm = $(evt.target);
-    elm = elm.parents('.b-new-entry');
-    
-    if (elm.attr('id') == App.Constants.DNS_FORM_ID) {
-        var values = App.Helpers.getFormValues(elm);
-        if(App.Validate.dnsForm(values)) {
-            App.Model.DNS.update(values, source);
-            var tpl = App.HTML.Build.dns_entry(values);
-            $('#' + App.Constants.DNS_FORM_ID).replaceWith(tpl);
-        }
-    }
-    else {
-        var source = $(elm).find('.source').val();
-        var values = App.Helpers.getFormValues(elm);
-        if(App.Validate.dnsForm(values)) {
-            App.Model.DNS.update(values, source);
-            var tpl = App.HTML.Build.dns_entry(values);
-            elm.replaceWith(tpl);
-        }
-    }
-    App.Helpers.updateScreen();
-}
-
-// 
-//  IP
-App.Pages.IP.prepareHTML = function(){
-    App.Model.IP.loadList();
-}
-
-App.Pages.IP.saveForm = function(evt, params){
-    var elm = $(evt.target);
-    elm = elm.parents('.b-new-entry');
-    
-    if (elm.attr('id') == App.Constants.IP_FORM_ID) {
-        var values = App.Helpers.getFormValues(elm);
-        if(App.Validate.ipForm(values)) {
-            App.Model.IP.update(values, source);
-            var tpl = App.HTML.Build.ip_entry(values);
-            $('#' + App.Constants.IP_FORM_ID).replaceWith(tpl);
-        }
-    }
-    else {
-        var source = $(elm).find('.source').val();
-        var values = App.Helpers.getFormValues(elm);
-        if(App.Validate.ipForm(values)) {
-            App.Model.IP.update(values, source);
-            var tpl = App.HTML.Build.ip_entry(values);
-            elm.replaceWith(tpl);
-        }
-    }
-    App.Helpers.updateScreen();
-}
-*/
-
-/*
-App.Pages.IP.edit = function(elm) {
-    var options = elm.find('.source').val();
-    fb.warn(elm);
-    fb.warn(options);
-    var tpl = App.HTML.Build.ip_form(options);
-    elm.replaceWith(tpl);
-}
-
-App.Pages.IP.ipNotSaved = function(reply) {
-    return App.Helpers.alert(reply.message);
-}
-
-App.Pages.IP.remove = function(evt) {
-    var confirmed = confirm('Are you sure?');
-    if (!confirmed) {
-        return;
-    }
-    var elm = $(evt.target);
-    elm.parents('.ip-details-row');
-    var values = elm.find('.source').val();
-    App.Model.IP.remove(values, elm);
-}
-*/

web/js/templates.js

@@ -21,6 +21,8 @@ App.Templates.html = {
                 </div>'],
         popup: ['<div class="black_overlay" id="popup-bg"></div>\
                 <div class="popup_content" id="popup"><button class="do_action_close_popup">close</button>~!:content~!</div>'],
+        select_option: ['<option ~!:SELECTED~! value="~!:VALUE~!">~!:TEXT~!</option>'],
+        error_elm: ['<div class="error-box">~!:ERROR~!</div>']     
     },
     popup: {
         error: ['<div class="error"><center><h1 style="color: red;">Important: An Error Has Occured.</h1><hr></center>&nbsp;&nbsp;&nbsp;&nbsp;Something went wrong and some of your actions can be not saved in system. Mostly, it happens when you have network connection errors.<br>,&nbsp;&nbsp;&nbsp;&nbsp;However, please notify us about the situation. It would be helpfull if you will write us approximate time the error occured and last actions you were performing. You send your petition on <a href="mail_to">this email: BLABLA</a>,<br><br><center><span style="color: rgb(92, 92, 92);">Sorry for inconvinience. (We recommend you to reload the page)</span></center></div>']
@@ -38,7 +40,7 @@ App.Templates.html = {
                     <div class="errors">\
                     </div>\
                     <div class="form-row cc">\
-                            <input type="hidden" value="~!:DATE~!" class="DATE">\
+                            <input type="hidden" value="~!:DATE~!" name="DATE">\
                             <label for="#" class="field-label">domain:</label>\
                             <input type="text" name="DNS_DOMAIN" value="~!:DNS_DOMAIN~!" class="text-field DNS_DOMAIN">\
                     </div>\
@@ -75,7 +77,7 @@ App.Templates.html = {
         SUSPENDED_TPL_ENABLED : ['<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>\
                                 <span class="delete-entry"><span class="delete-entry-text do_action_delete_ip">delete</span></span>'],
         SUSPENDED_TPL_DISABLED : ['<span class="ip-status-info ip-suspended-status do_action_delete_dns"><span class="ip-status-text">suspended</span></span>'],
-        ENTRIES_WRAPPER: ['<div class="dns-list">~!:content~!</div>'],
+        ENTRIES_WRAPPER: ['<div class="dns-list items-list">~!:content~!</div>'],
         ENTRY: ['<div class="row dns-details-row ~!:CHECKED~!">\
                             <input type="hidden" name="source" class="source" value=\'~!:source~!\'>\
                             <input type="hidden" class="target" name="target" value="" />\
@@ -83,7 +85,7 @@ App.Templates.html = {
                                         <div class="check-this check-control"></div>\
                                         <div class="row-operations">\
                                                 ~!:SUSPENDED_TPL~!\
-                                                <span class="delete-entry"><span class="delete-entry-text">delete</span></span>\
+                                                <span class="delete-entry"><span class="delete-entry-text do_action_delete_entry">delete</span></span>\
                                         </div>\
                                 </div>\
                                 <div class="row-meta">\
@@ -260,10 +262,400 @@ App.Templates.html = {
                 </div><!-- // .row-details -->\
         </div>\
         '],
-        ENTRIES_WRAPPER: ['<div class="ip-list">~!:content~!</div>'],
+        ENTRIES_WRAPPER: ['<div class="ip-list items-list">~!:content~!</div>'],
         SUSPENDED_TPL_ENABLED : ['<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>\
                                 <span class="delete-entry"><span class="delete-entry-text do_action_delete_ip">delete</span></span>'],
         SUSPENDED_TPL_DISABLED : ['<span class="ip-status-info ip-suspended-status do_action_delete_ip"><span class="ip-status-text">suspended</span></span>']
+    },
+    user: {
+        ENTRIES_WRAPPER: ['<div class="users-list items-list">~!:content~!</div>'],
+        FORM:  ['<div id="~!:id~!" class="b-new-entry b-new-entry_user">\
+                        <input type="hidden" name="source" class="source" value=\'~!:source~!\'>\
+                        <input type="hidden" name="target" class="target" value=\'\'>\
+						<div class="entry-header">~!:title~!</div>\
+						<div class="form-error hidden">\
+						</div>\
+						<div class="form-row cc">\
+							<label for="#" class="field-label">username:</label>\
+							<input type="text" class="text-field" value="~!:LOGIN_NAME~!" name="LOGIN_NAME">\
+						</div>\
+						<div class="form-row pwd-box cc">\
+							<label for="#" class="field-label">password:</label>\
+							<input type="text" class="text-field password" name="PASSWORD" value="~!:PASSWORD~!">\
+							<span class="generate-pwd do_action_generate_pass">Generate</span>\
+						</div>\
+						<div class="form-row cc">\
+							<label for="#" class="field-label">package:</label>\
+							<select name="PACKAGE" class="not-styled">\
+								~!:PACKAGE_OPTIONS~!\
+							</select>\
+						</div>\
+                        <div class="form-row cc">\
+							<label for="#" class="field-label">shell:</label>\
+							<select class="not-styled" name="SHELL">\
+								~!:SHELL_OPTIONS~!\
+							</select>\
+						</div>\
+						<div class="form-row cc">\
+							<label for="#" class="field-label">role:</label>\
+							<select class="not-styled" name="ROLE">\
+								~!:ROLE_OPTIONS~!\
+							</select>\
+						</div>\
+						<div class="form-row cc">\
+							<label for="#" class="field-label">contact email:</label>\
+							<input type="text" name="CONTACT" class="text-field" value="~!:CONTACT~!">\
+						</div>\
+						<div class="form-row cc">\
+							<label for="#" class="field-label">reports:</label>\
+							<input type="checkbox" name="REPORTS_ENABLED" class="not-styled" value="~!:REPORTS_ENABLED~!">\
+						</div>\
+						<div class="form-row cc">\
+							<label for="#" class="field-label">ns1:</label>\
+							<input type="text" name="NS" class="text-field" value="~!:NS~!">\
+						</div>\
+						<!-- div class="form-row cc">\
+							<label for="#" class="field-label">ns2:</label>\
+							<input type="text" value="custom-edge-cdn2.digital-photography-school.com" class="text-field">\
+						</div -->\
+                        <div class="form-row buttons-row cc">\
+							<input type="submit" value="~!:save_button~!" name="save" class="add-entry-btn do_action_save_form">\
+							<span class="cancel-btn do_action_cancel_form">Cancel</span>\
+							<a class="help-btn" href="http://vestacp.com/docs/user/" target="_blank">Help</a>\
+						</div>\
+					</div>'],
+        ENTRY: ['<div class="row first-row user-details-row">\
+                    <input type="hidden" class="source" name="source" value=\'~!:source~!\' />\
+                    <input type="hidden" class="target" name="target" value="" />\
+						<div class="row-actions-box cc">\
+							<div class="check-this check-control"></div>\
+							<div class="row-operations">\
+								~!:SUSPENDED_TPL~!\
+								<span class="delete-entry do_action_delete_entry"><span class="delete-entry-text do_action_delete_entry">delete</span></span>\
+							</div>\
+						</div>\
+						<div class="row-meta">\
+							<div class="entry-created">~!:DATE~!</div>\
+							<div class="ownership">\
+								<span class="prop-box">\
+									<span class="prop-title">owner:</span>\
+									<span class="prop-value">~!:OWNER~!</span>\
+								</span>\
+							</div>\
+						</div>\
+						<div class="row-details cc">\
+							<div class="props-main">\
+								<div class="user-wrap">\
+									<div class="username-box">\
+										<span class="user">\
+											<span class="nickname do_action_edit">~!:LOGIN_NAME~!</span>\
+											<span class="role">(~!:ROLE~!)</span>\
+										</span>\
+										<span class="prop-box template-box">\
+											<span class="prop-title">package:</span>\
+											<span class="prop-value">~!:PACKAGE~!</span>\
+										</span>\
+									</div>\
+									<div class="user-details-box">\
+                                        <span class="prop-box user-name">\
+                                            <span class="prop-title">name:</span>\
+                                            <span class="prop-value">~!:FULLNAME~!</span>\
+                                        </span>\
+                                        <span class="prop-box prop-box_group-values cc user-details">\
+                                            <span class="prop-title">email:</span>\
+                                            <span class="group-values">\
+                                                <span class="prop-value user-email">~!:CONTACT~!</span>\
+                                                <span class="prop-value user-reports">(reports ~!:REPORTS_ENABLED~!)</span>\
+                                                </span>\
+                                        </span>\
+                                        <span class="prop-box childs-box">\
+                                        <span class="prop-title">childs:</span>\
+                                            <span class="prop-value prop-value-collapsed-childs">~!:U_CHILDS~! (~!:MAX_CHILDS~!)</span>\                                        </span>\
+									</div>\
+								</div>\
+								<!-- disk usage block -->\
+								<div class="b-usage-box disk-usage cc">\
+									<span class="prop-title">disk usage:</span>\
+									<div class="usage-box">\
+										<div class="value-box">\
+											<span class="value">~!:U_DISK~!</span>\
+											<div class="graph low">\
+												<span style="width:~!:U_DISK_PERCENTAGE~!%;" class="bar"></span>\
+											</div>\
+										</div>\
+										<div class="max-size">~!:DISK_QUOTA~!<span class="units">~!:DISK_QUOTA_MEASURE~!</span></div>\
+									</div>\
+								</div><!-- // disk usage block -->\
+								<!-- bandwidth usage block -->\
+								<div style="margin-bottom:25px;" class="b-usage-box bandwidth-box cc">\
+									<span class="prop-title">bandwidth:</span>\
+									<div class="usage-box">\
+										<div class="value-box">\
+											<span class="value">~!:U_BANDWIDTH~!</span>\
+											<div class="graph low">\
+												<span style="width:30%;" class="bar"></span>\
+											</div>\
+										</div>\
+										<div class="max-size">~!:BANDWIDTH~!<span class="units">~!:BANDWIDTH_MEASURE~!</span></div>\
+									</div>\
+								</div><!-- // bandwidth usage block -->\
+								<!-- disk usage block -->\
+								 <!-- // disk usage block -->\
+								<!-- bandwidth usage block -->\
+								 <!-- // bandwidth usage block -->\
+                                 </div>\
+							<div class="props-additional">\
+								<span class="prop-box webdomains-box">\
+									<span class="prop-title">web domains:</span>\
+									<span class="prop-value">~!:U_DNS_DOMAINS~! (~!:WEB_DOMAINS~!)</span>\
+								</span>\
+								<span class="prop-box websl-box">\
+									<span class="prop-title">web ssl:</span>\
+									<span class="prop-value">~!:U_WEB_SSL~! (~!:WEB_SSL~!)</span>\
+								</span>\
+								<span class="prop-box webalias-box">\
+									<span class="prop-title">web alias:</span>\
+									<span class="prop-value prop-value-collapsed-childs">(~!:WEB_ALIASES~!) per domain</span>\
+								</span>\
+								<span class="prop-box prop-box_group-values cc webtpl-box">\
+									<span class="prop-title">web templates:</span>\
+									<span class="group-values group-values__bullet">\
+										~!:WEB_TPL~!\
+									</span>\
+								</span>\
+								<span class="prop-box db-box">\
+									<span class="prop-title">databases:</span>\
+									<span class="prop-value">~!:U_DATABASES~! (~!:DATABASES~!)</span>\
+								</span>\
+								<span class="prop-box shell-box">\
+									<span class="prop-title">shell:</span>\
+									<span class="prop-value">~!:SHELL~!</span>\
+								</span>\
+								<span class="prop-box backups-box">\
+									<span class="prop-title">backups:</span>\
+									<span class="prop-value">retention ~!:BACKUPS~!</span>\
+								</span>\
+							</div>\
+							<div class="props-ext">\
+								<span class="prop-box mailboxes-box">\
+									<span class="prop-title">mailboxes:</span>\
+									<span class="prop-value">~!:U_MAIL_BOXES~! (~!:MAIL_BOXES~!)</span>\
+								</span>\
+								<span class="prop-box mailfwds-box">\
+									<span class="prop-title">mail forwarders:</span>\
+									<span class="prop-value">~!:U_MAIL_FORWARDERS~! (~!:MAIL_FORWARDERS~!)</span>\
+								</span>\
+								<span class="prop-box maildomains-box">\
+									<span class="prop-title">mail domains:</span>\
+									<span class="prop-value">~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)</span>\
+								</span>\
+								<span class="prop-box dnsdomains-box">\
+									<span class="prop-title">dns domains:</span>\
+									<span class="prop-value">~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)</span>\
+								</span>\
+								<span class="prop-box prop-box_group-values cc ns-list-box">\
+									<span class="prop-title">ns list:</span>\
+									<span class="group-values group-values__bullet">~!:NS~!</span>\
+								</span>\
+							</div>\
+						</div><!-- // .row-details -->\
+					</div>']
+    },
+    web_domain: {
+        ENTRIES_WRAPPER: ['<div class="domains-list items-list">~!:content~!</div>'],
+        ENTRY: ['<div class="row first-row domain-details-row">\
+						<div class="row-actions-box cc">\
+							<div class="check-this check-control"></div>\
+							<div class="row-operations">\
+								<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>\
+								<span class="delete-entry"><span class="delete-entry-text">delete</span></span>\
+							</div>\
+						</div>\
+						<div class="row-meta">\
+							<div class="entry-created">~!:DATE~!</div>\
+						</div>\
+						<div class="row-details cc">\
+							<div class="names">\
+								<strong class="domain-name primary">~!:DOMAIN~!</strong>\
+								<span class="alias-title">Alias:</span>\
+								~!:ALIAS~!\
+							</div>\
+							<div class="props-main">\
+								<div class="ip-adr-box">\
+									<span class="ip-adr">~!:IP~!</span>\
+									<span class="prop-box template-box">\
+										<span class="prop-title">template:</span>\
+										<span class="prop-value">~!:TPL~!</span>\
+									</span>\
+								</div>\
+								<!-- disk usage block -->\
+								<div class="b-usage-box disk-usage cc">\
+									<span class="prop-title">disk usage:</span>\
+									<div class="usage-box">\
+										<div class="value-box">\
+											<span class="value">~!:U_DISK~!</span>\
+											<div class="graph low">\
+												<span style="width:~!:U_DISK_PERCENTS~!%;" class="bar"></span>\
+											</div>\
+										</div>\
+										<div class="max-size">~!:DISK~!<span class="units">Mb</span></div>\
+									</div>\
+								</div><!-- // disk usage block -->\
+								<!-- bandwidth usage block -->\
+								<div class="b-usage-box bandwidth-box cc">\
+									<span class="prop-title">bandwidth:</span>\
+									<div class="usage-box">\
+										<div class="value-box">\
+											<span class="value">~!:U_BANDWIDTH~!</span>\
+											<div class="graph low">\
+												<span style="width:U_BANDWIDTH_PERCENTS%;" class="bar"></span>\
+											</div>\
+										</div>\
+										<div class="max-size">~!:BANDWIDTH~! <span class="units">Mb</span></div>\
+									</div>\
+								</div><!-- // bandwidth usage block -->\
+							</div>\
+							<div class="props-additional">\
+								<span class="prop-box php-box">\
+									<span class="prop-title">php:</span>\
+									<span class="prop-value">~!:PHP~!</span>\
+								</span>\
+								<span class="prop-box cgi-box">\
+									<span class="prop-title">cgi:</span>\
+									<span class="prop-value">~!:CGI~!</span>\
+								</span>\
+								<span class="prop-box elog-box">\
+									<span class="prop-title">elog:</span>\
+									<span class="prop-value">~!:ELOG~!</span>\
+								</span>\
+								<span class="prop-box stats-box">\
+									<span class="prop-title">stats:</span>\
+									<span class="prop-value">~!:STATS~!</span>\
+									<span class="stats-auth stats-auth-on">\
+										<span class="stats-auth-text">~!:STATS_AUTH~!</span>\
+									</span>\
+								</span>\
+							</div>\
+							<div class="props-ext">\
+								<span class="prop-box ssl-box">\
+									<span class="prop-title">ssl:</span>\
+									<span class="prop-value">~!:SSL~!</span>\
+								</span>\
+								<span class="prop-box nginx-box">\
+									<span class="prop-title">nginx:</span>\
+									<span class="prop-value">~!:NGINX~!</span>\
+									<span class="nginx-ext-list">extension list</span>\
+								</span>\
+							</div>							\
+						</div><!-- // .row-details -->\
+					</div>']
+    },
+    db: {
+        ENTRIES_WRAPPER: ['<div class="db-list">~!:content~!</div>'],
+        ENTRY: ['<div class="row first-row db-details-row">\
+						<div class="row-actions-box cc">\
+							<div class="check-this check-control"></div>\
+							<div class="row-operations">\
+								<span class="delete-entry"><span class="delete-entry-text">delete</span></span>\
+							</div>\
+						</div>\
+						<div class="row-meta">\
+							<div class="ownership">\
+								<span class="prop-box">\
+									<span class="prop-value">Javier Henneman</span>\
+								</span>\
+							</div>\
+							<div class="entry-created">~!:DATE~!</div>\
+						</div>\
+						<div class="row-details cc">\
+							<div class="props-main">\
+								<div class="db-name-box">\
+									<span class="db-name">~!:DB_NAME~!</span>\
+								</div>\
+							</div>\
+							<div class="props-additional">\
+								<div class="db-user-box cc">\
+									<span class="db-user-wrap">\
+										<span class="db-user">~!:USER~!</span>\
+									</span>\
+									<span class="change-pwd">change password</span>										\
+								</div>\
+								<div class="db-user-box cc">\
+									<span class="db-user-wrap">\
+										<span class="db-user">socialmediaexaminer (read only)</span>\
+									</span>\
+									<span class="change-pwd">change password</span>										\
+								</div>\
+								<span class="add-db-user">Add user</span>\
+							</div>\
+							<div class="props-ext">\
+								<span class="backup-db">backup</span>\
+								<!-- disk usage block -->\
+								<div class="b-usage-box disk-usage cc">\
+									<div class="usage-box">\
+										<div class="value-box">\
+											<span class="value">~!:U_DISK~!</span>\
+											<div class="graph middle">\
+												<span style="width:55%;" class="bar"></span>\
+											</div>\
+										</div>\
+										<div class="max-size">~!:DISK~! <span class="units">Mb</span></div>\
+									</div>\
+								</div><!-- // disk usage block -->\
+							</div>\
+						</div><!-- // .row-details -->\
+					</div>']
+    },
+    cron: {
+        ENTRIES_WRAPPER: ['<div class="db-list">~!:content~!</div>'],
+        ENTRY: ['<div class="row first-row cron-details-row">\
+						<div class="row-actions-box cc">\
+							<div class="check-this check-control"></div>\
+							<div class="row-operations">\
+								<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>\
+								<span class="delete-entry"><span class="delete-entry-text">delete</span></span>\
+							</div>\
+						</div>\
+						<div class="row-meta">\
+							<div class="entry-created">~!:DATE~!</div>\
+						</div>\
+						<div class="row-details cc">\
+							<div class="cron-meta">\
+								<span class="prop-box cron-min">\
+									<span class="prop-title">min</span>\
+									<span class="prop-value">~!:MIN~!</span>\
+								</span>\
+								<span class="prop-box cron-hour">\
+									<span class="prop-title">hour</span>\
+									<span class="prop-value">~!:HOUR~!</span>\
+								</span>\
+								<span class="prop-box cron-day">\
+									<span class="prop-title">day of Month</span>\
+									<span class="prop-value">~!:DAY~!</span>\
+								</span>\
+								<span class="prop-box cron-month">\
+									<span class="prop-title">Month</span>\
+									<span class="prop-value">~!:MONTH~!</span>\
+								</span>\
+								<span class="prop-box cron-week">\
+									<span class="prop-title">day of Week</span>\
+									<span class="prop-value">~!:WDAY~!</span>\
+								</span>\
+							</div>\
+							<div class="cron-command-box">\
+								<strong class="cron-command-line">~!:CMD~!</strong>\
+							</div>\
+							<div class="cron-reported-to">\
+								<span class="prop-box cron-report-box">\
+									<span class="prop-title">reported to:</span>\
+									<span class="prop-value">naumov.socolov@gmail.com,</span>\
+									<span class="prop-value">vasysualiy.pupkin@gmail.com,</span>\
+									<span class="prop-value">na-derevniu-dedushke@dachniy-poselok-za-mkadom.com,</span>\
+									<span class="prop-value">vasysualiy.pupkin@gmail.com</span>\
+								</span>\
+							</div>\
+						</div><!-- // .row-details -->\
+					</div>']
     }
 }
 

web/js/validators.js

@@ -15,18 +15,38 @@ App.Validate.Is = {
 
 
 
-App.Validate.form = function(values, form_ref){    
+App.Validate.form = function(world, elm)
-    // TODO: validate it!
+{    
-    return true;
+    var form_valid = true;
-    var errors = [];
+    App.Env.FormError = [];
-    $.each(values, function(key) {
+    $(elm).find('select, input, textarea').each(function(i, field)
-        var value = values[key];
+    {
-        /*if ('undefined' != typeof App.Validate.Is[key] ) {            
+        if ($.inArray($(field).attr('name'), ['target', 'source', 'save']) != -1) {
-            if(var error = App.Validate.Is[key](value)) {
+            //return; // pass            
-                errors[erros.length++] = error;
+        }
+        else {
+        
+            if ($(field).val().trim() == '') {
+                App.Env.FormError.push($(field).attr('name') + ' is required');
+                form_valid = false;
+            }
         }
-        }*/
     });
+    return form_valid;
+}
+
+App.Validate.displayFormErrors = function(world, elm)
+{
+    var errors_tpl = '';
+    $(App.Env.FormError).each(function(i, error)
+    {
+        var tpl = App.Templates.get('error_elm', 'general');
+        tpl.set(':ERROR', error);
+        errors_tpl += tpl.finalize();
+    });
+    var ref = $('.form-error', elm);
+    ref.removeClass('hidden');
+    ref.html(errors_tpl);
 }
 
 

web/js/view.js

@@ -1,5 +1,5 @@
-
+App.View.popup = function(content) 
-App.View.popup = function(content) {
+{
     var tpl = App.Templates.get('popup', 'general');
     if ('undefined' != typeof App.Templates.html.popup[content]) {
         var content = App.Templates.get(content, 'popup').finalize();
@@ -10,12 +10,14 @@ App.View.popup = function(content) {
     $(document.body).append(tpl.finalize());
 }
 
-App.View.closePopup = function(){
+App.View.closePopup = function()
+{
     $('.black_overlay').remove();
     $('.popup_content').remove();
 }
 
-App.View.updateInitialInfo = function(key, object) {
+App.View.updateInitialInfo = function(key, object) 
+{
     var expr = '.'+key;
     var object = parseInt(object, 10);
     var html = object + ' ' + App.Messages.get(key, (object > 1)); 
@@ -25,11 +27,16 @@ App.View.updateInitialInfo = function(key, object) {
 App.View.listItems = function(reply){    
     var acc = [];
     var build_method = App.Env.getWorldName() + '_entry';
-    $(reply.data).each(function(i, o){
+    var data = reply.data;   
-        acc[acc.length++] = App.HTML.Build[build_method](o);
+    // TODO: fix it data.data
+    $.each(data, function(key) 
+    {
+        var o = data[key];
+        fb.warn(key);
+        acc[acc.length++] = App.HTML.Build[build_method](o, key);
     });
     
-    var html = acc.done().wrapperize('ENTRIES_WRAPPER', 'ip');
+    var html = acc.done().wrapperize('ENTRIES_WRAPPER', App.Env.getWorldName());
     App.Ref.CONTENT.html(html);
     App.Helpers.updateScreen();
 }