luci2: split into submodules
[project/luci2/ui.git] / luci2 / htdocs / luci2 / luci2.js
index 745f955..3e5af4a 100644 (file)
@@ -1,7 +1,7 @@
 /*
        LuCI2 - OpenWrt Web Interface
 
-       Copyright 2013 Jo-Philipp Wich <jow@openwrt.org>
+       Copyright 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -173,9 +173,16 @@ String.prototype.format = function()
        return out + str;
 }
 
+if (!window.location.origin)
+       window.location.origin = '%s//%s%s'.format(
+               window.location.protocol,
+               window.location.hostname,
+               (window.location.port ? ':' + window.location.port : '')
+       );
+
 function LuCI2()
 {
-       var _luci2 = this;
+       var L = this;
 
        var Class = function() { };
 
@@ -214,11 +221,60 @@ function LuCI2()
                _class.prototype = prototype;
                _class.prototype.constructor = _class;
 
-               _class.extend = arguments.callee;
+               _class.extend = Class.extend;
 
                return _class;
        };
 
+       Class.require = function(name)
+       {
+               var path = '/' + name.replace(/\./g, '/') + '.js';
+
+               return $.ajax(path, {
+                       method: 'GET',
+                       async: false,
+                       cache: true,
+                       dataType: 'text'
+               }).then(function(text) {
+                       var code = '%s\n\n//@ sourceURL=%s/%s'.format(text, window.location.origin, path);
+                       var construct = eval(code);
+
+                       var parts = name.split(/\./);
+                       var cparent = L.Class || (L.Class = { });
+
+                       for (var i = 1; i < parts.length - 1; i++)
+                       {
+                               cparent = cparent[parts[i]];
+
+                               if (!cparent)
+                                       throw "Missing parent class";
+                       }
+
+                       cparent[parts[i]] = construct;
+               });
+       };
+
+       Class.instantiate = function(name)
+       {
+               Class.require(name).then(function() {
+                       var parts = name.split(/\./);
+                       var iparent = L;
+                       var construct = L.Class;
+
+                       for (var i = 1; i < parts.length - 1; i++)
+                       {
+                               iparent = iparent[parts[i]];
+                               construct = construct[parts[i]];
+
+                               if (!iparent)
+                                       throw "Missing parent class";
+                       }
+
+                       if (construct[parts[i]])
+                               iparent[parts[i]] = new construct[parts[i]]();
+               });
+       };
+
        this.defaults = function(obj, def)
        {
                for (var key in def)
@@ -253,42 +309,42 @@ function LuCI2()
                plural:  function(n) { return 0 + (n != 1) },
 
                init: function() {
-                       if (_luci2.i18n.loaded)
+                       if (L.i18n.loaded)
                                return;
 
                        var lang = (navigator.userLanguage || navigator.language || 'en').toLowerCase();
                        var langs = (lang.indexOf('-') > -1) ? [ lang, lang.split(/-/)[0] ] : [ lang ];
 
                        for (var i = 0; i < langs.length; i++)
-                               $.ajax('%s/i18n/base.%s.json'.format(_luci2.globals.resource, langs[i]), {
+                               $.ajax('%s/i18n/base.%s.json'.format(L.globals.resource, langs[i]), {
                                        async:    false,
                                        cache:    true,
                                        dataType: 'json',
                                        success:  function(data) {
-                                               $.extend(_luci2.i18n.catalog, data);
+                                               $.extend(L.i18n.catalog, data);
 
-                                               var pe = _luci2.i18n.catalog[''];
+                                               var pe = L.i18n.catalog[''];
                                                if (pe)
                                                {
-                                                       delete _luci2.i18n.catalog[''];
+                                                       delete L.i18n.catalog[''];
                                                        try {
                                                                var pf = new Function('n', 'return 0 + (' + pe + ')');
-                                                               _luci2.i18n.plural = pf;
+                                                               L.i18n.plural = pf;
                                                        } catch (e) { };
                                                }
                                        }
                                });
 
-                       _luci2.i18n.loaded = true;
+                       L.i18n.loaded = true;
                }
 
        };
 
        this.tr = function(msgid)
        {
-               _luci2.i18n.init();
+               L.i18n.init();
 
-               var msgstr = _luci2.i18n.catalog[msgid];
+               var msgstr = L.i18n.catalog[msgid];
 
                if (typeof(msgstr) == 'undefined')
                        return msgid;
@@ -300,23 +356,23 @@ function LuCI2()
 
        this.trp = function(msgid, msgid_plural, count)
        {
-               _luci2.i18n.init();
+               L.i18n.init();
 
-               var msgstr = _luci2.i18n.catalog[msgid];
+               var msgstr = L.i18n.catalog[msgid];
 
                if (typeof(msgstr) == 'undefined')
                        return (count == 1) ? msgid : msgid_plural;
                else if (typeof(msgstr) == 'string')
                        return msgstr;
                else
-                       return msgstr[_luci2.i18n.plural(count)];
+                       return msgstr[L.i18n.plural(count)];
        };
 
        this.trc = function(msgctx, msgid)
        {
-               _luci2.i18n.init();
+               L.i18n.init();
 
-               var msgstr = _luci2.i18n.catalog[msgid + '\u0004' + msgctx];
+               var msgstr = L.i18n.catalog[msgid + '\u0004' + msgctx];
 
                if (typeof(msgstr) == 'undefined')
                        return msgid;
@@ -328,16 +384,16 @@ function LuCI2()
 
        this.trcp = function(msgctx, msgid, msgid_plural, count)
        {
-               _luci2.i18n.init();
+               L.i18n.init();
 
-               var msgstr = _luci2.i18n.catalog[msgid + '\u0004' + msgctx];
+               var msgstr = L.i18n.catalog[msgid + '\u0004' + msgctx];
 
                if (typeof(msgstr) == 'undefined')
                        return (count == 1) ? msgid : msgid_plural;
                else if (typeof(msgstr) == 'string')
                        return msgstr;
                else
-                       return msgstr[_luci2.i18n.plural(count)];
+                       return msgstr[L.i18n.plural(count)];
        };
 
        this.setHash = function(key, value)
@@ -364,8 +420,10 @@ function LuCI2()
                        h += keys[i] + ':' + data[keys[i]];
                }
 
-               if (h)
+               if (h.length)
                        location.hash = '#' + h;
+               else
+                       location.hash = '';
        };
 
        this.getHash = function(key)
@@ -386,5009 +444,262 @@ function LuCI2()
                return data;
        };
 
-       this.globals = {
-               timeout:  3000,
-               resource: '/luci2',
-               sid:      '00000000000000000000000000000000'
-       };
-
-       this.rpc = {
-
-               _id: 1,
-               _batch: undefined,
-               _requests: { },
-
-               _call: function(req, cb)
-               {
-                       return $.ajax('/ubus', {
-                               cache:       false,
-                               contentType: 'application/json',
-                               data:        JSON.stringify(req),
-                               dataType:    'json',
-                               type:        'POST',
-                               timeout:     _luci2.globals.timeout
-                       }).then(cb);
-               },
-
-               _list_cb: function(msg)
-               {
-                       /* verify message frame */
-                       if (typeof(msg) != 'object' || msg.jsonrpc != '2.0' || !msg.id)
-                               throw 'Invalid JSON response';
-
-                       return msg.result;
-               },
-
-               _call_cb: function(msg)
+       this.toArray = function(x)
+       {
+               switch (typeof(x))
                {
-                       var data = [ ];
-                       var type = Object.prototype.toString;
+               case 'number':
+               case 'boolean':
+                       return [ x ];
 
-                       if (!$.isArray(msg))
-                               msg = [ msg ];
+               case 'string':
+                       var r = [ ];
+                       var l = x.split(/\s+/);
+                       for (var i = 0; i < l.length; i++)
+                               if (l[i].length > 0)
+                                       r.push(l[i]);
+                       return r;
 
-                       for (var i = 0; i < msg.length; i++)
+               case 'object':
+                       if ($.isArray(x))
                        {
-                               /* verify message frame */
-                               if (typeof(msg[i]) != 'object' || msg[i].jsonrpc != '2.0' || !msg[i].id)
-                                       throw 'Invalid JSON response';
-
-                               /* fetch related request info */
-                               var req = _luci2.rpc._requests[msg[i].id];
-                               if (typeof(req) != 'object')
-                                       throw 'No related request for JSON response';
-
-                               /* fetch response attribute and verify returned type */
-                               var ret = undefined;
-
-                               if ($.isArray(msg[i].result) && msg[i].result[0] == 0)
-                                       ret = (msg[i].result.length > 1) ? msg[i].result[1] : msg[i].result[0];
-
-                               if (req.expect)
-                               {
-                                       for (var key in req.expect)
-                                       {
-                                               if (typeof(ret) != 'undefined' && key != '')
-                                                       ret = ret[key];
-
-                                               if (type.call(ret) != type.call(req.expect[key]))
-                                                       ret = req.expect[key];
-
-                                               break;
-                                       }
-                               }
-
-                               /* apply filter */
-                               if (typeof(req.filter) == 'function')
-                               {
-                                       req.priv[0] = ret;
-                                       req.priv[1] = req.params;
-                                       ret = req.filter.apply(_luci2.rpc, req.priv);
-                               }
-
-                               /* store response data */
-                               if (typeof(req.index) == 'number')
-                                       data[req.index] = ret;
-                               else
-                                       data = ret;
-
-                               /* delete request object */
-                               delete _luci2.rpc._requests[msg[i].id];
-                       }
-
-                       return data;
-               },
-
-               list: function()
-               {
-                       var params = [ ];
-                       for (var i = 0; i < arguments.length; i++)
-                               params[i] = arguments[i];
-
-                       var msg = {
-                               jsonrpc: '2.0',
-                               id:      this._id++,
-                               method:  'list',
-                               params:  (params.length > 0) ? params : undefined
-                       };
-
-                       return this._call(msg, this._list_cb);
-               },
-
-               batch: function()
-               {
-                       if (!$.isArray(this._batch))
-                               this._batch = [ ];
-               },
-
-               flush: function()
-               {
-                       if (!$.isArray(this._batch))
-                               return _luci2.deferrable([ ]);
-
-                       var req = this._batch;
-                       delete this._batch;
-
-                       /* call rpc */
-                       return this._call(req, this._call_cb);
-               },
-
-               declare: function(options)
-               {
-                       var _rpc = this;
-
-                       return function() {
-                               /* build parameter object */
-                               var p_off = 0;
-                               var params = { };
-                               if ($.isArray(options.params))
-                                       for (p_off = 0; p_off < options.params.length; p_off++)
-                                               params[options.params[p_off]] = arguments[p_off];
-
-                               /* all remaining arguments are private args */
-                               var priv = [ undefined, undefined ];
-                               for (; p_off < arguments.length; p_off++)
-                                       priv.push(arguments[p_off]);
-
-                               /* store request info */
-                               var req = _rpc._requests[_rpc._id] = {
-                                       expect: options.expect,
-                                       filter: options.filter,
-                                       params: params,
-                                       priv:   priv
-                               };
-
-                               /* build message object */
-                               var msg = {
-                                       jsonrpc: '2.0',
-                                       id:      _rpc._id++,
-                                       method:  'call',
-                                       params:  [
-                                               _luci2.globals.sid,
-                                               options.object,
-                                               options.method,
-                                               params
-                                       ]
-                               };
-
-                               /* when a batch is in progress then store index in request data
-                                * and push message object onto the stack */
-                               if ($.isArray(_rpc._batch))
-                               {
-                                       req.index = _rpc._batch.push(msg) - 1;
-                                       return _luci2.deferrable(msg);
-                               }
-
-                               /* call rpc */
-                               return _rpc._call(msg, _rpc._call_cb);
-                       };
-               }
-       };
-
-       this.uci = {
-
-               writable: function()
-               {
-                       return _luci2.session.access('ubus', 'uci', 'commit');
-               },
-
-               add: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'add',
-                       params: [ 'config', 'type', 'name', 'values' ],
-                       expect: { section: '' }
-               }),
-
-               apply: function()
-               {
-
-               },
-
-               changes: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'changes',
-                       params: [ 'config' ],
-                       expect: { changes: [ ] }
-               }),
-
-               commit: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'commit',
-                       params: [ 'config' ]
-               }),
-
-               _delete_one: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'delete',
-                       params: [ 'config', 'section', 'option' ]
-               }),
-
-               _delete_multiple: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'delete',
-                       params: [ 'config', 'section', 'options' ]
-               }),
-
-               'delete': function(config, section, option)
-               {
-                       if ($.isArray(option))
-                               return this._delete_multiple(config, section, option);
-                       else
-                               return this._delete_one(config, section, option);
-               },
-
-               delete_all: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'delete',
-                       params: [ 'config', 'type', 'match' ]
-               }),
-
-               _foreach: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'get',
-                       params: [ 'config', 'type' ],
-                       expect: { values: { } }
-               }),
-
-               foreach: function(config, type, cb)
-               {
-                       return this._foreach(config, type).then(function(sections) {
-                               for (var s in sections)
-                                       cb(sections[s]);
-                       });
-               },
-
-               get: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'get',
-                       params: [ 'config', 'section', 'option' ],
-                       expect: { '': { } },
-                       filter: function(data, params) {
-                               if (typeof(params.option) == 'undefined')
-                                       return data.values ? data.values['.type'] : undefined;
-                               else
-                                       return data.value;
-                       }
-               }),
-
-               get_all: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'get',
-                       params: [ 'config', 'section' ],
-                       expect: { values: { } },
-                       filter: function(data, params) {
-                               if (typeof(params.section) == 'string')
-                                       data['.section'] = params.section;
-                               else if (typeof(params.config) == 'string')
-                                       data['.package'] = params.config;
-                               return data;
-                       }
-               }),
-
-               get_first: function(config, type, option)
-               {
-                       return this._foreach(config, type).then(function(sections) {
-                               for (var s in sections)
-                               {
-                                       var val = (typeof(option) == 'string') ? sections[s][option] : sections[s]['.name'];
-
-                                       if (typeof(val) != 'undefined')
-                                               return val;
-                               }
-
-                               return undefined;
-                       });
-               },
-
-               section: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'add',
-                       params: [ 'config', 'type', 'name', 'values' ],
-                       expect: { section: '' }
-               }),
-
-               _set: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'set',
-                       params: [ 'config', 'section', 'values' ]
-               }),
-
-               set: function(config, section, option, value)
-               {
-                       if (typeof(value) == 'undefined' && typeof(option) == 'string')
-                               return this.section(config, section, option); /* option -> type */
-                       else if ($.isPlainObject(option))
-                               return this._set(config, section, option); /* option -> values */
-
-                       var values = { };
-                           values[option] = value;
-
-                       return this._set(config, section, values);
-               },
-
-               order: _luci2.rpc.declare({
-                       object: 'uci',
-                       method: 'order',
-                       params: [ 'config', 'sections' ]
-               })
-       };
-
-       this.network = {
-               listNetworkNames: function() {
-                       return _luci2.rpc.list('network.interface.*').then(function(list) {
-                               var names = [ ];
-                               for (var name in list)
-                                       if (name != 'network.interface.loopback')
-                                               names.push(name.substring(18));
-                               names.sort();
-                               return names;
-                       });
-               },
-
-               listDeviceNames: _luci2.rpc.declare({
-                       object: 'network.device',
-                       method: 'status',
-                       expect: { '': { } },
-                       filter: function(data) {
-                               var names = [ ];
-                               for (var name in data)
-                                       if (name != 'lo')
-                                               names.push(name);
-                               names.sort();
-                               return names;
-                       }
-               }),
-
-               getNetworkStatus: function()
-               {
-                       var nets = [ ];
-                       var devs = { };
-
-                       return this.listNetworkNames().then(function(names) {
-                               _luci2.rpc.batch();
-
-                               for (var i = 0; i < names.length; i++)
-                                       _luci2.network.getInterfaceStatus(names[i]);
-
-                               return _luci2.rpc.flush();
-                       }).then(function(networks) {
-                               for (var i = 0; i < networks.length; i++)
-                               {
-                                       var net = nets[i] = networks[i];
-                                       var dev = net.l3_device || net.l2_device;
-                                       if (dev)
-                                               net.device = devs[dev] = { };
-                               }
-
-                               _luci2.rpc.batch();
-
-                               for (var dev in devs)
-                                       _luci2.network.listDeviceNamestatus(dev);
-
-                               return _luci2.rpc.flush();
-                       }).then(function(devices) {
-                               _luci2.rpc.batch();
-
-                               for (var i = 0; i < devices.length; i++)
-                               {
-                                       var brm = devices[i]['bridge-members'];
-                                       delete devices[i]['bridge-members'];
-
-                                       $.extend(devs[devices[i]['device']], devices[i]);
-
-                                       if (!brm)
-                                               continue;
-
-                                       devs[devices[i]['device']].subdevices = [ ];
-
-                                       for (var j = 0; j < brm.length; j++)
-                                       {
-                                               if (!devs[brm[j]])
-                                               {
-                                                       devs[brm[j]] = { };
-                                                       _luci2.network.listDeviceNamestatus(brm[j]);
-                                               }
-
-                                               devs[devices[i]['device']].subdevices[j] = devs[brm[j]];
-                                       }
-                               }
-
-                               return _luci2.rpc.flush();
-                       }).then(function(subdevices) {
-                               for (var i = 0; i < subdevices.length; i++)
-                                       $.extend(devs[subdevices[i]['device']], subdevices[i]);
-
-                               _luci2.rpc.batch();
-
-                               for (var dev in devs)
-                                       _luci2.wireless.getDeviceStatus(dev);
-
-                               return _luci2.rpc.flush();
-                       }).then(function(wifidevices) {
-                               for (var i = 0; i < wifidevices.length; i++)
-                                       if (wifidevices[i])
-                                               devs[wifidevices[i]['device']].wireless = wifidevices[i];
-
-                               nets.sort(function(a, b) {
-                                       if (a['interface'] < b['interface'])
-                                               return -1;
-                                       else if (a['interface'] > b['interface'])
-                                               return 1;
-                                       else
-                                               return 0;
-                               });
-
-                               return nets;
-                       });
-               },
-
-               findWanInterfaces: function(cb)
-               {
-                       return this.listNetworkNames().then(function(names) {
-                               _luci2.rpc.batch();
-
-                               for (var i = 0; i < names.length; i++)
-                                       _luci2.network.getInterfaceStatus(names[i]);
-
-                               return _luci2.rpc.flush();
-                       }).then(function(interfaces) {
-                               var rv = [ undefined, undefined ];
-
-                               for (var i = 0; i < interfaces.length; i++)
-                               {
-                                       for (var j = 0; j < interfaces[i].route.length; j++)
-                                       {
-                                               var rt = interfaces[i].route[j];
-
-                                               if (typeof(rt.table) != 'undefined')
-                                                       continue;
-
-                                               if (rt.target == '0.0.0.0' && rt.mask == 0)
-                                                       rv[0] = interfaces[i];
-                                               else if (rt.target == '::' && rt.mask == 0)
-                                                       rv[1] = interfaces[i];
-                                       }
-                               }
-
-                               return rv;
-                       });
-               },
-
-               getDHCPLeases: _luci2.rpc.declare({
-                       object: 'luci2.network',
-                       method: 'dhcp_leases',
-                       expect: { leases: [ ] }
-               }),
-
-               getDHCPv6Leases: _luci2.rpc.declare({
-                       object: 'luci2.network',
-                       method: 'dhcp6_leases',
-                       expect: { leases: [ ] }
-               }),
-
-               getRoutes: _luci2.rpc.declare({
-                       object: 'luci2.network',
-                       method: 'routes',
-                       expect: { routes: [ ] }
-               }),
-
-               getIPv6Routes: _luci2.rpc.declare({
-                       object: 'luci2.network',
-                       method: 'routes',
-                       expect: { routes: [ ] }
-               }),
-
-               getARPTable: _luci2.rpc.declare({
-                       object: 'luci2.network',
-                       method: 'arp_table',
-                       expect: { entries: [ ] }
-               }),
-
-               getInterfaceStatus: _luci2.rpc.declare({
-                       object: 'network.interface',
-                       method: 'status',
-                       params: [ 'interface' ],
-                       expect: { '': { } },
-                       filter: function(data, params) {
-                               data['interface'] = params['interface'];
-                               data['l2_device'] = data['device'];
-                               delete data['device'];
-                               return data;
+                               var r = [ ];
+                               for (var i = 0; i < x.length; i++)
+                                       r.push(x[i]);
+                               return r;
                        }
-               }),
-
-               listDeviceNamestatus: _luci2.rpc.declare({
-                       object: 'network.device',
-                       method: 'status',
-                       params: [ 'name' ],
-                       expect: { '': { } },
-                       filter: function(data, params) {
-                               data['device'] = params['name'];
-                               return data;
+                       else if ($.isPlainObject(x))
+                       {
+                               var r = [ ];
+                               for (var k in x)
+                                       if (x.hasOwnProperty(k))
+                                               r.push(k);
+                               return r.sort();
                        }
-               }),
+               }
 
-               getConntrackCount: _luci2.rpc.declare({
-                       object: 'luci2.network',
-                       method: 'conntrack_count',
-                       expect: { '': { count: 0, limit: 0 } }
-               })
+               return [ ];
        };
 
-       this.wireless = {
-               listDeviceNames: _luci2.rpc.declare({
-                       object: 'iwinfo',
-                       method: 'devices',
-                       expect: { 'devices': [ ] },
-                       filter: function(data) {
-                               data.sort();
-                               return data;
-                       }
-               }),
-
-               getDeviceStatus: _luci2.rpc.declare({
-                       object: 'iwinfo',
-                       method: 'info',
-                       params: [ 'device' ],
-                       expect: { '': { } },
-                       filter: function(data, params) {
-                               if (!$.isEmptyObject(data))
-                               {
-                                       data['device'] = params['device'];
-                                       return data;
-                               }
-                               return undefined;
-                       }
-               }),
-
-               getAssocList: _luci2.rpc.declare({
-                       object: 'iwinfo',
-                       method: 'assoclist',
-                       params: [ 'device' ],
-                       expect: { results: [ ] },
-                       filter: function(data, params) {
-                               for (var i = 0; i < data.length; i++)
-                                       data[i]['device'] = params['device'];
-
-                               data.sort(function(a, b) {
-                                       if (a.bssid < b.bssid)
-                                               return -1;
-                                       else if (a.bssid > b.bssid)
-                                               return 1;
-                                       else
-                                               return 0;
-                               });
-
-                               return data;
-                       }
-               }),
-
-               getWirelessStatus: function() {
-                       return this.listDeviceNames().then(function(names) {
-                               _luci2.rpc.batch();
-
-                               for (var i = 0; i < names.length; i++)
-                                       _luci2.wireless.getDeviceStatus(names[i]);
-
-                               return _luci2.rpc.flush();
-                       }).then(function(networks) {
-                               var rv = { };
-
-                               var phy_attrs = [
-                                       'country', 'channel', 'frequency', 'frequency_offset',
-                                       'txpower', 'txpower_offset', 'hwmodes', 'hardware', 'phy'
-                               ];
-
-                               var net_attrs = [
-                                       'ssid', 'bssid', 'mode', 'quality', 'quality_max',
-                                       'signal', 'noise', 'bitrate', 'encryption'
-                               ];
-
-                               for (var i = 0; i < networks.length; i++)
-                               {
-                                       var phy = rv[networks[i].phy] || (
-                                               rv[networks[i].phy] = { networks: [ ] }
-                                       );
-
-                                       var net = {
-                                               device: networks[i].device
-                                       };
-
-                                       for (var j = 0; j < phy_attrs.length; j++)
-                                               phy[phy_attrs[j]] = networks[i][phy_attrs[j]];
-
-                                       for (var j = 0; j < net_attrs.length; j++)
-                                               net[net_attrs[j]] = networks[i][net_attrs[j]];
-
-                                       phy.networks.push(net);
-                               }
-
-                               return rv;
-                       });
-               },
-
-               getAssocLists: function()
-               {
-                       return this.listDeviceNames().then(function(names) {
-                               _luci2.rpc.batch();
-
-                               for (var i = 0; i < names.length; i++)
-                                       _luci2.wireless.getAssocList(names[i]);
-
-                               return _luci2.rpc.flush();
-                       }).then(function(assoclists) {
-                               var rv = [ ];
-
-                               for (var i = 0; i < assoclists.length; i++)
-                                       for (var j = 0; j < assoclists[i].length; j++)
-                                               rv.push(assoclists[i][j]);
-
-                               return rv;
-                       });
-               },
-
-               formatEncryption: function(enc)
+       this.toObject = function(x)
+       {
+               switch (typeof(x))
                {
-                       var format_list = function(l, s)
-                       {
-                               var rv = [ ];
-                               for (var i = 0; i < l.length; i++)
-                                       rv.push(l[i].toUpperCase());
-                               return rv.join(s ? s : ', ');
-                       }
+               case 'number':
+               case 'boolean':
+                       return { x: true };
 
-                       if (!enc || !enc.enabled)
-                               return _luci2.tr('None');
+               case 'string':
+                       var r = { };
+                       var l = x.split(/\x+/);
+                       for (var i = 0; i < l.length; i++)
+                               if (l[i].length > 0)
+                                       r[l[i]] = true;
+                       return r;
 
-                       if (enc.wep)
+               case 'object':
+                       if ($.isArray(x))
                        {
-                               if (enc.wep.length == 2)
-                                       return _luci2.tr('WEP Open/Shared') + ' (%s)'.format(format_list(enc.ciphers, ', '));
-                               else if (enc.wep[0] == 'shared')
-                                       return _luci2.tr('WEP Shared Auth') + ' (%s)'.format(format_list(enc.ciphers, ', '));
-                               else
-                                       return _luci2.tr('WEP Open System') + ' (%s)'.format(format_list(enc.ciphers, ', '));
+                               var r = { };
+                               for (var i = 0; i < x.length; i++)
+                                       r[x[i]] = true;
+                               return r;
                        }
-                       else if (enc.wpa)
+                       else if ($.isPlainObject(x))
                        {
-                               if (enc.wpa.length == 2)
-                                       return _luci2.tr('mixed WPA/WPA2') + ' %s (%s)'.format(
-                                               format_list(enc.authentication, '/'),
-                                               format_list(enc.ciphers, ', ')
-                                       );
-                               else if (enc.wpa[0] == 2)
-                                       return 'WPA2 %s (%s)'.format(
-                                               format_list(enc.authentication, '/'),
-                                               format_list(enc.ciphers, ', ')
-                                       );
-                               else
-                                       return 'WPA %s (%s)'.format(
-                                               format_list(enc.authentication, '/'),
-                                               format_list(enc.ciphers, ', ')
-                                       );
+                               return x;
                        }
-
-                       return _luci2.tr('Unknown');
                }
-       };
 
-       this.system = {
-               getSystemInfo: _luci2.rpc.declare({
-                       object: 'system',
-                       method: 'info',
-                       expect: { '': { } }
-               }),
-
-               getBoardInfo: _luci2.rpc.declare({
-                       object: 'system',
-                       method: 'board',
-                       expect: { '': { } }
-               }),
-
-               getDiskInfo: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'diskfree',
-                       expect: { '': { } }
-               }),
-
-               getInfo: function(cb)
-               {
-                       _luci2.rpc.batch();
-
-                       this.getSystemInfo();
-                       this.getBoardInfo();
-                       this.getDiskInfo();
-
-                       return _luci2.rpc.flush().then(function(info) {
-                               var rv = { };
-
-                               $.extend(rv, info[0]);
-                               $.extend(rv, info[1]);
-                               $.extend(rv, info[2]);
-
-                               return rv;
-                       });
-               },
-
-               getProcessList: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'process_list',
-                       expect: { processes: [ ] },
-                       filter: function(data) {
-                               data.sort(function(a, b) { return a.pid - b.pid });
-                               return data;
-                       }
-               }),
-
-               getSystemLog: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'syslog',
-                       expect: { log: '' }
-               }),
+               return { };
+       };
 
-               getKernelLog: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'dmesg',
-                       expect: { log: '' }
-               }),
+       this.filterArray = function(array, item)
+       {
+               if (!$.isArray(array))
+                       return [ ];
 
-               getZoneInfo: function(cb)
-               {
-                       return $.getJSON(_luci2.globals.resource + '/zoneinfo.json', cb);
-               },
-
-               sendSignal: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'process_signal',
-                       params: [ 'pid', 'signal' ],
-                       filter: function(data) {
-                               return (data == 0);
-                       }
-               }),
-
-               initList: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'init_list',
-                       expect: { initscripts: [ ] },
-                       filter: function(data) {
-                               data.sort(function(a, b) { return (a.start || 0) - (b.start || 0) });
-                               return data;
-                       }
-               }),
+               for (var i = 0; i < array.length; i++)
+                       if (array[i] === item)
+                               array.splice(i--, 1);
 
-               initEnabled: function(init, cb)
-               {
-                       return this.initList().then(function(list) {
-                               for (var i = 0; i < list.length; i++)
-                                       if (list[i].name == init)
-                                               return !!list[i].enabled;
-
-                               return false;
-                       });
-               },
-
-               initRun: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'init_action',
-                       params: [ 'name', 'action' ],
-                       filter: function(data) {
-                               return (data == 0);
-                       }
-               }),
-
-               initStart:   function(init, cb) { return _luci2.system.initRun(init, 'start',   cb) },
-               initStop:    function(init, cb) { return _luci2.system.initRun(init, 'stop',    cb) },
-               initRestart: function(init, cb) { return _luci2.system.initRun(init, 'restart', cb) },
-               initReload:  function(init, cb) { return _luci2.system.initRun(init, 'reload',  cb) },
-               initEnable:  function(init, cb) { return _luci2.system.initRun(init, 'enable',  cb) },
-               initDisable: function(init, cb) { return _luci2.system.initRun(init, 'disable', cb) },
-
-
-               getRcLocal: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'rclocal_get',
-                       expect: { data: '' }
-               }),
-
-               setRcLocal: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'rclocal_set',
-                       params: [ 'data' ]
-               }),
-
-
-               getCrontab: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'crontab_get',
-                       expect: { data: '' }
-               }),
-
-               setCrontab: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'crontab_set',
-                       params: [ 'data' ]
-               }),
-
-
-               getSSHKeys: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'sshkeys_get',
-                       expect: { keys: [ ] }
-               }),
-
-               setSSHKeys: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'sshkeys_set',
-                       params: [ 'keys' ]
-               }),
-
-
-               setPassword: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'password_set',
-                       params: [ 'user', 'password' ]
-               }),
-
-
-               listLEDs: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'led_list',
-                       expect: { leds: [ ] }
-               }),
-
-               listUSBDevices: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'usb_list',
-                       expect: { devices: [ ] }
-               }),
-
-
-               testUpgrade: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'upgrade_test',
-                       expect: { '': { } }
-               }),
-
-               startUpgrade: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'upgrade_start',
-                       params: [ 'keep' ]
-               }),
-
-               cleanUpgrade: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'upgrade_clean'
-               }),
-
-
-               restoreBackup: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'backup_restore'
-               }),
-
-               cleanBackup: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'backup_clean'
-               }),
-
-
-               getBackupConfig: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'backup_config_get',
-                       expect: { config: '' }
-               }),
-
-               setBackupConfig: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'backup_config_set',
-                       params: [ 'data' ]
-               }),
-
-
-               listBackup: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'backup_list',
-                       expect: { files: [ ] }
-               }),
-
-
-               performReboot: _luci2.rpc.declare({
-                       object: 'luci2.system',
-                       method: 'reboot'
-               })
+               return array;
        };
 
-       this.opkg = {
-               updateLists: _luci2.rpc.declare({
-                       object: 'luci2.opkg',
-                       method: 'update',
-                       expect: { '': { } }
-               }),
-
-               _allPackages: _luci2.rpc.declare({
-                       object: 'luci2.opkg',
-                       method: 'list',
-                       params: [ 'offset', 'limit', 'pattern' ],
-                       expect: { '': { } }
-               }),
-
-               _installedPackages: _luci2.rpc.declare({
-                       object: 'luci2.opkg',
-                       method: 'list_installed',
-                       params: [ 'offset', 'limit', 'pattern' ],
-                       expect: { '': { } }
-               }),
-
-               _findPackages: _luci2.rpc.declare({
-                       object: 'luci2.opkg',
-                       method: 'find',
-                       params: [ 'offset', 'limit', 'pattern' ],
-                       expect: { '': { } }
-               }),
-
-               _fetchPackages: function(action, offset, limit, pattern)
-               {
-                       var packages = [ ];
+       this.toClassName = function(str, suffix)
+       {
+               var n = '';
+               var l = str.split(/[\/.]/);
 
-                       return action(offset, limit, pattern).then(function(list) {
-                               if (!list.total || !list.packages)
-                                       return { length: 0, total: 0 };
+               for (var i = 0; i < l.length; i++)
+                       if (l[i].length > 0)
+                               n += l[i].charAt(0).toUpperCase() + l[i].substr(1).toLowerCase();
 
-                               packages.push.apply(packages, list.packages);
-                               packages.total = list.total;
+               if (typeof(suffix) == 'string')
+                       n += suffix;
 
-                               if (limit <= 0)
-                                       limit = list.total;
+               return n;
+       };
 
-                               if (packages.length >= limit)
-                                       return packages;
+       this.toColor = function(str)
+       {
+               if (typeof(str) != 'string' || str.length == 0)
+                       return '#CCCCCC';
 
-                               _luci2.rpc.batch();
+               if (str == 'wan')
+                       return '#F09090';
+               else if (str == 'lan')
+                       return '#90F090';
 
-                               for (var i = offset + packages.length; i < limit; i += 100)
-                                       action(i, (Math.min(i + 100, limit) % 100) || 100, pattern);
+               var i = 0, hash = 0;
 
-                               return _luci2.rpc.flush();
-                       }).then(function(lists) {
-                               for (var i = 0; i < lists.length; i++)
-                               {
-                                       if (!lists[i].total || !lists[i].packages)
-                                               continue;
+               while (i < str.length)
+                       hash = str.charCodeAt(i++) + ((hash << 5) - hash);
 
-                                       packages.push.apply(packages, lists[i].packages);
-                                       packages.total = lists[i].total;
-                               }
+               var r = (hash & 0xFF) % 128;
+               var g = ((hash >> 8) & 0xFF) % 128;
 
-                               return packages;
-                       });
-               },
+               var min = 0;
+               var max = 128;
 
-               listPackages: function(offset, limit, pattern)
-               {
-                       return _luci2.opkg._fetchPackages(_luci2.opkg._allPackages, offset, limit, pattern);
-               },
+               if ((r + g) < 128)
+                       min = 128 - r - g;
+               else
+                       max = 255 - r - g;
 
-               installedPackages: function(offset, limit, pattern)
-               {
-                       return _luci2.opkg._fetchPackages(_luci2.opkg._installedPackages, offset, limit, pattern);
-               },
+               var b = min + (((hash >> 16) & 0xFF) % (max - min));
 
-               findPackages: function(offset, limit, pattern)
-               {
-                       return _luci2.opkg._fetchPackages(_luci2.opkg._findPackages, offset, limit, pattern);
-               },
-
-               installPackage: _luci2.rpc.declare({
-                       object: 'luci2.opkg',
-                       method: 'install',
-                       params: [ 'package' ],
-                       expect: { '': { } }
-               }),
-
-               removePackage: _luci2.rpc.declare({
-                       object: 'luci2.opkg',
-                       method: 'remove',
-                       params: [ 'package' ],
-                       expect: { '': { } }
-               }),
-
-               getConfig: _luci2.rpc.declare({
-                       object: 'luci2.opkg',
-                       method: 'config_get',
-                       expect: { config: '' }
-               }),
-
-               setConfig: _luci2.rpc.declare({
-                       object: 'luci2.opkg',
-                       method: 'config_set',
-                       params: [ 'data' ]
-               })
+               return '#%02X%02X%02X'.format(0xFF - r, 0xFF - g, 0xFF - b);
        };
 
-       this.session = {
-
-               login: _luci2.rpc.declare({
-                       object: 'session',
-                       method: 'login',
-                       params: [ 'username', 'password' ],
-                       expect: { '': { } }
-               }),
-
-               access: _luci2.rpc.declare({
-                       object: 'session',
-                       method: 'access',
-                       params: [ 'scope', 'object', 'function' ],
-                       expect: { access: false }
-               }),
+       this.parseIPv4 = function(str)
+       {
+               if ((typeof(str) != 'string' && !(str instanceof String)) ||
+                   !str.match(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/))
+                       return undefined;
 
-               isAlive: function()
-               {
-                       return _luci2.session.access('ubus', 'session', 'access');
-               },
+               var num = [ ];
+               var parts = str.split(/\./);
 
-               startHeartbeat: function()
+               for (var i = 0; i < parts.length; i++)
                {
-                       this._hearbeatInterval = window.setInterval(function() {
-                               _luci2.session.isAlive().then(function(alive) {
-                                       if (!alive)
-                                       {
-                                               _luci2.session.stopHeartbeat();
-                                               _luci2.ui.login(true);
-                                       }
-
-                               });
-                       }, _luci2.globals.timeout * 2);
-               },
+                       var n = parseInt(parts[i], 10);
+                       if (isNaN(n) || n > 255)
+                               return undefined;
 
-               stopHeartbeat: function()
-               {
-                       if (typeof(this._hearbeatInterval) != 'undefined')
-                       {
-                               window.clearInterval(this._hearbeatInterval);
-                               delete this._hearbeatInterval;
-                       }
+                       num.push(n);
                }
+
+               return num;
        };
 
-       this.ui = {
+       this.parseIPv6 = function(str)
+       {
+               if ((typeof(str) != 'string' && !(str instanceof String)) ||
+                   !str.match(/^[a-fA-F0-9:]+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/))
+                       return undefined;
 
-               loading: function(enable)
-               {
-                       var win = $(window);
-                       var body = $('body');
-                       var div = _luci2._modal || (
-                               _luci2._modal = $('<div />')
-                                       .addClass('cbi-modal-loader')
-                                       .append($('<div />').text(_luci2.tr('Loading data...')))
-                                       .appendTo(body)
-                       );
-
-                       if (enable)
-                       {
-                               body.css('overflow', 'hidden');
-                               body.css('padding', 0);
-                               body.css('width', win.width());
-                               body.css('height', win.height());
-                               div.css('width', win.width());
-                               div.css('height', win.height());
-                               div.show();
-                       }
-                       else
-                       {
-                               div.hide();
-                               body.css('overflow', '');
-                               body.css('padding', '');
-                               body.css('width', '');
-                               body.css('height', '');
-                       }
-               },
+               var parts = str.split(/::/);
+               if (parts.length == 0 || parts.length > 2)
+                       return undefined;
 
-               dialog: function(title, content, options)
+               var lnum = [ ];
+               if (parts[0].length > 0)
                {
-                       var win = $(window);
-                       var body = $('body');
-                       var div = _luci2._dialog || (
-                               _luci2._dialog = $('<div />')
-                                       .addClass('cbi-modal-dialog')
-                                       .append($('<div />')
-                                               .append($('<div />')
-                                                       .addClass('cbi-modal-dialog-header'))
-                                               .append($('<div />')
-                                                       .addClass('cbi-modal-dialog-body'))
-                                               .append($('<div />')
-                                                       .addClass('cbi-modal-dialog-footer')
-                                                       .append($('<button />')
-                                                               .addClass('cbi-button')
-                                                               .text(_luci2.tr('Close'))
-                                                               .click(function() {
-                                                                       $('body')
-                                                                               .css('overflow', '')
-                                                                               .css('padding', '')
-                                                                               .css('width', '')
-                                                                               .css('height', '');
-
-                                                                       $(this).parent().parent().parent().hide();
-                                                               }))))
-                                       .appendTo(body)
-                       );
-
-                       if (typeof(options) != 'object')
-                               options = { };
-
-                       if (title === false)
+                       var left = parts[0].split(/:/);
+                       for (var i = 0; i < left.length; i++)
                        {
-                               body
-                                       .css('overflow', '')
-                                       .css('padding', '')
-                                       .css('width', '')
-                                       .css('height', '');
-
-                               _luci2._dialog.hide();
+                               var n = parseInt(left[i], 16);
+                               if (isNaN(n))
+                                       return undefined;
 
-                               return;
+                               lnum.push((n / 256) >> 0);
+                               lnum.push(n % 256);
                        }
+               }
 
-                       var cnt = div.children().children('div.cbi-modal-dialog-body');
-                       var ftr = div.children().children('div.cbi-modal-dialog-footer');
-
-                       ftr.empty();
+               var rnum = [ ];
+               if (parts.length > 1 && parts[1].length > 0)
+               {
+                       var right = parts[1].split(/:/);
 
-                       if (options.style == 'confirm')
-                       {
-                               ftr.append($('<button />')
-                                       .addClass('cbi-button')
-                                       .text(_luci2.tr('Ok'))
-                                       .click(options.confirm || function() { _luci2.ui.dialog(false) }));
-
-                               ftr.append($('<button />')
-                                       .addClass('cbi-button')
-                                       .text(_luci2.tr('Cancel'))
-                                       .click(options.cancel || function() { _luci2.ui.dialog(false) }));
-                       }
-                       else if (options.style == 'close')
-                       {
-                               ftr.append($('<button />')
-                                       .addClass('cbi-button')
-                                       .text(_luci2.tr('Close'))
-                                       .click(options.close || function() { _luci2.ui.dialog(false) }));
-                       }
-                       else if (options.style == 'wait')
+                       for (var i = 0; i < right.length; i++)
                        {
-                               ftr.append($('<button />')
-                                       .addClass('cbi-button')
-                                       .text(_luci2.tr('Close'))
-                                       .attr('disabled', true));
-                       }
-
-                       div.find('div.cbi-modal-dialog-header').text(title);
-                       div.show();
-
-                       cnt
-                               .css('max-height', Math.floor(win.height() * 0.70) + 'px')
-                               .empty()
-                               .append(content);
-
-                       div.children()
-                               .css('margin-top', -Math.floor(div.children().height() / 2) + 'px');
-
-                       body.css('overflow', 'hidden');
-                       body.css('padding', 0);
-                       body.css('width', win.width());
-                       body.css('height', win.height());
-                       div.css('width', win.width());
-                       div.css('height', win.height());
-               },
+                               if (right[i].indexOf('.') > 0)
+                               {
+                                       var addr = L.parseIPv4(right[i]);
+                                       if (!addr)
+                                               return undefined;
 
-               upload: function(title, content, options)
-               {
-                       var form = _luci2._upload || (
-                               _luci2._upload = $('<form />')
-                                       .attr('method', 'post')
-                                       .attr('action', '/cgi-bin/luci-upload')
-                                       .attr('enctype', 'multipart/form-data')
-                                       .attr('target', 'cbi-fileupload-frame')
-                                       .append($('<p />'))
-                                       .append($('<input />')
-                                               .attr('type', 'hidden')
-                                               .attr('name', 'sessionid')
-                                               .attr('value', _luci2.globals.sid))
-                                       .append($('<input />')
-                                               .attr('type', 'hidden')
-                                               .attr('name', 'filename')
-                                               .attr('value', options.filename))
-                                       .append($('<input />')
-                                               .attr('type', 'file')
-                                               .attr('name', 'filedata')
-                                               .addClass('cbi-input-file'))
-                                       .append($('<div />')
-                                               .css('width', '100%')
-                                               .addClass('progressbar')
-                                               .addClass('intermediate')
-                                               .append($('<div />')
-                                                       .css('width', '100%')))
-                                       .append($('<iframe />')
-                                               .attr('name', 'cbi-fileupload-frame')
-                                               .css('width', '1px')
-                                               .css('height', '1px')
-                                               .css('visibility', 'hidden'))
-                       );
-
-                       var finish = _luci2._upload_finish_cb || (
-                               _luci2._upload_finish_cb = function(ev) {
-                                       $(this).off('load');
-
-                                       var body = (this.contentDocument || this.contentWindow.document).body;
-                                       if (body.firstChild.tagName.toLowerCase() == 'pre')
-                                               body = body.firstChild;
-
-                                       var json;
-                                       try {
-                                               json = $.parseJSON(body.innerHTML);
-                                       } catch(e) {
-                                               json = {
-                                                       message: _luci2.tr('Invalid server response received'),
-                                                       error: [ -1, _luci2.tr('Invalid data') ]
-                                               };
-                                       };
-
-                                       if (json.error)
-                                       {
-                                               L.ui.dialog(L.tr('File upload'), [
-                                                       $('<p />').text(_luci2.tr('The file upload failed with the server response below:')),
-                                                       $('<pre />').addClass('alert-message').text(json.message || json.error[1]),
-                                                       $('<p />').text(_luci2.tr('In case of network problems try uploading the file again.'))
-                                               ], { style: 'close' });
-                                       }
-                                       else if (typeof(ev.data.cb) == 'function')
-                                       {
-                                               ev.data.cb(json);
-                                       }
+                                       rnum.push.apply(rnum, addr);
+                                       continue;
                                }
-                       );
 
-                       var confirm = _luci2._upload_confirm_cb || (
-                               _luci2._upload_confirm_cb = function() {
-                                       var d = _luci2._upload;
-                                       var f = d.find('.cbi-input-file');
-                                       var b = d.find('.progressbar');
-                                       var p = d.find('p');
+                               var n = parseInt(right[i], 16);
+                               if (isNaN(n))
+                                       return undefined;
 
-                                       if (!f.val())
-                                               return;
+                               rnum.push((n / 256) >> 0);
+                               rnum.push(n % 256);
+                       }
+               }
 
-                                       d.find('iframe').on('load', { cb: options.success }, finish);
-                                       d.submit();
+               if (rnum.length > 0 && (lnum.length + rnum.length) > 15)
+                       return undefined;
 
-                                       f.hide();
-                                       b.show();
-                                       p.text(_luci2.tr('File upload in progress â€¦'));
+               var num = [ ];
 
-                                       _luci2._dialog.find('button').prop('disabled', true);
-                               }
-                       );
+               num.push.apply(num, lnum);
 
-                       _luci2._upload.find('.progressbar').hide();
-                       _luci2._upload.find('.cbi-input-file').val('').show();
-                       _luci2._upload.find('p').text(content || _luci2.tr('Select the file to upload and press "%s" to proceed.').format(_luci2.tr('Ok')));
+               for (var i = 0; i < (16 - lnum.length - rnum.length); i++)
+                       num.push(0);
 
-                       _luci2.ui.dialog(title || _luci2.tr('File upload'), _luci2._upload, {
-                               style: 'confirm',
-                               confirm: confirm
-                       });
-               },
+               num.push.apply(num, rnum);
 
-               reconnect: function()
-               {
-                       var protocols = (location.protocol == 'https:') ? [ 'http', 'https' ] : [ 'http' ];
-                       var ports     = (location.protocol == 'https:') ? [ 80, location.port || 443 ] : [ location.port || 80 ];
-                       var address   = location.hostname.match(/^[A-Fa-f0-9]*:[A-Fa-f0-9:]+$/) ? '[' + location.hostname + ']' : location.hostname;
-                       var images    = $();
-                       var interval, timeout;
-
-                       _luci2.ui.dialog(
-                               _luci2.tr('Waiting for device'), [
-                                       $('<p />').text(_luci2.tr('Please stand by while the device is reconfiguring â€¦')),
-                                       $('<div />')
-                                               .css('width', '100%')
-                                               .addClass('progressbar')
-                                               .addClass('intermediate')
-                                               .append($('<div />')
-                                                       .css('width', '100%'))
-                               ], { style: 'wait' }
-                       );
-
-                       for (var i = 0; i < protocols.length; i++)
-                               images = images.add($('<img />').attr('url', protocols[i] + '://' + address + ':' + ports[i]));
-
-                       //_luci2.network.getNetworkStatus(function(s) {
-                       //      for (var i = 0; i < protocols.length; i++)
-                       //      {
-                       //              for (var j = 0; j < s.length; j++)
-                       //              {
-                       //                      for (var k = 0; k < s[j]['ipv4-address'].length; k++)
-                       //                              images = images.add($('<img />').attr('url', protocols[i] + '://' + s[j]['ipv4-address'][k].address + ':' + ports[i]));
-                       //
-                       //                      for (var l = 0; l < s[j]['ipv6-address'].length; l++)
-                       //                              images = images.add($('<img />').attr('url', protocols[i] + '://[' + s[j]['ipv6-address'][l].address + ']:' + ports[i]));
-                       //              }
-                       //      }
-                       //}).then(function() {
-                               images.on('load', function() {
-                                       var url = this.getAttribute('url');
-                                       _luci2.session.isAlive().then(function(access) {
-                                               if (access)
-                                               {
-                                                       window.clearTimeout(timeout);
-                                                       window.clearInterval(interval);
-                                                       _luci2.ui.dialog(false);
-                                                       images = null;
-                                               }
-                                               else
-                                               {
-                                                       location.href = url;
-                                               }
-                                       });
-                               });
+               if (num.length > 16)
+                       return undefined;
 
-                               interval = window.setInterval(function() {
-                                       images.each(function() {
-                                               this.setAttribute('src', this.getAttribute('url') + _luci2.globals.resource + '/icons/loading.gif?r=' + Math.random());
-                                       });
-                               }, 5000);
-
-                               timeout = window.setTimeout(function() {
-                                       window.clearInterval(interval);
-                                       images.off('load');
-
-                                       _luci2.ui.dialog(
-                                               _luci2.tr('Device not responding'),
-                                               _luci2.tr('The device was not responding within 180 seconds, you might need to manually reconnect your computer or use SSH to regain access.'),
-                                               { style: 'close' }
-                                       );
-                               }, 180000);
-                       //});
-               },
-
-               login: function(invalid)
-               {
-                       if (!_luci2._login_deferred || _luci2._login_deferred.state() != 'pending')
-                               _luci2._login_deferred = $.Deferred();
+               return num;
+       };
 
-                       /* try to find sid from hash */
-                       var sid = _luci2.getHash('id');
-                       if (sid && sid.match(/^[a-f0-9]{32}$/))
-                       {
-                               _luci2.globals.sid = sid;
-                               _luci2.session.isAlive().then(function(access) {
-                                       if (access)
-                                       {
-                                               _luci2.session.startHeartbeat();
-                                               _luci2._login_deferred.resolve();
-                                       }
-                                       else
-                                       {
-                                               _luci2.setHash('id', undefined);
-                                               _luci2.ui.login();
-                                       }
-                               });
+       this.isNetmask = function(addr)
+       {
+               if (!$.isArray(addr))
+                       return false;
 
-                               return _luci2._login_deferred;
-                       }
+               var c;
 
-                       var form = _luci2._login || (
-                               _luci2._login = $('<div />')
-                                       .append($('<p />')
-                                               .addClass('alert-message')
-                                               .text(_luci2.tr('Wrong username or password given!')))
-                                       .append($('<p />')
-                                               .append($('<label />')
-                                                       .text(_luci2.tr('Username'))
-                                                       .append($('<br />'))
-                                                       .append($('<input />')
-                                                               .attr('type', 'text')
-                                                               .attr('name', 'username')
-                                                               .attr('value', 'root')
-                                                               .addClass('cbi-input-text'))))
-                                       .append($('<p />')
-                                               .append($('<label />')
-                                                       .text(_luci2.tr('Password'))
-                                                       .append($('<br />'))
-                                                       .append($('<input />')
-                                                               .attr('type', 'password')
-                                                               .attr('name', 'password')
-                                                               .addClass('cbi-input-password'))))
-                                       .append($('<p />')
-                                               .text(_luci2.tr('Enter your username and password above, then click "%s" to proceed.').format(_luci2.tr('Ok'))))
-                       );
-
-                       var response_cb = _luci2._login_response_cb || (
-                               _luci2._login_response_cb = function(response) {
-                                       if (!response.ubus_rpc_session)
-                                       {
-                                               _luci2.ui.login(true);
-                                       }
-                                       else
-                                       {
-                                               _luci2.globals.sid = response.ubus_rpc_session;
-                                               _luci2.setHash('id', _luci2.globals.sid);
-                                               _luci2.session.startHeartbeat();
-                                               _luci2.ui.dialog(false);
-                                               _luci2._login_deferred.resolve();
-                                       }
-                               }
-                       );
-
-                       var confirm_cb = _luci2._login_confirm_cb || (
-                               _luci2._login_confirm_cb = function() {
-                                       var d = _luci2._login;
-                                       var u = d.find('[name=username]').val();
-                                       var p = d.find('[name=password]').val();
-
-                                       if (!u)
-                                               return;
-
-                                       _luci2.ui.dialog(
-                                               _luci2.tr('Logging in'), [
-                                                       $('<p />').text(_luci2.tr('Log in in progress â€¦')),
-                                                       $('<div />')
-                                                               .css('width', '100%')
-                                                               .addClass('progressbar')
-                                                               .addClass('intermediate')
-                                                               .append($('<div />')
-                                                                       .css('width', '100%'))
-                                               ], { style: 'wait' }
-                                       );
-
-                                       _luci2.globals.sid = '00000000000000000000000000000000';
-                                       _luci2.session.login(u, p).then(response_cb);
-                               }
-                       );
+               for (c = 0; (c < addr.length) && (addr[c] == 255); c++);
 
-                       if (invalid)
-                               form.find('.alert-message').show();
-                       else
-                               form.find('.alert-message').hide();
+               if (c == addr.length)
+                       return true;
 
-                       _luci2.ui.dialog(_luci2.tr('Authorization Required'), form, {
-                               style: 'confirm',
-                               confirm: confirm_cb
-                       });
+               if ((addr[c] == 254) || (addr[c] == 252) || (addr[c] == 248) ||
+                       (addr[c] == 240) || (addr[c] == 224) || (addr[c] == 192) ||
+                       (addr[c] == 128) || (addr[c] == 0))
+               {
+                       for (c++; (c < addr.length) && (addr[c] == 0); c++);
 
-                       return _luci2._login_deferred;
-               },
+                       if (c == addr.length)
+                               return true;
+               }
 
-               cryptPassword: _luci2.rpc.declare({
-                       object: 'luci2.ui',
-                       method: 'crypt',
-                       params: [ 'data' ],
-                       expect: { crypt: '' }
-               }),
+               return false;
+       };
 
+       this.globals = {
+               timeout:  15000,
+               resource: '/luci2',
+               sid:      '00000000000000000000000000000000'
+       };
 
-               _acl_merge_scope: function(acl_scope, scope)
-               {
-                       if ($.isArray(scope))
-                       {
-                               for (var i = 0; i < scope.length; i++)
-                                       acl_scope[scope[i]] = true;
-                       }
-                       else if ($.isPlainObject(scope))
-                       {
-                               for (var object_name in scope)
-                               {
-                                       if (!$.isArray(scope[object_name]))
-                                               continue;
-
-                                       var acl_object = acl_scope[object_name] || (acl_scope[object_name] = { });
-
-                                       for (var i = 0; i < scope[object_name].length; i++)
-                                               acl_object[scope[object_name][i]] = true;
-                               }
-                       }
-               },
-
-               _acl_merge_permission: function(acl_perm, perm)
-               {
-                       if ($.isPlainObject(perm))
-                       {
-                               for (var scope_name in perm)
-                               {
-                                       var acl_scope = acl_perm[scope_name] || (acl_perm[scope_name] = { });
-                                       this._acl_merge_scope(acl_scope, perm[scope_name]);
-                               }
-                       }
-               },
-
-               _acl_merge_group: function(acl_group, group)
-               {
-                       if ($.isPlainObject(group))
-                       {
-                               if (!acl_group.description)
-                                       acl_group.description = group.description;
-
-                               if (group.read)
-                               {
-                                       var acl_perm = acl_group.read || (acl_group.read = { });
-                                       this._acl_merge_permission(acl_perm, group.read);
-                               }
-
-                               if (group.write)
-                               {
-                                       var acl_perm = acl_group.write || (acl_group.write = { });
-                                       this._acl_merge_permission(acl_perm, group.write);
-                               }
-                       }
-               },
-
-               _acl_merge_tree: function(acl_tree, tree)
-               {
-                       if ($.isPlainObject(tree))
-                       {
-                               for (var group_name in tree)
-                               {
-                                       var acl_group = acl_tree[group_name] || (acl_tree[group_name] = { });
-                                       this._acl_merge_group(acl_group, tree[group_name]);
-                               }
-                       }
-               },
-
-               listAvailableACLs: _luci2.rpc.declare({
-                       object: 'luci2.ui',
-                       method: 'acls',
-                       expect: { acls: [ ] },
-                       filter: function(trees) {
-                               var acl_tree = { };
-                               for (var i = 0; i < trees.length; i++)
-                                       _luci2.ui._acl_merge_tree(acl_tree, trees[i]);
-                               return acl_tree;
-                       }
-               }),
-
-               renderMainMenu: _luci2.rpc.declare({
-                       object: 'luci2.ui',
-                       method: 'menu',
-                       expect: { menu: { } },
-                       filter: function(entries) {
-                               _luci2.globals.mainMenu = new _luci2.ui.menu();
-                               _luci2.globals.mainMenu.entries(entries);
-
-                               $('#mainmenu')
-                                       .empty()
-                                       .append(_luci2.globals.mainMenu.render(0, 1));
-                       }
-               }),
-
-               renderViewMenu: function()
-               {
-                       $('#viewmenu')
-                               .empty()
-                               .append(_luci2.globals.mainMenu.render(2, 900));
-               },
-
-               renderView: function(node)
-               {
-                       var name = node.view.split(/\//).join('.');
-
-                       _luci2.ui.renderViewMenu();
-
-                       if (!_luci2._views)
-                               _luci2._views = { };
-
-                       _luci2.setHash('view', node.view);
-
-                       if (_luci2._views[name] instanceof _luci2.ui.view)
-                               return _luci2._views[name].render();
-
-                       return $.ajax(_luci2.globals.resource + '/view/' + name + '.js', {
-                               method: 'GET',
-                               cache: true,
-                               dataType: 'text'
-                       }).then(function(data) {
-                               try {
-                                       var viewConstructor = (new Function(['L', '$'], 'return ' + data))(_luci2, $);
-
-                                       _luci2._views[name] = new viewConstructor({
-                                               name: name,
-                                               acls: node.write || { }
-                                       });
-
-                                       return _luci2._views[name].render();
-                               }
-                               catch(e) { };
-
-                               return $.Deferred().resolve();
-                       });
-               },
-
-               init: function()
-               {
-                       _luci2.ui.loading(true);
-
-                       $.when(
-                               _luci2.ui.renderMainMenu()
-                       ).then(function() {
-                               _luci2.ui.renderView(_luci2.globals.defaultNode).then(function() {
-                                       _luci2.ui.loading(false);
-                               })
-                       });
-               }
-       };
-
-       var AbstractWidget = Class.extend({
-               i18n: function(text) {
-                       return text;
-               },
-
-               toString: function() {
-                       var x = document.createElement('div');
-                               x.appendChild(this.render());
-
-                       return x.innerHTML;
-               },
-
-               insertInto: function(id) {
-                       return $(id).empty().append(this.render());
-               }
-       });
-
-       this.ui.view = AbstractWidget.extend({
-               _fetch_template: function()
-               {
-                       return $.ajax(_luci2.globals.resource + '/template/' + this.options.name + '.htm', {
-                               method: 'GET',
-                               cache: true,
-                               dataType: 'text',
-                               success: function(data) {
-                                       data = data.replace(/<%([#:=])?(.+?)%>/g, function(match, p1, p2) {
-                                               p2 = p2.replace(/^\s+/, '').replace(/\s+$/, '');
-                                               switch (p1)
-                                               {
-                                               case '#':
-                                                       return '';
-
-                                               case ':':
-                                                       return _luci2.tr(p2);
-
-                                               case '=':
-                                                       return _luci2.globals[p2] || '';
-
-                                               default:
-                                                       return '(?' + match + ')';
-                                               }
-                                       });
-
-                                       $('#maincontent').append(data);
-                               }
-                       });
-               },
-
-               execute: function()
-               {
-                       throw "Not implemented";
-               },
-
-               render: function()
-               {
-                       var container = $('#maincontent');
-
-                       container.empty();
-
-                       if (this.title)
-                               container.append($('<h2 />').append(this.title));
-
-                       if (this.description)
-                               container.append($('<div />').addClass('cbi-map-descr').append(this.description));
-
-                       var self = this;
-                       return this._fetch_template().then(function() {
-                               return _luci2.deferrable(self.execute());
-                       });
-               }
-       });
-
-       this.ui.menu = AbstractWidget.extend({
-               init: function() {
-                       this._nodes = { };
-               },
-
-               entries: function(entries)
-               {
-                       for (var entry in entries)
-                       {
-                               var path = entry.split(/\//);
-                               var node = this._nodes;
-
-                               for (i = 0; i < path.length; i++)
-                               {
-                                       if (!node.childs)
-                                               node.childs = { };
-
-                                       if (!node.childs[path[i]])
-                                               node.childs[path[i]] = { };
-
-                                       node = node.childs[path[i]];
-                               }
-
-                               $.extend(node, entries[entry]);
-                       }
-               },
-
-               _indexcmp: function(a, b)
-               {
-                       var x = a.index || 0;
-                       var y = b.index || 0;
-                       return (x - y);
-               },
-
-               firstChildView: function(node)
-               {
-                       if (node.view)
-                               return node;
-
-                       var nodes = [ ];
-                       for (var child in (node.childs || { }))
-                               nodes.push(node.childs[child]);
-
-                       nodes.sort(this._indexcmp);
-
-                       for (var i = 0; i < nodes.length; i++)
-                       {
-                               var child = this.firstChildView(nodes[i]);
-                               if (child)
-                               {
-                                       $.extend(node, child);
-                                       return node;
-                               }
-                       }
-
-                       return undefined;
-               },
-
-               _onclick: function(ev)
-               {
-                       _luci2.ui.loading(true);
-                       _luci2.ui.renderView(ev.data).then(function() {
-                               _luci2.ui.loading(false);
-                       });
-
-                       ev.preventDefault();
-                       this.blur();
-               },
-
-               _render: function(childs, level, min, max)
-               {
-                       var nodes = [ ];
-                       for (var node in childs)
-                       {
-                               var child = this.firstChildView(childs[node]);
-                               if (child)
-                                       nodes.push(childs[node]);
-                       }
-
-                       nodes.sort(this._indexcmp);
-
-                       var list = $('<ul />');
-
-                       if (level == 0)
-                               list.addClass('nav');
-                       else if (level == 1)
-                               list.addClass('dropdown-menu');
-
-                       for (var i = 0; i < nodes.length; i++)
-                       {
-                               if (!_luci2.globals.defaultNode)
-                               {
-                                       var v = _luci2.getHash('view');
-                                       if (!v || v == nodes[i].view)
-                                               _luci2.globals.defaultNode = nodes[i];
-                               }
-
-                               var item = $('<li />')
-                                       .append($('<a />')
-                                               .attr('href', '#')
-                                               .text(_luci2.tr(nodes[i].title))
-                                               .click(nodes[i], this._onclick))
-                                       .appendTo(list);
-
-                               if (nodes[i].childs && level < max)
-                               {
-                                       item.addClass('dropdown');
-                                       item.find('a').addClass('menu');
-                                       item.append(this._render(nodes[i].childs, level + 1));
-                               }
-                       }
-
-                       return list.get(0);
-               },
-
-               render: function(min, max)
-               {
-                       var top = min ? this.getNode(_luci2.globals.defaultNode.view, min) : this._nodes;
-                       return this._render(top.childs, 0, min, max);
-               },
-
-               getNode: function(path, max)
-               {
-                       var p = path.split(/\//);
-                       var n = this._nodes;
-
-                       if (typeof(max) == 'undefined')
-                               max = p.length;
-
-                       for (var i = 0; i < max; i++)
-                       {
-                               if (!n.childs[p[i]])
-                                       return undefined;
-
-                               n = n.childs[p[i]];
-                       }
-
-                       return n;
-               }
-       });
-
-       this.ui.table = AbstractWidget.extend({
-               init: function()
-               {
-                       this._rows = [ ];
-               },
-
-               row: function(values)
-               {
-                       if ($.isArray(values))
-                       {
-                               this._rows.push(values);
-                       }
-                       else if ($.isPlainObject(values))
-                       {
-                               var v = [ ];
-                               for (var i = 0; i < this.options.columns.length; i++)
-                               {
-                                       var col = this.options.columns[i];
-
-                                       if (typeof col.key == 'string')
-                                               v.push(values[col.key]);
-                                       else
-                                               v.push(null);
-                               }
-                               this._rows.push(v);
-                       }
-               },
-
-               rows: function(rows)
-               {
-                       for (var i = 0; i < rows.length; i++)
-                               this.row(rows[i]);
-               },
-
-               render: function(id)
-               {
-                       var fieldset = document.createElement('fieldset');
-                               fieldset.className = 'cbi-section';
-
-                       if (this.options.caption)
-                       {
-                               var legend = document.createElement('legend');
-                               $(legend).append(this.options.caption);
-                               fieldset.appendChild(legend);
-                       }
-
-                       var table = document.createElement('table');
-                               table.className = 'cbi-section-table';
-
-                       var has_caption = false;
-                       var has_description = false;
-
-                       for (var i = 0; i < this.options.columns.length; i++)
-                               if (this.options.columns[i].caption)
-                               {
-                                       has_caption = true;
-                                       break;
-                               }
-                               else if (this.options.columns[i].description)
-                               {
-                                       has_description = true;
-                                       break;
-                               }
-
-                       if (has_caption)
-                       {
-                               var tr = table.insertRow(-1);
-                                       tr.className = 'cbi-section-table-titles';
-
-                               for (var i = 0; i < this.options.columns.length; i++)
-                               {
-                                       var col = this.options.columns[i];
-                                       var th = document.createElement('th');
-                                               th.className = 'cbi-section-table-cell';
-
-                                       tr.appendChild(th);
-
-                                       if (col.width)
-                                               th.style.width = col.width;
-
-                                       if (col.align)
-                                               th.style.textAlign = col.align;
-
-                                       if (col.caption)
-                                               $(th).append(col.caption);
-                               }
-                       }
-
-                       if (has_description)
-                       {
-                               var tr = table.insertRow(-1);
-                                       tr.className = 'cbi-section-table-descr';
-
-                               for (var i = 0; i < this.options.columns.length; i++)
-                               {
-                                       var col = this.options.columns[i];
-                                       var th = document.createElement('th');
-                                               th.className = 'cbi-section-table-cell';
-
-                                       tr.appendChild(th);
-
-                                       if (col.width)
-                                               th.style.width = col.width;
-
-                                       if (col.align)
-                                               th.style.textAlign = col.align;
-
-                                       if (col.description)
-                                               $(th).append(col.description);
-                               }
-                       }
-
-                       if (this._rows.length == 0)
-                       {
-                               if (this.options.placeholder)
-                               {
-                                       var tr = table.insertRow(-1);
-                                       var td = tr.insertCell(-1);
-                                               td.className = 'cbi-section-table-cell';
-
-                                       td.colSpan = this.options.columns.length;
-                                       $(td).append(this.options.placeholder);
-                               }
-                       }
-                       else
-                       {
-                               for (var i = 0; i < this._rows.length; i++)
-                               {
-                                       var tr = table.insertRow(-1);
-
-                                       for (var j = 0; j < this.options.columns.length; j++)
-                                       {
-                                               var col = this.options.columns[j];
-                                               var td = tr.insertCell(-1);
-
-                                               var val = this._rows[i][j];
-
-                                               if (typeof(val) == 'undefined')
-                                                       val = col.placeholder;
-
-                                               if (typeof(val) == 'undefined')
-                                                       val = '';
-
-                                               if (col.width)
-                                                       td.style.width = col.width;
-
-                                               if (col.align)
-                                                       td.style.textAlign = col.align;
-
-                                               if (typeof col.format == 'string')
-                                                       $(td).append(col.format.format(val));
-                                               else if (typeof col.format == 'function')
-                                                       $(td).append(col.format(val, i));
-                                               else
-                                                       $(td).append(val);
-                                       }
-                               }
-                       }
-
-                       this._rows = [ ];
-                       fieldset.appendChild(table);
-
-                       return fieldset;
-               }
-       });
-
-       this.ui.progress = AbstractWidget.extend({
-               render: function()
-               {
-                       var vn = parseInt(this.options.value) || 0;
-                       var mn = parseInt(this.options.max) || 100;
-                       var pc = Math.floor((100 / mn) * vn);
-
-                       var bar = document.createElement('div');
-                               bar.className = 'progressbar';
-
-                       bar.appendChild(document.createElement('div'));
-                       bar.lastChild.appendChild(document.createElement('div'));
-                       bar.lastChild.style.width = pc + '%';
-
-                       if (typeof(this.options.format) == 'string')
-                               $(bar.lastChild.lastChild).append(this.options.format.format(this.options.value, this.options.max, pc));
-                       else if (typeof(this.options.format) == 'function')
-                               $(bar.lastChild.lastChild).append(this.options.format(pc));
-                       else
-                               $(bar.lastChild.lastChild).append('%.2f%%'.format(pc));
-
-                       return bar;
-               }
-       });
-
-       this.ui.devicebadge = AbstractWidget.extend({
-               render: function()
-               {
-                       var dev = this.options.l3_device || this.options.device || '?';
-
-                       var span = document.createElement('span');
-                               span.className = 'ifacebadge';
-
-                       if (typeof(this.options.signal) == 'number' ||
-                               typeof(this.options.noise) == 'number')
-                       {
-                               var r = 'none';
-                               if (typeof(this.options.signal) != 'undefined' &&
-                                       typeof(this.options.noise) != 'undefined')
-                               {
-                                       var q = (-1 * (this.options.noise - this.options.signal)) / 5;
-                                       if (q < 1)
-                                               r = '0';
-                                       else if (q < 2)
-                                               r = '0-25';
-                                       else if (q < 3)
-                                               r = '25-50';
-                                       else if (q < 4)
-                                               r = '50-75';
-                                       else
-                                               r = '75-100';
-                               }
-
-                               span.appendChild(document.createElement('img'));
-                               span.lastChild.src = _luci2.globals.resource + '/icons/signal-' + r + '.png';
-
-                               if (r == 'none')
-                                       span.title = _luci2.tr('No signal');
-                               else
-                                       span.title = '%s: %d %s / %s: %d %s'.format(
-                                               _luci2.tr('Signal'), this.options.signal, _luci2.tr('dBm'),
-                                               _luci2.tr('Noise'), this.options.noise, _luci2.tr('dBm')
-                                       );
-                       }
-                       else
-                       {
-                               var type = 'ethernet';
-                               var desc = _luci2.tr('Ethernet device');
-
-                               if (this.options.l3_device != this.options.device)
-                               {
-                                       type = 'tunnel';
-                                       desc = _luci2.tr('Tunnel interface');
-                               }
-                               else if (dev.indexOf('br-') == 0)
-                               {
-                                       type = 'bridge';
-                                       desc = _luci2.tr('Bridge');
-                               }
-                               else if (dev.indexOf('.') > 0)
-                               {
-                                       type = 'vlan';
-                                       desc = _luci2.tr('VLAN interface');
-                               }
-                               else if (dev.indexOf('wlan') == 0 ||
-                                                dev.indexOf('ath') == 0 ||
-                                                dev.indexOf('wl') == 0)
-                               {
-                                       type = 'wifi';
-                                       desc = _luci2.tr('Wireless Network');
-                               }
-
-                               span.appendChild(document.createElement('img'));
-                               span.lastChild.src = _luci2.globals.resource + '/icons/' + type + (this.options.up ? '' : '_disabled') + '.png';
-                               span.title = desc;
-                       }
-
-                       $(span).append(' ');
-                       $(span).append(dev);
-
-                       return span;
-               }
-       });
-
-       var type = function(f, l)
-       {
-               f.message = l;
-               return f;
-       };
-
-       this.cbi = {
-               validation: {
-                       i18n: function(msg)
-                       {
-                               _luci2.cbi.validation.message = _luci2.tr(msg);
-                       },
-
-                       compile: function(code)
-                       {
-                               var pos = 0;
-                               var esc = false;
-                               var depth = 0;
-                               var types = _luci2.cbi.validation.types;
-                               var stack = [ ];
-
-                               code += ',';
-
-                               for (var i = 0; i < code.length; i++)
-                               {
-                                       if (esc)
-                                       {
-                                               esc = false;
-                                               continue;
-                                       }
-
-                                       switch (code.charCodeAt(i))
-                                       {
-                                       case 92:
-                                               esc = true;
-                                               break;
-
-                                       case 40:
-                                       case 44:
-                                               if (depth <= 0)
-                                               {
-                                                       if (pos < i)
-                                                       {
-                                                               var label = code.substring(pos, i);
-                                                                       label = label.replace(/\\(.)/g, '$1');
-                                                                       label = label.replace(/^[ \t]+/g, '');
-                                                                       label = label.replace(/[ \t]+$/g, '');
-
-                                                               if (label && !isNaN(label))
-                                                               {
-                                                                       stack.push(parseFloat(label));
-                                                               }
-                                                               else if (label.match(/^(['"]).*\1$/))
-                                                               {
-                                                                       stack.push(label.replace(/^(['"])(.*)\1$/, '$2'));
-                                                               }
-                                                               else if (typeof types[label] == 'function')
-                                                               {
-                                                                       stack.push(types[label]);
-                                                                       stack.push(null);
-                                                               }
-                                                               else
-                                                               {
-                                                                       throw "Syntax error, unhandled token '"+label+"'";
-                                                               }
-                                                       }
-                                                       pos = i+1;
-                                               }
-                                               depth += (code.charCodeAt(i) == 40);
-                                               break;
-
-                                       case 41:
-                                               if (--depth <= 0)
-                                               {
-                                                       if (typeof stack[stack.length-2] != 'function')
-                                                               throw "Syntax error, argument list follows non-function";
-
-                                                       stack[stack.length-1] =
-                                                               arguments.callee(code.substring(pos, i));
-
-                                                       pos = i+1;
-                                               }
-                                               break;
-                                       }
-                               }
-
-                               return stack;
-                       }
-               }
-       };
-
-       var validation = this.cbi.validation;
-
-       validation.types = {
-               'integer': function()
-               {
-                       if (this.match(/^-?[0-9]+$/) != null)
-                               return true;
-
-                       validation.i18n('Must be a valid integer');
-                       return false;
-               },
-
-               'uinteger': function()
-               {
-                       if (validation.types['integer'].apply(this) && (this >= 0))
-                               return true;
-
-                       validation.i18n('Must be a positive integer');
-                       return false;
-               },
-
-               'float': function()
-               {
-                       if (!isNaN(parseFloat(this)))
-                               return true;
-
-                       validation.i18n('Must be a valid number');
-                       return false;
-               },
-
-               'ufloat': function()
-               {
-                       if (validation.types['float'].apply(this) && (this >= 0))
-                               return true;
-
-                       validation.i18n('Must be a positive number');
-                       return false;
-               },
-
-               'ipaddr': function()
-               {
-                       if (validation.types['ip4addr'].apply(this) ||
-                               validation.types['ip6addr'].apply(this))
-                               return true;
-
-                       validation.i18n('Must be a valid IP address');
-                       return false;
-               },
-
-               'ip4addr': function()
-               {
-                       if (this.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(\/(\S+))?$/))
-                       {
-                               if ((RegExp.$1 >= 0) && (RegExp.$1 <= 255) &&
-                                   (RegExp.$2 >= 0) && (RegExp.$2 <= 255) &&
-                                   (RegExp.$3 >= 0) && (RegExp.$3 <= 255) &&
-                                   (RegExp.$4 >= 0) && (RegExp.$4 <= 255) &&
-                                   ((RegExp.$6.indexOf('.') < 0)
-                                     ? ((RegExp.$6 >= 0) && (RegExp.$6 <= 32))
-                                     : (validation.types['ip4addr'].apply(RegExp.$6))))
-                                       return true;
-                       }
-
-                       validation.i18n('Must be a valid IPv4 address');
-                       return false;
-               },
-
-               'ip6addr': function()
-               {
-                       if (this.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/))
-                       {
-                               if (!RegExp.$2 || ((RegExp.$3 >= 0) && (RegExp.$3 <= 128)))
-                               {
-                                       var addr = RegExp.$1;
-
-                                       if (addr == '::')
-                                       {
-                                               return true;
-                                       }
-
-                                       if (addr.indexOf('.') > 0)
-                                       {
-                                               var off = addr.lastIndexOf(':');
-
-                                               if (!(off && validation.types['ip4addr'].apply(addr.substr(off+1))))
-                                               {
-                                                       validation.i18n('Must be a valid IPv6 address');
-                                                       return false;
-                                               }
-
-                                               addr = addr.substr(0, off) + ':0:0';
-                                       }
-
-                                       if (addr.indexOf('::') >= 0)
-                                       {
-                                               var colons = 0;
-                                               var fill = '0';
-
-                                               for (var i = 1; i < (addr.length-1); i++)
-                                                       if (addr.charAt(i) == ':')
-                                                               colons++;
-
-                                               if (colons > 7)
-                                               {
-                                                       validation.i18n('Must be a valid IPv6 address');
-                                                       return false;
-                                               }
-
-                                               for (var i = 0; i < (7 - colons); i++)
-                                                       fill += ':0';
-
-                                               if (addr.match(/^(.*?)::(.*?)$/))
-                                                       addr = (RegExp.$1 ? RegExp.$1 + ':' : '') + fill +
-                                                                  (RegExp.$2 ? ':' + RegExp.$2 : '');
-                                       }
-
-                                       if (addr.match(/^(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}$/) != null)
-                                               return true;
-
-                                       validation.i18n('Must be a valid IPv6 address');
-                                       return false;
-                               }
-                       }
-
-                       return false;
-               },
-
-               'port': function()
-               {
-                       if (validation.types['integer'].apply(this) &&
-                               (this >= 0) && (this <= 65535))
-                               return true;
-
-                       validation.i18n('Must be a valid port number');
-                       return false;
-               },
-
-               'portrange': function()
-               {
-                       if (this.match(/^(\d+)-(\d+)$/))
-                       {
-                               var p1 = RegExp.$1;
-                               var p2 = RegExp.$2;
-
-                               if (validation.types['port'].apply(p1) &&
-                                   validation.types['port'].apply(p2) &&
-                                   (parseInt(p1) <= parseInt(p2)))
-                                       return true;
-                       }
-                       else if (validation.types['port'].apply(this))
-                       {
-                               return true;
-                       }
-
-                       validation.i18n('Must be a valid port range');
-                       return false;
-               },
-
-               'macaddr': function()
-               {
-                       if (this.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null)
-                               return true;
-
-                       validation.i18n('Must be a valid MAC address');
-                       return false;
-               },
-
-               'host': function()
-               {
-                       if (validation.types['hostname'].apply(this) ||
-                           validation.types['ipaddr'].apply(this))
-                               return true;
-
-                       validation.i18n('Must be a valid hostname or IP address');
-                       return false;
-               },
-
-               'hostname': function()
-               {
-                       if ((this.length <= 253) &&
-                           ((this.match(/^[a-zA-Z0-9]+$/) != null ||
-                            (this.match(/^[a-zA-Z0-9_][a-zA-Z0-9_\-.]*[a-zA-Z0-9]$/) &&
-                             this.match(/[^0-9.]/)))))
-                               return true;
-
-                       validation.i18n('Must be a valid host name');
-                       return false;
-               },
-
-               'network': function()
-               {
-                       if (validation.types['uciname'].apply(this) ||
-                           validation.types['host'].apply(this))
-                               return true;
-
-                       validation.i18n('Must be a valid network name');
-                       return false;
-               },
-
-               'wpakey': function()
-               {
-                       var v = this;
-
-                       if ((v.length == 64)
-                             ? (v.match(/^[a-fA-F0-9]{64}$/) != null)
-                                 : ((v.length >= 8) && (v.length <= 63)))
-                               return true;
-
-                       validation.i18n('Must be a valid WPA key');
-                       return false;
-               },
-
-               'wepkey': function()
-               {
-                       var v = this;
-
-                       if (v.substr(0,2) == 's:')
-                               v = v.substr(2);
-
-                       if (((v.length == 10) || (v.length == 26))
-                             ? (v.match(/^[a-fA-F0-9]{10,26}$/) != null)
-                             : ((v.length == 5) || (v.length == 13)))
-                               return true;
-
-                       validation.i18n('Must be a valid WEP key');
-                       return false;
-               },
-
-               'uciname': function()
-               {
-                       if (this.match(/^[a-zA-Z0-9_]+$/) != null)
-                               return true;
-
-                       validation.i18n('Must be a valid UCI identifier');
-                       return false;
-               },
-
-               'range': function(min, max)
-               {
-                       var val = parseFloat(this);
-
-                       if (validation.types['integer'].apply(this) &&
-                           !isNaN(min) && !isNaN(max) && ((val >= min) && (val <= max)))
-                               return true;
-
-                       validation.i18n('Must be a number between %d and %d');
-                       return false;
-               },
-
-               'min': function(min)
-               {
-                       var val = parseFloat(this);
-
-                       if (validation.types['integer'].apply(this) &&
-                           !isNaN(min) && !isNaN(val) && (val >= min))
-                               return true;
-
-                       validation.i18n('Must be a number greater or equal to %d');
-                       return false;
-               },
-
-               'max': function(max)
-               {
-                       var val = parseFloat(this);
-
-                       if (validation.types['integer'].apply(this) &&
-                           !isNaN(max) && !isNaN(val) && (val <= max))
-                               return true;
-
-                       validation.i18n('Must be a number lower or equal to %d');
-                       return false;
-               },
-
-               'rangelength': function(min, max)
-               {
-                       var val = '' + this;
-
-                       if (!isNaN(min) && !isNaN(max) &&
-                           (val.length >= min) && (val.length <= max))
-                               return true;
-
-                       validation.i18n('Must be between %d and %d characters');
-                       return false;
-               },
-
-               'minlength': function(min)
-               {
-                       var val = '' + this;
-
-                       if (!isNaN(min) && (val.length >= min))
-                               return true;
-
-                       validation.i18n('Must be at least %d characters');
-                       return false;
-               },
-
-               'maxlength': function(max)
-               {
-                       var val = '' + this;
-
-                       if (!isNaN(max) && (val.length <= max))
-                               return true;
-
-                       validation.i18n('Must be at most %d characters');
-                       return false;
-               },
-
-               'or': function()
-               {
-                       var msgs = [ ];
-
-                       for (var i = 0; i < arguments.length; i += 2)
-                       {
-                               delete validation.message;
-
-                               if (typeof(arguments[i]) != 'function')
-                               {
-                                       if (arguments[i] == this)
-                                               return true;
-                                       i--;
-                               }
-                               else if (arguments[i].apply(this, arguments[i+1]))
-                               {
-                                       return true;
-                               }
-
-                               if (validation.message)
-                                       msgs.push(validation.message.format.apply(validation.message, arguments[i+1]));
-                       }
-
-                       validation.message = msgs.join( _luci2.tr(' - or - '));
-                       return false;
-               },
-
-               'and': function()
-               {
-                       var msgs = [ ];
-
-                       for (var i = 0; i < arguments.length; i += 2)
-                       {
-                               delete validation.message;
-
-                               if (typeof arguments[i] != 'function')
-                               {
-                                       if (arguments[i] != this)
-                                               return false;
-                                       i--;
-                               }
-                               else if (!arguments[i].apply(this, arguments[i+1]))
-                               {
-                                       return false;
-                               }
-
-                               if (validation.message)
-                                       msgs.push(validation.message.format.apply(validation.message, arguments[i+1]));
-                       }
-
-                       validation.message = msgs.join(', ');
-                       return true;
-               },
-
-               'neg': function()
-               {
-                       return validation.types['or'].apply(
-                               this.replace(/^[ \t]*![ \t]*/, ''), arguments);
-               },
-
-               'list': function(subvalidator, subargs)
-               {
-                       if (typeof subvalidator != 'function')
-                               return false;
-
-                       var tokens = this.match(/[^ \t]+/g);
-                       for (var i = 0; i < tokens.length; i++)
-                               if (!subvalidator.apply(tokens[i], subargs))
-                                       return false;
-
-                       return true;
-               },
-
-               'phonedigit': function()
-               {
-                       if (this.match(/^[0-9\*#!\.]+$/) != null)
-                               return true;
-
-                       validation.i18n('Must be a valid phone number digit');
-                       return false;
-               },
-
-               'string': function()
-               {
-                       return true;
-               }
-       };
-
-
-       var AbstractValue = AbstractWidget.extend({
-               init: function(name, options)
-               {
-                       this.name = name;
-                       this.instance = { };
-                       this.dependencies = [ ];
-                       this.rdependency = { };
-
-                       this.options = _luci2.defaults(options, {
-                               placeholder: '',
-                               datatype: 'string',
-                               optional: false,
-                               keep: true
-                       });
-               },
-
-               id: function(sid)
-               {
-                       return this.section.id('field', sid || '__unknown__', this.name);
-               },
-
-               render: function(sid)
-               {
-                       var i = this.instance[sid] = { };
-
-                       i.top = $('<div />').addClass('cbi-value');
-
-                       if (typeof(this.options.caption) == 'string')
-                               $('<label />')
-                                       .addClass('cbi-value-title')
-                                       .attr('for', this.id(sid))
-                                       .text(this.options.caption)
-                                       .appendTo(i.top);
-
-                       i.widget = $('<div />').addClass('cbi-value-field').append(this.widget(sid)).appendTo(i.top);
-                       i.error = $('<div />').addClass('cbi-value-error').appendTo(i.top);
-
-                       if (typeof(this.options.description) == 'string')
-                               $('<div />')
-                                       .addClass('cbi-value-description')
-                                       .text(this.options.description)
-                                       .appendTo(i.top);
-
-                       return i.top;
-               },
-
-               ucipath: function(sid)
-               {
-                       return {
-                               config:  (this.options.uci_package || this.map.uci_package),
-                               section: (this.options.uci_section || sid),
-                               option:  (this.options.uci_option  || this.name)
-                       };
-               },
-
-               ucivalue: function(sid)
-               {
-                       var uci = this.ucipath(sid);
-                       var val = this.map.get(uci.config, uci.section, uci.option);
-
-                       if (typeof(val) == 'undefined')
-                               return this.options.initial;
-
-                       return val;
-               },
-
-               formvalue: function(sid)
-               {
-                       var v = $('#' + this.id(sid)).val();
-                       return (v === '') ? undefined : v;
-               },
-
-               textvalue: function(sid)
-               {
-                       var v = this.formvalue(sid);
-
-                       if (typeof(v) == 'undefined' || ($.isArray(v) && !v.length))
-                               v = this.ucivalue(sid);
-
-                       if (typeof(v) == 'undefined' || ($.isArray(v) && !v.length))
-                               v = this.options.placeholder;
-
-                       if (typeof(v) == 'undefined' || v === '')
-                               return undefined;
-
-                       if (typeof(v) == 'string' && $.isArray(this.choices))
-                       {
-                               for (var i = 0; i < this.choices.length; i++)
-                                       if (v === this.choices[i][0])
-                                               return this.choices[i][1];
-                       }
-                       else if (v === true)
-                               return _luci2.tr('yes');
-                       else if (v === false)
-                               return _luci2.tr('no');
-                       else if ($.isArray(v))
-                               return v.join(', ');
-
-                       return v;
-               },
-
-               changed: function(sid)
-               {
-                       var a = this.ucivalue(sid);
-                       var b = this.formvalue(sid);
-
-                       if (typeof(a) != typeof(b))
-                               return true;
-
-                       if (typeof(a) == 'object')
-                       {
-                               if (a.length != b.length)
-                                       return true;
-
-                               for (var i = 0; i < a.length; i++)
-                                       if (a[i] != b[i])
-                                               return true;
-
-                               return false;
-                       }
-
-                       return (a != b);
-               },
-
-               save: function(sid)
-               {
-                       var uci = this.ucipath(sid);
-
-                       if (this.instance[sid].disabled)
-                       {
-                               if (!this.options.keep)
-                                       return this.map.set(uci.config, uci.section, uci.option, undefined);
-
-                               return false;
-                       }
-
-                       var chg = this.changed(sid);
-                       var val = this.formvalue(sid);
-
-                       if (chg)
-                               this.map.set(uci.config, uci.section, uci.option, val);
-
-                       return chg;
-               },
-
-               validator: function(sid, elem, multi)
-               {
-                       if (typeof(this.options.datatype) == 'undefined' && $.isEmptyObject(this.rdependency))
-                               return elem;
-
-                       var vstack;
-                       if (typeof(this.options.datatype) == 'string')
-                       {
-                               try {
-                                       vstack = _luci2.cbi.validation.compile(this.options.datatype);
-                               } catch(e) { };
-                       }
-                       else if (typeof(this.options.datatype) == 'function')
-                       {
-                               var vfunc = this.options.datatype;
-                               vstack = [ function(elem) {
-                                       var rv = vfunc(this, elem);
-                                       if (rv !== true)
-                                               validation.message = rv;
-                                       return (rv === true);
-                               }, [ elem ] ];
-                       }
-
-                       var evdata = {
-                               self:  this,
-                               sid:   sid,
-                               elem:  elem,
-                               multi: multi,
-                               inst:  this.instance[sid],
-                               opt:   this.options.optional
-                       };
-
-                       var validator = function(ev)
-                       {
-                               var d = ev.data;
-                               var rv = true;
-                               var val = d.elem.val();
-
-                               if (vstack && typeof(vstack[0]) == 'function')
-                               {
-                                       delete validation.message;
-
-                                       if ((val.length == 0 && !d.opt))
-                                       {
-                                               d.elem.addClass('error');
-                                               d.inst.top.addClass('error');
-                                               d.inst.error.text(_luci2.tr('Field must not be empty'));
-                                               rv = false;
-                                       }
-                                       else if (val.length > 0 && !vstack[0].apply(val, vstack[1]))
-                                       {
-                                               d.elem.addClass('error');
-                                               d.inst.top.addClass('error');
-                                               d.inst.error.text(validation.message.format.apply(validation.message, vstack[1]));
-                                               rv = false;
-                                       }
-                                       else
-                                       {
-                                               d.elem.removeClass('error');
-
-                                               if (d.multi && d.inst.widget.find('input.error, select.error').length > 0)
-                                               {
-                                                       rv = false;
-                                               }
-                                               else
-                                               {
-                                                       d.inst.top.removeClass('error');
-                                                       d.inst.error.text('');
-                                               }
-                                       }
-                               }
-
-                               if (rv)
-                               {
-                                       for (var field in d.self.rdependency)
-                                               d.self.rdependency[field].toggle(d.sid);
-                               }
-
-                               return rv;
-                       };
-
-                       if (elem.prop('tagName') == 'SELECT')
-                       {
-                               elem.change(evdata, validator);
-                       }
-                       else if (elem.prop('tagName') == 'INPUT' && elem.attr('type') == 'checkbox')
-                       {
-                               elem.click(evdata, validator);
-                               elem.blur(evdata, validator);
-                       }
-                       else
-                       {
-                               elem.keyup(evdata, validator);
-                               elem.blur(evdata, validator);
-                       }
-
-                       elem.attr('cbi-validate', true).on('validate', evdata, validator);
-
-                       return elem;
-               },
-
-               validate: function(sid)
-               {
-                       var i = this.instance[sid];
-
-                       i.widget.find('[cbi-validate]').trigger('validate');
-
-                       return (i.disabled || i.error.text() == '');
-               },
-
-               depends: function(d, v)
-               {
-                       var dep;
-
-                       if ($.isArray(d))
-                       {
-                               dep = { };
-                               for (var i = 0; i < d.length; i++)
-                               {
-                                       if (typeof(d[i]) == 'string')
-                                               dep[d[i]] = true;
-                                       else if (d[i] instanceof AbstractValue)
-                                               dep[d[i].name] = true;
-                               }
-                       }
-                       else if (d instanceof AbstractValue)
-                       {
-                               dep = { };
-                               dep[d.name] = (typeof(v) == 'undefined') ? true : v;
-                       }
-                       else if (typeof(d) == 'object')
-                       {
-                               dep = d;
-                       }
-                       else if (typeof(d) == 'string')
-                       {
-                               dep = { };
-                               dep[d] = (typeof(v) == 'undefined') ? true : v;
-                       }
-
-                       if (!dep || $.isEmptyObject(dep))
-                               return this;
-
-                       for (var field in dep)
-                       {
-                               var f = this.section.fields[field];
-                               if (f)
-                                       f.rdependency[this.name] = this;
-                               else
-                                       delete dep[field];
-                       }
-
-                       if ($.isEmptyObject(dep))
-                               return this;
-
-                       this.dependencies.push(dep);
-
-                       return this;
-               },
-
-               toggle: function(sid)
-               {
-                       var d = this.dependencies;
-                       var i = this.instance[sid];
-
-                       if (!d.length)
-                               return true;
-
-                       for (var n = 0; n < d.length; n++)
-                       {
-                               var rv = true;
-
-                               for (var field in d[n])
-                               {
-                                       var val = this.section.fields[field].formvalue(sid);
-                                       var cmp = d[n][field];
-
-                                       if (typeof(cmp) == 'boolean')
-                                       {
-                                               if (cmp == (typeof(val) == 'undefined' || val === '' || val === false))
-                                               {
-                                                       rv = false;
-                                                       break;
-                                               }
-                                       }
-                                       else if (typeof(cmp) == 'string')
-                                       {
-                                               if (val != cmp)
-                                               {
-                                                       rv = false;
-                                                       break;
-                                               }
-                                       }
-                                       else if (typeof(cmp) == 'function')
-                                       {
-                                               if (!cmp(val))
-                                               {
-                                                       rv = false;
-                                                       break;
-                                               }
-                                       }
-                                       else if (cmp instanceof RegExp)
-                                       {
-                                               if (!cmp.test(val))
-                                               {
-                                                       rv = false;
-                                                       break;
-                                               }
-                                       }
-                               }
-
-                               if (rv)
-                               {
-                                       if (i.disabled)
-                                       {
-                                               i.disabled = false;
-                                               i.top.fadeIn();
-                                       }
-
-                                       return true;
-                               }
-                       }
-
-                       if (!i.disabled)
-                       {
-                               i.disabled = true;
-                               i.top.is(':visible') ? i.top.fadeOut() : i.top.hide();
-                       }
-
-                       return false;
-               }
-       });
-
-       this.cbi.CheckboxValue = AbstractValue.extend({
-               widget: function(sid)
-               {
-                       var o = this.options;
-
-                       if (typeof(o.enabled)  == 'undefined') o.enabled  = '1';
-                       if (typeof(o.disabled) == 'undefined') o.disabled = '0';
-
-                       var i = $('<input />')
-                               .attr('id', this.id(sid))
-                               .attr('type', 'checkbox')
-                               .prop('checked', this.ucivalue(sid));
-
-                       return this.validator(sid, i);
-               },
-
-               ucivalue: function(sid)
-               {
-                       var v = this.callSuper('ucivalue', sid);
-
-                       if (typeof(v) == 'boolean')
-                               return v;
-
-                       return (v == this.options.enabled);
-               },
-
-               formvalue: function(sid)
-               {
-                       var v = $('#' + this.id(sid)).prop('checked');
-
-                       if (typeof(v) == 'undefined')
-                               return !!this.options.initial;
-
-                       return v;
-               },
-
-               save: function(sid)
-               {
-                       var uci = this.ucipath(sid);
-
-                       if (this.instance[sid].disabled)
-                       {
-                               if (!this.options.keep)
-                                       return this.map.set(uci.config, uci.section, uci.option, undefined);
-
-                               return false;
-                       }
-
-                       var chg = this.changed(sid);
-                       var val = this.formvalue(sid);
-
-                       if (chg)
-                       {
-                               val = val ? this.options.enabled : this.options.disabled;
-
-                               if (this.options.optional && val == this.options.initial)
-                                       this.map.set(uci.config, uci.section, uci.option, undefined);
-                               else
-                                       this.map.set(uci.config, uci.section, uci.option, val);
-                       }
-
-                       return chg;
-               }
-       });
-
-       this.cbi.InputValue = AbstractValue.extend({
-               widget: function(sid)
-               {
-                       var i = $('<input />')
-                               .attr('id', this.id(sid))
-                               .attr('type', 'text')
-                               .attr('placeholder', this.options.placeholder)
-                               .val(this.ucivalue(sid));
-
-                       return this.validator(sid, i);
-               }
-       });
-
-       this.cbi.PasswordValue = AbstractValue.extend({
-               widget: function(sid)
-               {
-                       var i = $('<input />')
-                               .attr('id', this.id(sid))
-                               .attr('type', 'password')
-                               .attr('placeholder', this.options.placeholder)
-                               .val(this.ucivalue(sid));
-
-                       var t = $('<img />')
-                               .attr('src', _luci2.globals.resource + '/icons/cbi/reload.gif')
-                               .attr('title', _luci2.tr('Reveal or hide password'))
-                               .addClass('cbi-button')
-                               .click(function(ev) {
-                                       var i = $(this).prev();
-                                       var t = i.attr('type');
-                                       i.attr('type', (t == 'password') ? 'text' : 'password');
-                                       i = t = null;
-                               });
-
-                       this.validator(sid, i);
-
-                       return $('<div />')
-                               .addClass('cbi-input-password')
-                               .append(i)
-                               .append(t);
-               }
-       });
-
-       this.cbi.ListValue = AbstractValue.extend({
-               widget: function(sid)
-               {
-                       var s = $('<select />');
-
-                       if (this.options.optional)
-                               $('<option />')
-                                       .attr('value', '')
-                                       .text(_luci2.tr('-- Please choose --'))
-                                       .appendTo(s);
-
-                       if (this.choices)
-                               for (var i = 0; i < this.choices.length; i++)
-                                       $('<option />')
-                                               .attr('value', this.choices[i][0])
-                                               .text(this.choices[i][1])
-                                               .appendTo(s);
-
-                       s.attr('id', this.id(sid)).val(this.ucivalue(sid));
-
-                       return this.validator(sid, s);
-               },
-
-               value: function(k, v)
-               {
-                       if (!this.choices)
-                               this.choices = [ ];
-
-                       this.choices.push([k, v || k]);
-                       return this;
-               }
-       });
-
-       this.cbi.MultiValue = this.cbi.ListValue.extend({
-               widget: function(sid)
-               {
-                       var v = this.ucivalue(sid);
-                       var t = $('<div />').attr('id', this.id(sid));
-
-                       if (!$.isArray(v))
-                               v = (typeof(v) != 'undefined') ? v.toString().split(/\s+/) : [ ];
-
-                       var s = { };
-                       for (var i = 0; i < v.length; i++)
-                               s[v[i]] = true;
-
-                       if (this.choices)
-                               for (var i = 0; i < this.choices.length; i++)
-                               {
-                                       $('<label />')
-                                               .append($('<input />')
-                                                       .addClass('cbi-input-checkbox')
-                                                       .attr('type', 'checkbox')
-                                                       .attr('value', this.choices[i][0])
-                                                       .prop('checked', s[this.choices[i][0]]))
-                                               .append(this.choices[i][1])
-                                               .appendTo(t);
-
-                                       $('<br />')
-                                               .appendTo(t);
-                               }
-
-                       return t;
-               },
-
-               formvalue: function(sid)
-               {
-                       var rv = [ ];
-                       var fields = $('#' + this.id(sid) + ' > label > input');
-
-                       for (var i = 0; i < fields.length; i++)
-                               if (fields[i].checked)
-                                       rv.push(fields[i].getAttribute('value'));
-
-                       return rv;
-               },
-
-               textvalue: function(sid)
-               {
-                       var v = this.formvalue(sid);
-                       var c = { };
-
-                       if (this.choices)
-                               for (var i = 0; i < this.choices.length; i++)
-                                       c[this.choices[i][0]] = this.choices[i][1];
-
-                       var t = [ ];
-
-                       for (var i = 0; i < v.length; i++)
-                               t.push(c[v[i]] || v[i]);
-
-                       return t.join(', ');
-               }
-       });
-
-       this.cbi.ComboBox = AbstractValue.extend({
-               _change: function(ev)
-               {
-                       var s = ev.target;
-                       var self = ev.data.self;
-
-                       if (s.selectedIndex == (s.options.length - 1))
-                       {
-                               ev.data.select.hide();
-                               ev.data.input.show().focus();
-
-                               var v = ev.data.input.val();
-                               ev.data.input.val(' ');
-                               ev.data.input.val(v);
-                       }
-                       else if (self.options.optional && s.selectedIndex == 0)
-                       {
-                               ev.data.input.val('');
-                       }
-                       else
-                       {
-                               ev.data.input.val(ev.data.select.val());
-                       }
-               },
-
-               _blur: function(ev)
-               {
-                       var seen = false;
-                       var val = this.value;
-                       var self = ev.data.self;
-
-                       ev.data.select.empty();
-
-                       if (self.options.optional)
-                               $('<option />')
-                                       .attr('value', '')
-                                       .text(_luci2.tr('-- please choose --'))
-                                       .appendTo(ev.data.select);
-
-                       if (self.choices)
-                               for (var i = 0; i < self.choices.length; i++)
-                               {
-                                       if (self.choices[i][0] == val)
-                                               seen = true;
-
-                                       $('<option />')
-                                               .attr('value', self.choices[i][0])
-                                               .text(self.choices[i][1])
-                                               .appendTo(ev.data.select);
-                               }
-
-                       if (!seen && val != '')
-                               $('<option />')
-                                       .attr('value', val)
-                                       .text(val)
-                                       .appendTo(ev.data.select);
-
-                       $('<option />')
-                               .attr('value', ' ')
-                               .text(_luci2.tr('-- custom --'))
-                               .appendTo(ev.data.select);
-
-                       ev.data.input.hide();
-                       ev.data.select.val(val).show().focus();
-               },
-
-               _enter: function(ev)
-               {
-                       if (ev.which != 13)
-                               return true;
-
-                       ev.preventDefault();
-                       ev.data.self._blur(ev);
-                       return false;
-               },
-
-               widget: function(sid)
-               {
-                       var d = $('<div />')
-                               .attr('id', this.id(sid));
-
-                       var t = $('<input />')
-                               .attr('type', 'text')
-                               .hide()
-                               .appendTo(d);
-
-                       var s = $('<select />')
-                               .appendTo(d);
-
-                       var evdata = {
-                               self: this,
-                               input: this.validator(sid, t),
-                               select: this.validator(sid, s)
-                       };
-
-                       s.change(evdata, this._change);
-                       t.blur(evdata, this._blur);
-                       t.keydown(evdata, this._enter);
-
-                       t.val(this.ucivalue(sid));
-                       t.blur();
-
-                       return d;
-               },
-
-               value: function(k, v)
-               {
-                       if (!this.choices)
-                               this.choices = [ ];
-
-                       this.choices.push([k, v || k]);
-                       return this;
-               },
-
-               formvalue: function(sid)
-               {
-                       var v = $('#' + this.id(sid)).children('input').val();
-                       return (v == '') ? undefined : v;
-               }
-       });
-
-       this.cbi.DynamicList = this.cbi.ComboBox.extend({
-               _redraw: function(focus, add, del, s)
-               {
-                       var v = s.values || [ ];
-                       delete s.values;
-
-                       $(s.parent).children('input').each(function(i) {
-                               if (i != del)
-                                       v.push(this.value || '');
-                       });
-
-                       $(s.parent).empty();
-
-                       if (add >= 0)
-                       {
-                               focus = add + 1;
-                               v.splice(focus, 0, '');
-                       }
-                       else if (v.length == 0)
-                       {
-                               focus = 0;
-                               v.push('');
-                       }
-
-                       for (var i = 0; i < v.length; i++)
-                       {
-                               var evdata = {
-                                       sid: s.sid,
-                                       self: s.self,
-                                       parent: s.parent,
-                                       index: i
-                               };
-
-                               if (this.choices)
-                               {
-                                       var txt = $('<input />')
-                                               .attr('type', 'text')
-                                               .hide()
-                                               .appendTo(s.parent);
-
-                                       var sel = $('<select />')
-                                               .appendTo(s.parent);
-
-                                       evdata.input = this.validator(s.sid, txt, true);
-                                       evdata.select = this.validator(s.sid, sel, true);
-
-                                       sel.change(evdata, this._change);
-                                       txt.blur(evdata, this._blur);
-                                       txt.keydown(evdata, this._keydown);
-
-                                       txt.val(v[i]);
-                                       txt.blur();
-
-                                       if (i == focus || -(i+1) == focus)
-                                               sel.focus();
-
-                                       sel = txt = null;
-                               }
-                               else
-                               {
-                                       var f = $('<input />')
-                                               .attr('type', 'text')
-                                               .attr('index', i)
-                                               .attr('placeholder', (i == 0) ? this.options.placeholder : '')
-                                               .addClass('cbi-input-text')
-                                               .keydown(evdata, this._keydown)
-                                               .keypress(evdata, this._keypress)
-                                               .val(v[i]);
-
-                                       f.appendTo(s.parent);
-
-                                       if (i == focus)
-                                       {
-                                               f.focus();
-                                       }
-                                       else if (-(i+1) == focus)
-                                       {
-                                               f.focus();
-
-                                               /* force cursor to end */
-                                               var val = f.val();
-                                               f.val(' ');
-                                               f.val(val);
-                                       }
-
-                                       evdata.input = this.validator(s.sid, f, true);
-
-                                       f = null;
-                               }
-
-                               $('<img />')
-                                       .attr('src', _luci2.globals.resource + ((i+1) < v.length ? '/icons/cbi/remove.gif' : '/icons/cbi/add.gif'))
-                                       .attr('title', (i+1) < v.length ? _luci2.tr('Remove entry') : _luci2.tr('Add entry'))
-                                       .addClass('cbi-button')
-                                       .click(evdata, this._btnclick)
-                                       .appendTo(s.parent);
-
-                               $('<br />')
-                                       .appendTo(s.parent);
-
-                               evdata = null;
-                       }
-
-                       s = null;
-               },
-
-               _keypress: function(ev)
-               {
-                       switch (ev.which)
-                       {
-                               /* backspace, delete */
-                               case 8:
-                               case 46:
-                                       if (ev.data.input.val() == '')
-                                       {
-                                               ev.preventDefault();
-                                               return false;
-                                       }
-
-                                       return true;
-
-                               /* enter, arrow up, arrow down */
-                               case 13:
-                               case 38:
-                               case 40:
-                                       ev.preventDefault();
-                                       return false;
-                       }
-
-                       return true;
-               },
-
-               _keydown: function(ev)
-               {
-                       var input = ev.data.input;
-
-                       switch (ev.which)
-                       {
-                               /* backspace, delete */
-                               case 8:
-                               case 46:
-                                       if (input.val().length == 0)
-                                       {
-                                               ev.preventDefault();
-
-                                               var index = ev.data.index;
-                                               var focus = index;
-
-                                               if (ev.which == 8)
-                                                       focus = -focus;
-
-                                               ev.data.self._redraw(focus, -1, index, ev.data);
-                                               return false;
-                                       }
-
-                                       break;
-
-                               /* enter */
-                               case 13:
-                                       ev.data.self._redraw(NaN, ev.data.index, -1, ev.data);
-                                       break;
-
-                               /* arrow up */
-                               case 38:
-                                       var prev = input.prevAll('input:first');
-                                       if (prev.is(':visible'))
-                                               prev.focus();
-                                       else
-                                               prev.next('select').focus();
-                                       break;
-
-                               /* arrow down */
-                               case 40:
-                                       var next = input.nextAll('input:first');
-                                       if (next.is(':visible'))
-                                               next.focus();
-                                       else
-                                               next.next('select').focus();
-                                       break;
-                       }
-
-                       return true;
-               },
-
-               _btnclick: function(ev)
-               {
-                       if (!this.getAttribute('disabled'))
-                       {
-                               if (ev.target.src.indexOf('remove') > -1)
-                               {
-                                       var index = ev.data.index;
-                                       ev.data.self._redraw(-index, -1, index, ev.data);
-                               }
-                               else
-                               {
-                                       ev.data.self._redraw(NaN, ev.data.index, -1, ev.data);
-                               }
-                       }
-
-                       return false;
-               },
-
-               widget: function(sid)
-               {
-                       this.options.optional = true;
-
-                       var v = this.ucivalue(sid);
-
-                       if (!$.isArray(v))
-                               v = (typeof(v) != 'undefined') ? v.toString().split(/\s+/) : [ ];
-
-                       var d = $('<div />')
-                               .attr('id', this.id(sid))
-                               .addClass('cbi-input-dynlist');
-
-                       this._redraw(NaN, -1, -1, {
-                               self:      this,
-                               parent:    d[0],
-                               values:    v,
-                               sid:       sid
-                       });
-
-                       return d;
-               },
-
-               ucivalue: function(sid)
-               {
-                       var v = this.callSuper('ucivalue', sid);
-
-                       if (!$.isArray(v))
-                               v = (typeof(v) != 'undefined') ? v.toString().split(/\s+/) : [ ];
-
-                       return v;
-               },
-
-               formvalue: function(sid)
-               {
-                       var rv = [ ];
-                       var fields = $('#' + this.id(sid) + ' > input');
-
-                       for (var i = 0; i < fields.length; i++)
-                               if (typeof(fields[i].value) == 'string' && fields[i].value.length)
-                                       rv.push(fields[i].value);
-
-                       return rv;
-               }
-       });
-
-       this.cbi.DummyValue = AbstractValue.extend({
-               widget: function(sid)
-               {
-                       return $('<div />')
-                               .addClass('cbi-value-dummy')
-                               .attr('id', this.id(sid))
-                               .html(this.ucivalue(sid));
-               },
-
-               formvalue: function(sid)
-               {
-                       return this.ucivalue(sid);
-               }
-       });
-
-       this.cbi.NetworkList = AbstractValue.extend({
-               load: function(sid)
-               {
-                       var self = this;
-
-                       if (!self.interfaces)
-                       {
-                               self.interfaces = [ ];
-                               return _luci2.network.getNetworkStatus().then(function(ifaces) {
-                                       self.interfaces = ifaces;
-                                       self = null;
-                               });
-                       }
-
-                       return undefined;
-               },
-
-               _device_icon: function(dev)
-               {
-                       var type = 'ethernet';
-                       var desc = _luci2.tr('Ethernet device');
-
-                       if (dev.type == 'IP tunnel')
-                       {
-                               type = 'tunnel';
-                               desc = _luci2.tr('Tunnel interface');
-                       }
-                       else if (dev['bridge-members'])
-                       {
-                               type = 'bridge';
-                               desc = _luci2.tr('Bridge');
-                       }
-                       else if (dev.wireless)
-                       {
-                               type = 'wifi';
-                               desc = _luci2.tr('Wireless Network');
-                       }
-                       else if (dev.device.indexOf('.') > 0)
-                       {
-                               type = 'vlan';
-                               desc = _luci2.tr('VLAN interface');
-                       }
-
-                       return $('<img />')
-                               .attr('src', _luci2.globals.resource + '/icons/' + type + (dev.up ? '' : '_disabled') + '.png')
-                               .attr('title', '%s (%s)'.format(desc, dev.device));
-               },
-
-               widget: function(sid)
-               {
-                       var id = this.id(sid);
-                       var ul = $('<ul />')
-                               .attr('id', id)
-                               .addClass('cbi-input-networks');
-
-                       var itype = this.options.multiple ? 'checkbox' : 'radio';
-                       var value = this.ucivalue(sid);
-                       var check = { };
-
-                       if (!this.options.multiple)
-                               check[value] = true;
-                       else
-                               for (var i = 0; i < value.length; i++)
-                                       check[value[i]] = true;
-
-                       if (this.interfaces)
-                       {
-                               for (var i = 0; i < this.interfaces.length; i++)
-                               {
-                                       var iface = this.interfaces[i];
-                                       var badge = $('<span />')
-                                               .addClass('ifacebadge')
-                                               .text('%s: '.format(iface['interface']));
-
-                                       if (iface.device && iface.device.subdevices)
-                                               for (var j = 0; j < iface.device.subdevices.length; j++)
-                                                       badge.append(this._device_icon(iface.device.subdevices[j]));
-                                       else if (iface.device)
-                                               badge.append(this._device_icon(iface.device));
-                                       else
-                                               badge.append($('<em />').text(_luci2.tr('(No devices attached)')));
-
-                                       $('<li />')
-                                               .append($('<label />')
-                                                       .append($('<input />')
-                                                               .attr('name', itype + id)
-                                                               .attr('type', itype)
-                                                               .attr('value', iface['interface'])
-                                                               .prop('checked', !!check[iface['interface']])
-                                                               .addClass('cbi-input-' + itype))
-                                                       .append(badge))
-                                               .appendTo(ul);
-                               }
-                       }
-
-                       if (!this.options.multiple)
-                       {
-                               $('<li />')
-                                       .append($('<label />')
-                                               .append($('<input />')
-                                                       .attr('name', itype + id)
-                                                       .attr('type', itype)
-                                                       .attr('value', '')
-                                                       .prop('checked', !value)
-                                                       .addClass('cbi-input-' + itype))
-                                               .append(_luci2.tr('unspecified')))
-                                       .appendTo(ul);
-                       }
-
-                       return ul;
-               },
-
-               ucivalue: function(sid)
-               {
-                       var v = this.callSuper('ucivalue', sid);
-
-                       if (!this.options.multiple)
-                       {
-                               if ($.isArray(v))
-                               {
-                                       return v[0];
-                               }
-                               else if (typeof(v) == 'string')
-                               {
-                                       v = v.match(/\S+/);
-                                       return v ? v[0] : undefined;
-                               }
-
-                               return v;
-                       }
-                       else
-                       {
-                               if (typeof(v) == 'string')
-                                       v = v.match(/\S+/g);
-
-                               return v || [ ];
-                       }
-               },
-
-               formvalue: function(sid)
-               {
-                       var inputs = $('#' + this.id(sid) + ' input');
-
-                       if (!this.options.multiple)
-                       {
-                               for (var i = 0; i < inputs.length; i++)
-                                       if (inputs[i].checked && inputs[i].value !== '')
-                                               return inputs[i].value;
-
-                               return undefined;
-                       }
-
-                       var rv = [ ];
-
-                       for (var i = 0; i < inputs.length; i++)
-                               if (inputs[i].checked)
-                                       rv.push(inputs[i].value);
-
-                       return rv.length ? rv : undefined;
-               }
-       });
-
-
-       var AbstractSection = AbstractWidget.extend({
-               id: function()
-               {
-                       var s = [ arguments[0], this.map.uci_package, this.uci_type ];
-
-                       for (var i = 1; i < arguments.length; i++)
-                               s.push(arguments[i].replace(/\./g, '_'));
-
-                       return s.join('_');
-               },
-
-               option: function(widget, name, options)
-               {
-                       if (this.tabs.length == 0)
-                               this.tab({ id: '__default__', selected: true });
-
-                       return this.taboption('__default__', widget, name, options);
-               },
-
-               tab: function(options)
-               {
-                       if (options.selected)
-                               this.tabs.selected = this.tabs.length;
-
-                       this.tabs.push({
-                               id:          options.id,
-                               caption:     options.caption,
-                               description: options.description,
-                               fields:      [ ],
-                               li:          { }
-                       });
-               },
-
-               taboption: function(tabid, widget, name, options)
-               {
-                       var tab;
-                       for (var i = 0; i < this.tabs.length; i++)
-                       {
-                               if (this.tabs[i].id == tabid)
-                               {
-                                       tab = this.tabs[i];
-                                       break;
-                               }
-                       }
-
-                       if (!tab)
-                               throw 'Cannot append to unknown tab ' + tabid;
-
-                       var w = widget ? new widget(name, options) : null;
-
-                       if (!(w instanceof AbstractValue))
-                               throw 'Widget must be an instance of AbstractValue';
-
-                       w.section = this;
-                       w.map     = this.map;
-
-                       this.fields[name] = w;
-                       tab.fields.push(w);
-
-                       return w;
-               },
-
-               ucipackages: function(pkg)
-               {
-                       for (var i = 0; i < this.tabs.length; i++)
-                               for (var j = 0; j < this.tabs[i].fields.length; j++)
-                                       if (this.tabs[i].fields[j].options.uci_package)
-                                               pkg[this.tabs[i].fields[j].options.uci_package] = true;
-               },
-
-               formvalue: function()
-               {
-                       var rv = { };
-
-                       this.sections(function(s) {
-                               var sid = s['.name'];
-                               var sv = rv[sid] || (rv[sid] = { });
-
-                               for (var i = 0; i < this.tabs.length; i++)
-                                       for (var j = 0; j < this.tabs[i].fields.length; j++)
-                                       {
-                                               var val = this.tabs[i].fields[j].formvalue(sid);
-                                               sv[this.tabs[i].fields[j].name] = val;
-                                       }
-                       });
-
-                       return rv;
-               },
-
-               validate: function(sid)
-               {
-                       var rv = true;
-
-                       if (!sid)
-                       {
-                               var as = this.sections();
-                               for (var i = 0; i < as.length; i++)
-                                       if (!this.validate(as[i]['.name']))
-                                               rv = false;
-                               return rv;
-                       }
-
-                       var inst = this.instance[sid];
-                       var sv = rv[sid] || (rv[sid] = { });
-
-                       var invals = 0;
-                       var legend = $('#' + this.id('sort', sid)).find('legend:first');
-
-                       legend.children('span').detach();
-
-                       for (var i = 0; i < this.tabs.length; i++)
-                       {
-                               var inval = 0;
-                               var tab = $('#' + this.id('tabhead', sid, this.tabs[i].id));
-
-                               tab.children('span').detach();
-
-                               for (var j = 0; j < this.tabs[i].fields.length; j++)
-                                       if (!this.tabs[i].fields[j].validate(sid))
-                                               inval++;
-
-                               if (inval > 0)
-                               {
-                                       $('<span />')
-                                               .addClass('badge')
-                                               .attr('title', _luci2.tr('%d Errors'.format(inval)))
-                                               .text(inval)
-                                               .appendTo(tab);
-
-                                       invals += inval;
-                                       tab = null;
-                                       rv = false;
-                               }
-                       }
-
-                       if (invals > 0)
-                               $('<span />')
-                                       .addClass('badge')
-                                       .attr('title', _luci2.tr('%d Errors'.format(invals)))
-                                       .text(invals)
-                                       .appendTo(legend);
-
-                       return rv;
-               }
-       });
-
-       this.cbi.TypedSection = AbstractSection.extend({
-               init: function(uci_type, options)
-               {
-                       this.uci_type = uci_type;
-                       this.options  = options;
-                       this.tabs     = [ ];
-                       this.fields   = { };
-                       this.active_panel = 0;
-                       this.active_tab   = { };
-               },
-
-               filter: function(section)
-               {
-                       return true;
-               },
-
-               sections: function(cb)
-               {
-                       var s1 = this.map.ucisections(this.map.uci_package);
-                       var s2 = [ ];
-
-                       for (var i = 0; i < s1.length; i++)
-                               if (s1[i]['.type'] == this.uci_type)
-                                       if (this.filter(s1[i]))
-                                               s2.push(s1[i]);
-
-                       if (typeof(cb) == 'function')
-                               for (var i = 0; i < s2.length; i++)
-                                       cb.apply(this, [ s2[i] ]);
-
-                       return s2;
-               },
-
-               add: function(name)
-               {
-                       this.map.add(this.map.uci_package, this.uci_type, name);
-               },
-
-               remove: function(sid)
-               {
-                       this.map.remove(this.map.uci_package, sid);
-               },
-
-               _add: function(ev)
-               {
-                       var addb = $(this);
-                       var name = undefined;
-                       var self = ev.data.self;
-
-                       if (addb.prev().prop('nodeName') == 'INPUT')
-                               name = addb.prev().val();
-
-                       if (addb.prop('disabled') || name === '')
-                               return;
-
-                       self.active_panel = -1;
-                       self.map.save();
-                       self.add(name);
-                       self.map.redraw();
-               },
-
-               _remove: function(ev)
-               {
-                       var self = ev.data.self;
-                       var sid  = ev.data.sid;
-
-                       self.map.save();
-                       self.remove(sid);
-                       self.map.redraw();
-
-                       ev.stopPropagation();
-               },
-
-               _sid: function(ev)
-               {
-                       var self = ev.data.self;
-                       var text = $(this);
-                       var addb = text.next();
-                       var errt = addb.next();
-                       var name = text.val();
-                       var used = false;
-
-                       if (!/^[a-zA-Z0-9_]*$/.test(name))
-                       {
-                               errt.text(_luci2.tr('Invalid section name')).show();
-                               text.addClass('error');
-                               addb.prop('disabled', true);
-                               return false;
-                       }
-
-                       for (var sid in self.map.uci.values[self.map.uci_package])
-                               if (sid == name)
-                               {
-                                       used = true;
-                                       break;
-                               }
-
-                       for (var sid in self.map.uci.creates[self.map.uci_package])
-                               if (sid == name)
-                               {
-                                       used = true;
-                                       break;
-                               }
-
-                       if (used)
-                       {
-                               errt.text(_luci2.tr('Name already used')).show();
-                               text.addClass('error');
-                               addb.prop('disabled', true);
-                               return false;
-                       }
-
-                       errt.text('').hide();
-                       text.removeClass('error');
-                       addb.prop('disabled', false);
-                       return true;
-               },
-
-               teaser: function(sid)
-               {
-                       var tf = this.teaser_fields;
-
-                       if (!tf)
-                       {
-                               tf = this.teaser_fields = [ ];
-
-                               if ($.isArray(this.options.teasers))
-                               {
-                                       for (var i = 0; i < this.options.teasers.length; i++)
-                                       {
-                                               var f = this.options.teasers[i];
-                                               if (f instanceof AbstractValue)
-                                                       tf.push(f);
-                                               else if (typeof(f) == 'string' && this.fields[f] instanceof AbstractValue)
-                                                       tf.push(this.fields[f]);
-                                       }
-                               }
-                               else
-                               {
-                                       for (var i = 0; tf.length <= 5 && i < this.tabs.length; i++)
-                                               for (var j = 0; tf.length <= 5 && j < this.tabs[i].fields.length; j++)
-                                                       tf.push(this.tabs[i].fields[j]);
-                               }
-                       }
-
-                       var t = '';
-
-                       for (var i = 0; i < tf.length; i++)
-                       {
-                               if (tf[i].instance[sid] && tf[i].instance[sid].disabled)
-                                       continue;
-
-                               var n = tf[i].options.caption || tf[i].name;
-                               var v = tf[i].textvalue(sid);
-
-                               if (typeof(v) == 'undefined')
-                                       continue;
-
-                               t = t + '%s%s: <strong>%s</strong>'.format(t ? ' | ' : '', n, v);
-                       }
-
-                       return t;
-               },
-
-               _render_add: function()
-               {
-                       var text = _luci2.tr('Add section');
-                       var ttip = _luci2.tr('Create new section...');
-
-                       if ($.isArray(this.options.add_caption))
-                               text = this.options.add_caption[0], ttip = this.options.add_caption[1];
-                       else if (typeof(this.options.add_caption) == 'string')
-                               text = this.options.add_caption, ttip = '';
-
-                       var add = $('<div />').addClass('cbi-section-add');
-
-                       if (this.options.anonymous === false)
-                       {
-                               $('<input />')
-                                       .addClass('cbi-input-text')
-                                       .attr('type', 'text')
-                                       .attr('placeholder', ttip)
-                                       .blur({ self: this }, this._sid)
-                                       .keyup({ self: this }, this._sid)
-                                       .appendTo(add);
-
-                               $('<img />')
-                                       .attr('src', _luci2.globals.resource + '/icons/cbi/add.gif')
-                                       .attr('title', text)
-                                       .addClass('cbi-button')
-                                       .click({ self: this }, this._add)
-                                       .appendTo(add);
-
-                               $('<div />')
-                                       .addClass('cbi-value-error')
-                                       .hide()
-                                       .appendTo(add);
-                       }
-                       else
-                       {
-                               $('<input />')
-                                       .attr('type', 'button')
-                                       .addClass('cbi-button')
-                                       .addClass('cbi-button-add')
-                                       .val(text).attr('title', ttip)
-                                       .click({ self: this }, this._add)
-                                       .appendTo(add)
-                       }
-
-                       return add;
-               },
-
-               _render_remove: function(sid)
-               {
-                       var text = _luci2.tr('Remove');
-                       var ttip = _luci2.tr('Remove this section');
-
-                       if ($.isArray(this.options.remove_caption))
-                               text = this.options.remove_caption[0], ttip = this.options.remove_caption[1];
-                       else if (typeof(this.options.remove_caption) == 'string')
-                               text = this.options.remove_caption, ttip = '';
-
-                       return $('<input />')
-                               .attr('type', 'button')
-                               .addClass('cbi-button')
-                               .addClass('cbi-button-remove')
-                               .val(text).attr('title', ttip)
-                               .click({ self: this, sid: sid }, this._remove);
-               },
-
-               _render_caption: function(sid)
-               {
-                       if (typeof(this.options.caption) == 'string')
-                       {
-                               return $('<legend />')
-                                       .text(this.options.caption.format(sid));
-                       }
-                       else if (typeof(this.options.caption) == 'function')
-                       {
-                               return $('<legend />')
-                                       .text(this.options.caption.call(this, sid));
-                       }
-
-                       return '';
-               },
-
-               render: function()
-               {
-                       var allsections = $();
-                       var panel_index = 0;
-
-                       this.instance = { };
-
-                       var s = this.sections();
-
-                       if (s.length == 0)
-                       {
-                               var fieldset = $('<fieldset />')
-                                       .addClass('cbi-section');
-
-                               var head = $('<div />')
-                                       .addClass('cbi-section-head')
-                                       .appendTo(fieldset);
-
-                               head.append(this._render_caption(undefined));
-
-                               if (typeof(this.options.description) == 'string')
-                               {
-                                       $('<div />')
-                                               .addClass('cbi-section-descr')
-                                               .text(this.options.description)
-                                               .appendTo(head);
-                               }
-
-                               allsections = allsections.add(fieldset);
-                       }
-
-                       for (var i = 0; i < s.length; i++)
-                       {
-                               var sid = s[i]['.name'];
-                               var inst = this.instance[sid] = { tabs: [ ] };
-
-                               var fieldset = $('<fieldset />')
-                                       .attr('id', this.id('sort', sid))
-                                       .addClass('cbi-section');
-
-                               var head = $('<div />')
-                                       .addClass('cbi-section-head')
-                                       .attr('cbi-section-num', this.index)
-                                       .attr('cbi-section-id', sid);
-
-                               head.append(this._render_caption(sid));
-
-                               if (typeof(this.options.description) == 'string')
-                               {
-                                       $('<div />')
-                                               .addClass('cbi-section-descr')
-                                               .text(this.options.description)
-                                               .appendTo(head);
-                               }
-
-                               var teaser;
-                               if ((s.length > 1 && this.options.collabsible) || this.map.options.collabsible)
-                                       teaser = $('<div />')
-                                               .addClass('cbi-section-teaser')
-                                               .appendTo(head);
-
-                               if (this.options.addremove)
-                                       $('<div />')
-                                               .addClass('cbi-section-remove')
-                                               .addClass('right')
-                                               .append(this._render_remove(sid))
-                                               .appendTo(head);
-
-                               var body = $('<div />')
-                                       .attr('index', panel_index++);
-
-                               var fields = $('<fieldset />')
-                                       .addClass('cbi-section-node');
-
-                               if (this.tabs.length > 1)
-                               {
-                                       var menu = $('<ul />')
-                                               .addClass('cbi-tabmenu');
-
-                                       for (var j = 0; j < this.tabs.length; j++)
-                                       {
-                                               var tabid = this.id('tab', sid, this.tabs[j].id);
-                                               var theadid = this.id('tabhead', sid, this.tabs[j].id);
-
-                                               var tabc = $('<div />')
-                                                       .addClass('cbi-tabcontainer')
-                                                       .attr('id', tabid)
-                                                       .attr('index', j);
-
-                                               if (typeof(this.tabs[j].description) == 'string')
-                                               {
-                                                       $('<div />')
-                                                               .addClass('cbi-tab-descr')
-                                                               .text(this.tabs[j].description)
-                                                               .appendTo(tabc);
-                                               }
-
-                                               for (var k = 0; k < this.tabs[j].fields.length; k++)
-                                                       this.tabs[j].fields[k].render(sid).appendTo(tabc);
-
-                                               tabc.appendTo(fields);
-                                               tabc = null;
-
-                                               $('<li />').attr('id', theadid).append(
-                                                       $('<a />')
-                                                               .text(this.tabs[j].caption.format(this.tabs[j].id))
-                                                               .attr('href', '#' + tabid)
-                                               ).appendTo(menu);
-                                       }
-
-                                       menu.appendTo(body);
-                                       menu = null;
-
-                                       fields.appendTo(body);
-                                       fields = null;
-
-                                       var t = body.tabs({ active: this.active_tab[sid] });
-
-                                       t.on('tabsactivate', { self: this, sid: sid }, function(ev, ui) {
-                                               var d = ev.data;
-                                               d.self.validate();
-                                               d.self.active_tab[d.sid] = parseInt(ui.newPanel.attr('index'));
-                                       });
-                               }
-                               else
-                               {
-                                       for (var j = 0; j < this.tabs[0].fields.length; j++)
-                                               this.tabs[0].fields[j].render(sid).appendTo(fields);
-
-                                       fields.appendTo(body);
-                                       fields = null;
-                               }
-
-                               head.appendTo(fieldset);
-                               head = null;
-
-                               body.appendTo(fieldset);
-                               body = null;
-
-                               allsections = allsections.add(fieldset);
-                               fieldset = null;
-
-                               //this.validate(sid);
-                               //
-                               //if (teaser)
-                               //      teaser.append(this.teaser(sid));
-                       }
-
-                       if (this.options.collabsible && s.length > 1)
-                       {
-                               var a = $('<div />').append(allsections).accordion({
-                                       header: '> fieldset > div.cbi-section-head',
-                                       heightStyle: 'content',
-                                       active: this.active_panel
-                               });
-
-                               a.on('accordionbeforeactivate', { self: this }, function(ev, ui) {
-                                       var h = ui.oldHeader;
-                                       var s = ev.data.self;
-                                       var i = h.attr('cbi-section-id');
-
-                                       h.children('.cbi-section-teaser').empty().append(s.teaser(i));
-                                       s.validate();
-                               });
-
-                               a.on('accordionactivate', { self: this }, function(ev, ui) {
-                                       ev.data.self.active_panel = parseInt(ui.newPanel.attr('index'));
-                               });
-
-                               if (this.options.sortable)
-                               {
-                                       var s = a.sortable({
-                                               axis: 'y',
-                                               handle: 'div.cbi-section-head'
-                                       });
-
-                                       s.on('sortupdate', { self: this, ids: s.sortable('toArray') }, function(ev, ui) {
-                                               var sections = [ ];
-                                               for (var i = 0; i < ev.data.ids.length; i++)
-                                                       sections.push(ev.data.ids[i].substring(ev.data.ids[i].lastIndexOf('.') + 1));
-                                               _luci2.uci.order(ev.data.self.map.uci_package, sections);
-                                       });
-
-                                       s.on('sortstop', function(ev, ui) {
-                                               ui.item.children('div.cbi-section-head').triggerHandler('focusout');
-                                       });
-                               }
-
-                               if (this.options.addremove)
-                                       this._render_add().appendTo(a);
-
-                               return a;
-                       }
-
-                       if (this.options.addremove)
-                               allsections = allsections.add(this._render_add());
-
-                       return allsections;
-               },
-
-               finish: function()
-               {
-                       var s = this.sections();
-
-                       for (var i = 0; i < s.length; i++)
-                       {
-                               var sid = s[i]['.name'];
-
-                               this.validate(sid);
-
-                               $('#' + this.id('sort', sid))
-                                       .children('.cbi-section-head')
-                                       .children('.cbi-section-teaser')
-                                       .append(this.teaser(sid));
-                       }
-               }
-       });
-
-       this.cbi.TableSection = this.cbi.TypedSection.extend({
-               render: function()
-               {
-                       var allsections = $();
-                       var panel_index = 0;
-
-                       this.instance = { };
-
-                       var s = this.sections();
-
-                       var fieldset = $('<fieldset />')
-                               .addClass('cbi-section');
-
-                       fieldset.append(this._render_caption(sid));
-
-                       if (typeof(this.options.description) == 'string')
-                       {
-                               $('<div />')
-                                       .addClass('cbi-section-descr')
-                                       .text(this.options.description)
-                                       .appendTo(fieldset);
-                       }
-
-                       var fields = $('<div />')
-                               .addClass('cbi-section-node')
-                               .appendTo(fieldset);
-
-                       var table = $('<table />')
-                               .addClass('cbi-section-table')
-                               .appendTo(fields);
-
-                       var thead = $('<thead />')
-                               .append($('<tr />').addClass('cbi-section-table-titles'))
-                               .appendTo(table);
-
-                       for (var j = 0; j < this.tabs[0].fields.length; j++)
-                               $('<th />')
-                                       .addClass('cbi-section-table-cell')
-                                       .css('width', this.tabs[0].fields[j].options.width || '')
-                                       .append(this.tabs[0].fields[j].options.caption)
-                                       .appendTo(thead.children());
-
-                       if (this.options.sortable)
-                               $('<th />').addClass('cbi-section-table-cell').text(' ').appendTo(thead.children());
-
-                       if (this.options.addremove !== false)
-                               $('<th />').addClass('cbi-section-table-cell').text(' ').appendTo(thead.children());
-
-                       var tbody = $('<tbody />')
-                               .appendTo(table);
-
-                       if (s.length == 0)
-                       {
-                               $('<tr />')
-                                       .addClass('cbi-section-table-row')
-                                       .append(
-                                               $('<td />')
-                                                       .addClass('cbi-section-table-cell')
-                                                       .addClass('cbi-section-table-placeholder')
-                                                       .attr('colspan', thead.children().children().length)
-                                                       .text(this.options.placeholder || _luci2.tr('This section contains no values yet')))
-                                       .appendTo(tbody);
-                       }
-
-                       for (var i = 0; i < s.length; i++)
-                       {
-                               var sid = s[i]['.name'];
-                               var inst = this.instance[sid] = { tabs: [ ] };
-
-                               var row = $('<tr />')
-                                       .addClass('cbi-section-table-row')
-                                       .appendTo(tbody);
-
-                               for (var j = 0; j < this.tabs[0].fields.length; j++)
-                               {
-                                       $('<td />')
-                                               .addClass('cbi-section-table-cell')
-                                               .css('width', this.tabs[0].fields[j].options.width || '')
-                                               .append(this.tabs[0].fields[j].render(sid, true))
-                                               .appendTo(row);
-                               }
-
-                               if (this.options.sortable)
-                               {
-                                       $('<td />')
-                                               .addClass('cbi-section-table-cell')
-                                               .addClass('cbi-section-table-sort')
-                                               .append($('<img />').attr('src', _luci2.globals.resource + '/icons/cbi/up.gif').attr('title', _luci2.tr('Drag to sort')))
-                                               .append($('<br />'))
-                                               .append($('<img />').attr('src', _luci2.globals.resource + '/icons/cbi/down.gif').attr('title', _luci2.tr('Drag to sort')))
-                                               .appendTo(row);
-                               }
-
-                               if (this.options.addremove !== false)
-                               {
-                                       $('<td />')
-                                               .addClass('cbi-section-table-cell')
-                                               .append(this._render_remove(sid))
-                                               .appendTo(row);
-                               }
-
-                               this.validate(sid);
-
-                               row = null;
-                       }
-
-                       if (this.options.sortable)
-                       {
-                               var s = tbody.sortable({
-                                       handle: 'td.cbi-section-table-sort'
-                               });
-
-                               s.on('sortupdate', { self: this, ids: s.sortable('toArray') }, function(ev, ui) {
-                                       var sections = [ ];
-                                       for (var i = 0; i < ev.data.ids.length; i++)
-                                               sections.push(ev.data.ids[i].substring(ev.data.ids[i].lastIndexOf('.') + 1));
-                                       _luci2.uci.order(ev.data.self.map.uci_package, sections);
-                               });
-
-                               s.on('sortstop', function(ev, ui) {
-                                       ui.item.children('div.cbi-section-head').triggerHandler('focusout');
-                               });
-                       }
-
-                       if (this.options.addremove)
-                               this._render_add().appendTo(fieldset);
-
-                       fields = table = thead = tbody = null;
-
-                       return fieldset;
-               }
-       });
-
-       this.cbi.NamedSection = this.cbi.TypedSection.extend({
-               sections: function(cb)
-               {
-                       var sa = [ ];
-                       var pkg = this.map.uci.values[this.map.uci_package];
-
-                       for (var s in pkg)
-                               if (pkg[s]['.name'] == this.uci_type)
-                               {
-                                       sa.push(pkg[s]);
-                                       break;
-                               }
-
-                       if (typeof(cb) == 'function' && sa.length > 0)
-                               cb.apply(this, [ sa[0] ]);
-
-                       return sa;
-               }
-       });
-
-       this.cbi.DummySection = this.cbi.TypedSection.extend({
-               sections: function(cb)
-               {
-                       if (typeof(cb) == 'function')
-                               cb.apply(this, [ { '.name': this.uci_type } ]);
-
-                       return [ { '.name': this.uci_type } ];
-               }
-       });
-
-       this.cbi.Map = AbstractWidget.extend({
-               init: function(uci_package, options)
-               {
-                       var self = this;
-
-                       this.uci_package = uci_package;
-                       this.sections = [ ];
-                       this.options = _luci2.defaults(options, {
-                               save:    function() { },
-                               prepare: function() {
-                                       return _luci2.uci.writable(function(writable) {
-                                               self.options.readonly = !writable;
-                                       });
-                               }
-                       });
-               },
-
-               load: function()
-               {
-                       this.uci = {
-                               newid:   0,
-                               values:  { },
-                               creates: { },
-                               changes: { },
-                               deletes: { }
-                       };
-
-                       this.active_panel = 0;
-
-                       var packages = { };
-
-                       for (var i = 0; i < this.sections.length; i++)
-                               this.sections[i].ucipackages(packages);
-
-                       packages[this.uci_package] = true;
-
-                       var load_cb = this._load_cb || (this._load_cb = $.proxy(function(packages) {
-                               for (var i = 0; i < packages.length; i++)
-                               {
-                                       this.uci.values[packages[i]['.package']] = packages[i];
-                                       delete packages[i]['.package'];
-                               }
-
-                               var deferreds = [ _luci2.deferrable(this.options.prepare()) ];
-
-                               for (var i = 0; i < this.sections.length; i++)
-                               {
-                                       for (var f in this.sections[i].fields)
-                                       {
-                                               if (typeof(this.sections[i].fields[f].load) != 'function')
-                                                       continue;
-
-                                               var s = this.sections[i].sections();
-                                               for (var j = 0; j < s.length; j++)
-                                               {
-                                                       var rv = this.sections[i].fields[f].load(s[j]['.name']);
-                                                       if (_luci2.isDeferred(rv))
-                                                               deferreds.push(rv);
-                                               }
-                                       }
-                               }
-
-                               return $.when.apply($, deferreds);
-                       }, this));
-
-                       _luci2.rpc.batch();
-
-                       for (var pkg in packages)
-                               _luci2.uci.get_all(pkg);
-
-                       return _luci2.rpc.flush().then(load_cb);
-               },
-
-               render: function()
-               {
-                       var map = $('<div />').addClass('cbi-map');
-
-                       if (typeof(this.options.caption) == 'string')
-                               $('<h2 />').text(this.options.caption).appendTo(map);
-
-                       if (typeof(this.options.description) == 'string')
-                               $('<div />').addClass('cbi-map-descr').text(this.options.description).appendTo(map);
-
-                       var sections = $('<div />').appendTo(map);
-
-                       for (var i = 0; i < this.sections.length; i++)
-                       {
-                               var s = this.sections[i].render();
-
-                               if (this.options.readonly || this.sections[i].options.readonly)
-                                       s.find('input, select, button, img.cbi-button').attr('disabled', true);
-
-                               s.appendTo(sections);
-
-                               if (this.sections[i].options.active)
-                                       this.active_panel = i;
-                       }
-
-                       if (this.options.collabsible)
-                       {
-                               var a = sections.accordion({
-                                       header: '> fieldset > div.cbi-section-head',
-                                       heightStyle: 'content',
-                                       active: this.active_panel
-                               });
-
-                               a.on('accordionbeforeactivate', { self: this }, function(ev, ui) {
-                                       var h = ui.oldHeader;
-                                       var s = ev.data.self.sections[parseInt(h.attr('cbi-section-num'))];
-                                       var i = h.attr('cbi-section-id');
-
-                                       h.children('.cbi-section-teaser').empty().append(s.teaser(i));
-
-                                       for (var i = 0; i < ev.data.self.sections.length; i++)
-                                               ev.data.self.sections[i].validate();
-                               });
-
-                               a.on('accordionactivate', { self: this }, function(ev, ui) {
-                                       ev.data.self.active_panel = parseInt(ui.newPanel.attr('index'));
-                               });
-                       }
-
-                       if (this.options.pageaction !== false)
-                       {
-                               var a = $('<div />')
-                                       .addClass('cbi-page-actions')
-                                       .appendTo(map);
-
-                               $('<input />')
-                                       .addClass('cbi-button').addClass('cbi-button-apply')
-                                       .attr('type', 'button')
-                                       .val(_luci2.tr('Save & Apply'))
-                                       .appendTo(a);
-
-                               $('<input />')
-                                       .addClass('cbi-button').addClass('cbi-button-save')
-                                       .attr('type', 'button')
-                                       .val(_luci2.tr('Save'))
-                                       .click({ self: this }, function(ev) { ev.data.self.send(); })
-                                       .appendTo(a);
-
-                               $('<input />')
-                                       .addClass('cbi-button').addClass('cbi-button-reset')
-                                       .attr('type', 'button')
-                                       .val(_luci2.tr('Reset'))
-                                       .click({ self: this }, function(ev) { ev.data.self.insertInto(ev.data.self.target); })
-                                       .appendTo(a);
-
-                               a = null;
-                       }
-
-                       var top = $('<form />').append(map);
-
-                       map = null;
-
-                       return top;
-               },
-
-               finish: function()
-               {
-                       for (var i = 0; i < this.sections.length; i++)
-                               this.sections[i].finish();
-
-                       this.validate();
-               },
-
-               redraw: function()
-               {
-                       this.target.hide().empty().append(this.render());
-                       this.finish();
-                       this.target.show();
-               },
-
-               section: function(widget, uci_type, options)
-               {
-                       var w = widget ? new widget(uci_type, options) : null;
-
-                       if (!(w instanceof AbstractSection))
-                               throw 'Widget must be an instance of AbstractSection';
-
-                       w.map = this;
-                       w.index = this.sections.length;
-
-                       this.sections.push(w);
-                       return w;
-               },
-
-               formvalue: function()
-               {
-                       var rv = { };
-
-                       for (var i = 0; i < this.sections.length; i++)
-                       {
-                               var sids = this.sections[i].formvalue();
-                               for (var sid in sids)
-                               {
-                                       var s = rv[sid] || (rv[sid] = { });
-                                       $.extend(s, sids[sid]);
-                               }
-                       }
-
-                       return rv;
-               },
-
-               add: function(conf, type, name)
-               {
-                       var c = this.uci.creates;
-                       var s = '.new.%d'.format(this.uci.newid++);
-
-                       if (!c[conf])
-                               c[conf] = { };
-
-                       c[conf][s] = {
-                               '.type':      type,
-                               '.name':      s,
-                               '.create':    name,
-                               '.anonymous': !name
-                       };
-
-                       return s;
-               },
-
-               remove: function(conf, sid)
-               {
-                       var n = this.uci.creates;
-                       var c = this.uci.changes;
-                       var d = this.uci.deletes;
-
-                       /* requested deletion of a just created section */
-                       if (sid.indexOf('.new.') == 0)
-                       {
-                               if (n[conf])
-                                       delete n[conf][sid];
-                       }
-                       else
-                       {
-                               if (c[conf])
-                                       delete c[conf][sid];
-
-                               if (!d[conf])
-                                       d[conf] = { };
-
-                               d[conf][sid] = true;
-                       }
-               },
-
-               ucisections: function(conf, cb)
-               {
-                       var sa = [ ];
-                       var pkg = this.uci.values[conf];
-                       var crt = this.uci.creates[conf];
-                       var del = this.uci.deletes[conf];
-
-                       if (!pkg)
-                               return sa;
-
-                       for (var s in pkg)
-                               if (!del || del[s] !== true)
-                                       sa.push(pkg[s]);
-
-                       sa.sort(function(a, b) { return a['.index'] - b['.index'] });
-
-                       if (crt)
-                               for (var s in crt)
-                                       sa.push(crt[s]);
-
-                       if (typeof(cb) == 'function')
-                               for (var i = 0; i < sa.length; i++)
-                                       cb.apply(this, [ sa[i] ]);
-
-                       return sa;
-               },
-
-               get: function(conf, sid, opt)
-               {
-                       var v = this.uci.values;
-                       var n = this.uci.creates;
-                       var c = this.uci.changes;
-                       var d = this.uci.deletes;
-
-                       /* requested option in a just created section */
-                       if (sid.indexOf('.new.') == 0)
-                       {
-                               if (!n[conf])
-                                       return undefined;
-
-                               if (typeof(opt) == 'undefined')
-                                       return (n[conf][sid] || { });
-
-                               return n[conf][sid][opt];
-                       }
-
-                       /* requested an option value */
-                       if (typeof(opt) != 'undefined')
-                       {
-                               /* check whether option was deleted */
-                               if (d[conf] && d[conf][sid])
-                               {
-                                       if (d[conf][sid] === true)
-                                               return undefined;
-
-                                       for (var i = 0; i < d[conf][sid].length; i++)
-                                               if (d[conf][sid][i] == opt)
-                                                       return undefined;
-                               }
-
-                               /* check whether option was changed */
-                               if (c[conf] && c[conf][sid] && typeof(c[conf][sid][opt]) != 'undefined')
-                                       return c[conf][sid][opt];
-
-                               /* return base value */
-                               if (v[conf] && v[conf][sid])
-                                       return v[conf][sid][opt];
-
-                               return undefined;
-                       }
-
-                       /* requested an entire section */
-                       if (v[conf])
-                               return (v[conf][sid] || { });
-
-                       return undefined;
-               },
-
-               set: function(conf, sid, opt, val)
-               {
-                       var n = this.uci.creates;
-                       var c = this.uci.changes;
-                       var d = this.uci.deletes;
-
-                       if (sid.indexOf('.new.') == 0)
-                       {
-                               if (n[conf] && n[conf][sid])
-                               {
-                                       if (typeof(val) != 'undefined')
-                                               n[conf][sid][opt] = val;
-                                       else
-                                               delete n[conf][sid][opt];
-                               }
-                       }
-                       else if (typeof(val) != 'undefined')
-                       {
-                               if (!c[conf])
-                                       c[conf] = { };
-
-                               if (!c[conf][sid])
-                                       c[conf][sid] = { };
-
-                               c[conf][sid][opt] = val;
-                       }
-                       else
-                       {
-                               if (!d[conf])
-                                       d[conf] = { };
-
-                               if (!d[conf][sid])
-                                       d[conf][sid] = [ ];
-
-                               d[conf][sid].push(opt);
-                       }
-               },
-
-               validate: function()
-               {
-                       var rv = true;
-
-                       for (var i = 0; i < this.sections.length; i++)
-                               if (!this.sections[i].validate())
-                                       rv = false;
-
-                       return rv;
-               },
-
-               save: function()
-               {
-                       if (this.options.readonly)
-                               return _luci2.deferrable();
-
-                       var deferreds = [ _luci2.deferrable(this.options.save()) ];
-
-                       for (var i = 0; i < this.sections.length; i++)
-                       {
-                               if (this.sections[i].options.readonly)
-                                       continue;
-
-                               for (var f in this.sections[i].fields)
-                               {
-                                       if (typeof(this.sections[i].fields[f].save) != 'function')
-                                               continue;
-
-                                       var s = this.sections[i].sections();
-                                       for (var j = 0; j < s.length; j++)
-                                       {
-                                               var rv = this.sections[i].fields[f].save(s[j]['.name']);
-                                               if (_luci2.isDeferred(rv))
-                                                       deferreds.push(rv);
-                                       }
-                               }
-                       }
-
-                       return $.when.apply($, deferreds);
-               },
-
-               send: function()
-               {
-                       if (!this.validate())
-                               return _luci2.deferrable();
-
-                       var send_cb = this._send_cb || (this._send_cb = $.proxy(function() {
-                               _luci2.rpc.batch();
-
-                               if (this.uci.creates)
-                                       for (var c in this.uci.creates)
-                                               for (var s in this.uci.creates[c])
-                                               {
-                                                       var r = {
-                                                               config: c,
-                                                               values: { }
-                                                       };
-
-                                                       for (var k in this.uci.creates[c][s])
-                                                       {
-                                                               if (k == '.type')
-                                                                       r.type = this.uci.creates[c][s][k];
-                                                               else if (k == '.create')
-                                                                       r.name = this.uci.creates[c][s][k];
-                                                               else if (k.charAt(0) != '.')
-                                                                       r.values[k] = this.uci.creates[c][s][k];
-                                                       }
-
-                                                       _luci2.uci.add(r.config, r.type, r.name, r.values);
-                                               }
-
-                               if (this.uci.changes)
-                                       for (var c in this.uci.changes)
-                                               for (var s in this.uci.changes[c])
-                                                       _luci2.uci.set(c, s, this.uci.changes[c][s]);
-
-                               if (this.uci.deletes)
-                                       for (var c in this.uci.deletes)
-                                               for (var s in this.uci.deletes[c])
-                                               {
-                                                       var o = this.uci.deletes[c][s];
-                                                       _luci2.uci['delete'](c, s, (o === true) ? undefined : o);
-                                               }
-
-                               return _luci2.rpc.flush();
-                       }, this));
-
-                       var self = this;
-
-                       _luci2.ui.loading(true);
-
-                       return this.save().then(send_cb).then(function() {
-                               return self.load();
-                       }).then(function() {
-                               self.redraw();
-                               self = null;
-
-                               _luci2.ui.loading(false);
-                       });
-               },
-
-               dialog: function(id)
-               {
-                       var d = $('<div />');
-                       var p = $('<p />');
-
-                       $('<img />')
-                               .attr('src', _luci2.globals.resource + '/icons/loading.gif')
-                               .css('vertical-align', 'middle')
-                               .css('padding-right', '10px')
-                               .appendTo(p);
-
-                       p.append(_luci2.tr('Loading data...'));
-
-                       p.appendTo(d);
-                       d.appendTo(id);
-
-                       return d.dialog({
-                               modal: true,
-                               draggable: false,
-                               resizable: false,
-                               height: 90,
-                               open: function() {
-                                       $(this).parent().children('.ui-dialog-titlebar').hide();
-                               }
-                       });
-               },
-
-               insertInto: function(id)
-               {
-                       var self = this;
-                           self.target = $(id);
-
-                       _luci2.ui.loading(true);
-                       self.target.hide();
-
-                       return self.load().then(function() {
-                               self.target.empty().append(self.render());
-                               self.finish();
-                               self.target.show();
-                               self = null;
-                               _luci2.ui.loading(false);
-                       });
-               }
-       });
+       Class.instantiate('luci2.rpc');
+       Class.instantiate('luci2.uci');
+       Class.instantiate('luci2.network');
+       Class.instantiate('luci2.wireless');
+       Class.instantiate('luci2.firewall');
+       Class.instantiate('luci2.system');
+       Class.instantiate('luci2.session');
+       Class.instantiate('luci2.ui');
+       Class.instantiate('luci2.cbi');
 };