X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci2%2Fui.git;a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Fluci2.js;h=6c7db677418081ed9582c9fcf8da1835dd56d3af;hp=291af572d31119ec0e318aa03a68220b420ff3bd;hb=5e77a7735b0594f50b5ce6e4f3d2b2cb6bf5d546;hpb=8f89e46fcaec5cb1deb9e73b9f77b3b1cd0d8ad1

diff --git a/luci2/htdocs/luci2/luci2.js b/luci2/htdocs/luci2/luci2.js
index 291af57..6c7db67 100644
--- a/luci2/htdocs/luci2/luci2.js
+++ b/luci2/htdocs/luci2/luci2.js
@@ -214,7 +214,7 @@ function LuCI2()
 		_class.prototype = prototype;
 		_class.prototype.constructor = _class;
 
-		_class.extend = arguments.callee;
+		_class.extend = Class.extend;
 
 		return _class;
 	};
@@ -364,8 +364,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,6 +388,103 @@ function LuCI2()
 		return data;
 	};
 
+	this.toArray = function(x)
+	{
+		switch (typeof(x))
+		{
+		case 'number':
+		case 'boolean':
+			return [ x ];
+
+		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;
+
+		case 'object':
+			if ($.isArray(x))
+			{
+				var r = [ ];
+				for (var i = 0; i < x.length; i++)
+					r.push(x[i]);
+				return r;
+			}
+			else if ($.isPlainObject(x))
+			{
+				var r = [ ];
+				for (var k in x)
+					if (x.hasOwnProperty(k))
+						r.push(k);
+				return r.sort();
+			}
+		}
+
+		return [ ];
+	};
+
+	this.toObject = function(x)
+	{
+		switch (typeof(x))
+		{
+		case 'number':
+		case 'boolean':
+			return { x: true };
+
+		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;
+
+		case 'object':
+			if ($.isArray(x))
+			{
+				var r = { };
+				for (var i = 0; i < x.length; i++)
+					r[x[i]] = true;
+				return r;
+			}
+			else if ($.isPlainObject(x))
+			{
+				return x;
+			}
+		}
+
+		return { };
+	};
+
+	this.filterArray = function(array, item)
+	{
+		if (!$.isArray(array))
+			return [ ];
+
+		for (var i = 0; i < array.length; i++)
+			if (array[i] === item)
+				array.splice(i--, 1);
+
+		return array;
+	};
+
+	this.toClassName = function(str, suffix)
+	{
+		var n = '';
+		var l = str.split(/[\/.]/);
+
+		for (var i = 0; i < l.length; i++)
+			if (l[i].length > 0)
+				n += l[i].charAt(0).toUpperCase() + l[i].substr(1).toLowerCase();
+
+		if (typeof(suffix) == 'string')
+			n += suffix;
+
+		return n;
+	};
+
 	this.globals = {
 		timeout:  15000,
 		resource: '/luci2',
@@ -451,7 +550,7 @@ function LuCI2()
 						if (typeof(ret) != 'undefined' && key != '')
 							ret = ret[key];
 
-						if (type.call(ret) != type.call(req.expect[key]))
+						if (typeof(ret) == 'undefined' || type.call(ret) != type.call(req.expect[key]))
 							ret = req.expect[key];
 
 						break;
@@ -1653,29 +1752,22 @@ function LuCI2()
 
 			var state = _luci2.ui._loading || (_luci2.ui._loading = {
 				modal: $('<div />')
-					.addClass('cbi-modal-loader')
-					.append($('<div />').text(_luci2.tr('Loading data...')))
+					.addClass('modal fade')
+					.append($('<div />')
+						.addClass('modal-dialog')
+						.append($('<div />')
+							.addClass('modal-content luci2-modal-loader')
+							.append($('<div />')
+								.addClass('modal-body')
+								.text(_luci2.tr('Loading data…')))))
 					.appendTo(body)
+					.modal({
+						backdrop: 'static',
+						keyboard: false
+					})
 			});
 
-			if (enable)
-			{
-				body.css('overflow', 'hidden');
-				body.css('padding', 0);
-				body.css('width', win.width());
-				body.css('height', win.height());
-				state.modal.css('width', win.width());
-				state.modal.css('height', win.height());
-				state.modal.show();
-			}
-			else
-			{
-				state.modal.hide();
-				body.css('overflow', '');
-				body.css('padding', '');
-				body.css('width', '');
-				body.css('height', '');
-			}
+			state.modal.modal(enable ? 'show' : 'hide');
 		},
 
 		dialog: function(title, content, options)
@@ -1685,26 +1777,23 @@ function LuCI2()
 
 			var state = _luci2.ui._dialog || (_luci2.ui._dialog = {
 				dialog: $('<div />')
-					.addClass('cbi-modal-dialog')
+					.addClass('modal fade')
 					.append($('<div />')
+						.addClass('modal-dialog')
 						.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();
-								}))))
+							.addClass('modal-content')
+							.append($('<div />')
+								.addClass('modal-header')
+								.append('<h4 />')
+									.addClass('modal-title'))
+							.append($('<div />')
+								.addClass('modal-body'))
+							.append($('<div />')
+								.addClass('modal-footer')
+								.append(_luci2.ui.button(_luci2.tr('Close'), 'primary')
+									.click(function() {
+										$(this).parents('div.modal').modal('hide');
+									})))))
 					.appendTo(body)
 			});
 
@@ -1713,66 +1802,39 @@ function LuCI2()
 
 			if (title === false)
 			{
-				body
-					.css('overflow', '')
-					.css('padding', '')
-					.css('width', '')
-					.css('height', '');
-
-				state.dialog.hide();
+				state.dialog.modal('hide');
 
 				return;
 			}
 
-			var cnt = state.dialog.children().children('div.cbi-modal-dialog-body');
-			var ftr = state.dialog.children().children('div.cbi-modal-dialog-footer');
+			var cnt = state.dialog.children().children().children('div.modal-body');
+			var ftr = state.dialog.children().children().children('div.modal-footer');
 
 			ftr.empty();
 
 			if (options.style == 'confirm')
 			{
-				ftr.append($('<button />')
-					.addClass('cbi-button')
-					.text(_luci2.tr('Ok'))
+				ftr.append(_luci2.ui.button(_luci2.tr('Ok'), 'primary')
 					.click(options.confirm || function() { _luci2.ui.dialog(false) }));
 
-				ftr.append($('<button />')
-					.addClass('cbi-button')
-					.text(_luci2.tr('Cancel'))
+				ftr.append(_luci2.ui.button(_luci2.tr('Cancel'), 'default')
 					.click(options.cancel || function() { _luci2.ui.dialog(false) }));
 			}
 			else if (options.style == 'close')
 			{
-				ftr.append($('<button />')
-					.addClass('cbi-button')
-					.text(_luci2.tr('Close'))
+				ftr.append(_luci2.ui.button(_luci2.tr('Close'), 'primary')
 					.click(options.close || function() { _luci2.ui.dialog(false) }));
 			}
 			else if (options.style == 'wait')
 			{
-				ftr.append($('<button />')
-					.addClass('cbi-button')
-					.text(_luci2.tr('Close'))
+				ftr.append(_luci2.ui.button(_luci2.tr('Close'), 'primary')
 					.attr('disabled', true));
 			}
 
-			state.dialog.find('div.cbi-modal-dialog-header').text(title);
-			state.dialog.show();
-
-			cnt
-				.css('max-height', Math.floor(win.height() * 0.70) + 'px')
-				.empty()
-				.append(content);
-
-			state.dialog.children()
-				.css('margin-top', -Math.floor(state.dialog.children().height() / 2) + 'px');
+			state.dialog.find('h4:first').text(title);
+			state.dialog.modal('show');
 
-			body.css('overflow', 'hidden');
-			body.css('padding', 0);
-			body.css('width', win.width());
-			body.css('height', win.height());
-			state.dialog.css('width', win.width());
-			state.dialog.css('height', win.height());
+			cnt.empty().append(content);
 		},
 
 		upload: function(title, content, options)
@@ -1796,11 +1858,12 @@ function LuCI2()
 						.addClass('cbi-input-file'))
 					.append($('<div />')
 						.css('width', '100%')
-						.addClass('progressbar')
-						.addClass('intermediate')
+						.addClass('progress progress-striped active')
 						.append($('<div />')
+							.addClass('progress-bar')
 							.css('width', '100%')))
 					.append($('<iframe />')
+						.addClass('pull-right')
 						.attr('name', 'cbi-fileupload-frame')
 						.css('width', '1px')
 						.css('height', '1px')
@@ -1839,7 +1902,7 @@ function LuCI2()
 
 				confirm_cb: function() {
 					var f = state.form.find('.cbi-input-file');
-					var b = state.form.find('.progressbar');
+					var b = state.form.find('.progress');
 					var p = state.form.find('p');
 
 					if (!f.val())
@@ -1856,7 +1919,7 @@ function LuCI2()
 				}
 			});
 
-			state.form.find('.progressbar').hide();
+			state.form.find('.progress').hide();
 			state.form.find('.cbi-input-file').val('').show();
 			state.form.find('p').text(content || _luci2.tr('Select the file to upload and press "%s" to proceed.').format(_luci2.tr('Ok')));
 
@@ -1960,7 +2023,7 @@ function LuCI2()
 								.attr('type', 'text')
 								.attr('name', 'username')
 								.attr('value', 'root')
-								.addClass('cbi-input-text')
+								.addClass('form-control')
 								.keypress(function(ev) {
 									if (ev.which == 10 || ev.which == 13)
 										state.confirm_cb();
@@ -1972,7 +2035,7 @@ function LuCI2()
 							.append($('<input />')
 								.attr('type', 'password')
 								.attr('name', 'password')
-								.addClass('cbi-input-password')
+								.addClass('form-control')
 								.keypress(function(ev) {
 									if (ev.which == 10 || ev.which == 13)
 										state.confirm_cb();
@@ -2322,19 +2385,47 @@ function LuCI2()
 					_luci2.ui.loading(false);
 				})
 			});
+		},
+
+		button: function(label, style, title)
+		{
+			style = style || 'default';
+
+			return $('<button />')
+				.attr('type', 'button')
+				.attr('title', title ? title : '')
+				.addClass('btn btn-' + style)
+				.text(label);
 		}
 	};
 
-	var AbstractWidget = Class.extend({
+	this.ui.AbstractWidget = Class.extend({
 		i18n: function(text) {
 			return text;
 		},
 
-		toString: function() {
-			var x = document.createElement('div');
-				x.appendChild(this.render());
+		label: function() {
+			var key = arguments[0];
+			var args = [ ];
+
+			for (var i = 1; i < arguments.length; i++)
+				args.push(arguments[i]);
+
+			switch (typeof(this.options[key]))
+			{
+			case 'undefined':
+				return '';
+
+			case 'function':
+				return this.options[key].apply(this, args);
 
-			return x.innerHTML;
+			default:
+				return ''.format.apply('' + this.options[key], args);
+			}
+		},
+
+		toString: function() {
+			return $('<div />').append(this.render()).html();
 		},
 
 		insertInto: function(id) {
@@ -2346,7 +2437,7 @@ function LuCI2()
 		}
 	});
 
-	this.ui.view = AbstractWidget.extend({
+	this.ui.view = this.ui.AbstractWidget.extend({
 		_fetch_template: function()
 		{
 			return $.ajax(_luci2.globals.resource + '/template/' + this.options.name + '.htm', {
@@ -2392,7 +2483,7 @@ function LuCI2()
 				container.append($('<h2 />').append(this.title));
 
 			if (this.description)
-				container.append($('<div />').addClass('cbi-map-descr').append(this.description));
+				container.append($('<p />').append(this.description));
 
 			var self = this;
 			var args = [ ];
@@ -2420,11 +2511,12 @@ function LuCI2()
 			var setTimer, runTimer;
 
 			setTimer = function() {
-				self._timeouts[index] = window.setTimeout(runTimer, interval);
+				if (self._timeouts)
+					self._timeouts[index] = window.setTimeout(runTimer, interval);
 			};
 
 			runTimer = function() {
-				_luci2.deferrable(func.call(self)).then(setTimer);
+				_luci2.deferrable(func.call(self)).then(setTimer, setTimer);
 			};
 
 			runTimer();
@@ -2442,7 +2534,7 @@ function LuCI2()
 		}
 	});
 
-	this.ui.menu = AbstractWidget.extend({
+	this.ui.menu = this.ui.AbstractWidget.extend({
 		init: function() {
 			this._nodes = { };
 		},
@@ -2529,9 +2621,9 @@ function LuCI2()
 			var list = $('<ul />');
 
 			if (level == 0)
-				list.addClass('nav');
+				list.addClass('nav').addClass('navbar-nav');
 			else if (level == 1)
-				list.addClass('dropdown-menu');
+				list.addClass('dropdown-menu').addClass('navbar-inverse');
 
 			for (var i = 0; i < nodes.length; i++)
 			{
@@ -2545,16 +2637,24 @@ function LuCI2()
 				var item = $('<li />')
 					.append($('<a />')
 						.attr('href', '#')
-						.text(_luci2.tr(nodes[i].title))
-						.click(nodes[i], this._onclick))
+						.text(_luci2.tr(nodes[i].title)))
 					.appendTo(list);
 
 				if (nodes[i].childs && level < max)
 				{
 					item.addClass('dropdown');
-					item.find('a').addClass('menu');
+
+					item.find('a')
+						.addClass('dropdown-toggle')
+						.attr('data-toggle', 'dropdown')
+						.append('<b class="caret"></b>');
+
 					item.append(this._render(nodes[i].childs, level + 1));
 				}
+				else
+				{
+					item.find('a').click(nodes[i], this._onclick);
+				}
 			}
 
 			return list.get(0);
@@ -2586,7 +2686,7 @@ function LuCI2()
 		}
 	});
 
-	this.ui.table = AbstractWidget.extend({
+	this.ui.table = this.ui.AbstractWidget.extend({
 		init: function()
 		{
 			this._rows = [ ];
@@ -2633,7 +2733,7 @@ function LuCI2()
 			}
 
 			var table = document.createElement('table');
-				table.className = 'cbi-section-table';
+				table.className = 'table table-condensed table-hover';
 
 			var has_caption = false;
 			var has_description = false;
@@ -2752,32 +2852,34 @@ function LuCI2()
 		}
 	});
 
-	this.ui.progress = AbstractWidget.extend({
+	this.ui.progress = this.ui.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 + '%';
+			var text;
 
 			if (typeof(this.options.format) == 'string')
-				$(bar.lastChild.lastChild).append(this.options.format.format(this.options.value, this.options.max, pc));
+				text = 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));
+				text = this.options.format(pc);
 			else
-				$(bar.lastChild.lastChild).append('%.2f%%'.format(pc));
+				text = '%.2f%%'.format(pc);
 
-			return bar;
+			return $('<div />')
+				.addClass('progress')
+				.append($('<div />')
+					.addClass('progress-bar')
+					.addClass('progress-bar-info')
+					.css('width', pc + '%'))
+				.append($('<small />')
+					.text(text));
 		}
 	});
 
-	this.ui.devicebadge = AbstractWidget.extend({
+	this.ui.devicebadge = this.ui.AbstractWidget.extend({
 		render: function()
 		{
 			var l2dev = this.options.l2_device || this.options.device;
@@ -2785,7 +2887,7 @@ function LuCI2()
 			var dev = l3dev || l2dev || '?';
 
 			var span = document.createElement('span');
-				span.className = 'ifacebadge';
+				span.className = 'badge';
 
 			if (typeof(this.options.signal) == 'number' ||
 				typeof(this.options.noise) == 'number')
@@ -2917,7 +3019,7 @@ function LuCI2()
 								else if (typeof types[label] == 'function')
 								{
 									stack.push(types[label]);
-									stack.push(null);
+									stack.push([ ]);
 								}
 								else
 								{
@@ -2936,7 +3038,7 @@ function LuCI2()
 								throw "Syntax error, argument list follows non-function";
 
 							stack[stack.length-1] =
-								arguments.callee(code.substring(pos, i));
+								_luci2.cbi.validation.compile(code.substring(pos, i));
 
 							pos = i+1;
 						}
@@ -3346,7 +3448,7 @@ function LuCI2()
 	};
 
 
-	this.cbi.AbstractValue = AbstractWidget.extend({
+	this.cbi.AbstractValue = this.ui.AbstractWidget.extend({
 		init: function(name, options)
 		{
 			this.name = name;
@@ -3367,27 +3469,43 @@ function LuCI2()
 			return this.section.id('field', sid || '__unknown__', this.name);
 		},
 
-		render: function(sid)
+		render: function(sid, condensed)
 		{
 			var i = this.instance[sid] = { };
 
-			i.top = $('<div />').addClass('cbi-value');
+			i.top = $('<div />');
 
-			if (typeof(this.options.caption) == 'string')
-				$('<label />')
-					.addClass('cbi-value-title')
-					.attr('for', this.id(sid))
-					.text(this.options.caption)
-					.appendTo(i.top);
+			if (!condensed)
+			{
+				i.top.addClass('form-group');
+
+				if (typeof(this.options.caption) == 'string')
+					$('<label />')
+						.addClass('col-lg-2 control-label')
+						.attr('for', this.id(sid))
+						.text(this.options.caption)
+						.appendTo(i.top);
+			}
+
+			i.error = $('<div />')
+				.hide()
+				.addClass('label label-danger');
 
-			i.widget = $('<div />').addClass('cbi-value-field').append(this.widget(sid)).appendTo(i.top);
-			i.error = $('<div />').addClass('cbi-value-error').appendTo(i.top);
+			i.widget = $('<div />')
+
+				.append(this.widget(sid))
+				.append(i.error)
+				.appendTo(i.top);
+
+			if (!condensed)
+			{
+				i.widget.addClass('col-lg-5');
 
-			if (typeof(this.options.description) == 'string')
 				$('<div />')
-					.addClass('cbi-value-description')
-					.text(this.options.description)
+					.addClass('col-lg-5')
+					.text((typeof(this.options.description) == 'string') ? this.options.description : '')
 					.appendTo(i.top);
+			}
 
 			return i.top;
 		},
@@ -3491,6 +3609,52 @@ function LuCI2()
 			return chg;
 		},
 
+		_ev_validate: function(ev)
+		{
+			var d = ev.data;
+			var rv = true;
+			var val = d.elem.val();
+			var vstack = d.vstack;
+
+			if (vstack && typeof(vstack[0]) == 'function')
+			{
+				delete validation.message;
+
+				if ((val.length == 0 && !d.opt))
+				{
+					d.elem.parents('div.form-group, td').first().addClass('luci2-form-error');
+					d.elem.parents('div.input-group, div.form-group, td').first().addClass('has-error');
+
+					d.inst.error.text(_luci2.tr('Field must not be empty')).show();
+					rv = false;
+				}
+				else if (val.length > 0 && !vstack[0].apply(val, vstack[1]))
+				{
+					d.elem.parents('div.form-group, td').first().addClass('luci2-form-error');
+					d.elem.parents('div.input-group, div.form-group, td').first().addClass('has-error');
+
+					d.inst.error.text(validation.message.format.apply(validation.message, vstack[1])).show();
+					rv = false;
+				}
+				else
+				{
+					d.elem.parents('div.form-group, td').first().removeClass('luci2-form-error');
+					d.elem.parents('div.input-group, div.form-group, td').first().removeClass('has-error');
+
+					if (d.multi && d.inst.widget && d.inst.widget.find('input.error, select.error').length > 0)
+						rv = false;
+					else
+						d.inst.error.text('').hide();
+				}
+			}
+
+			if (rv)
+				for (var field in d.self.rdependency)
+					d.self.rdependency[field].toggle(d.sid);
+
+			return rv;
+		},
+
 		validator: function(sid, elem, multi)
 		{
 			if (typeof(this.options.datatype) == 'undefined' && $.isEmptyObject(this.rdependency))
@@ -3515,79 +3679,31 @@ function LuCI2()
 			}
 
 			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;
+				self:   this,
+				sid:    sid,
+				elem:   elem,
+				multi:  multi,
+				vstack: vstack,
+				inst:   this.instance[sid],
+				opt:    this.options.optional
 			};
 
 			if (elem.prop('tagName') == 'SELECT')
 			{
-				elem.change(evdata, validator);
+				elem.change(evdata, this._ev_validate);
 			}
 			else if (elem.prop('tagName') == 'INPUT' && elem.attr('type') == 'checkbox')
 			{
-				elem.click(evdata, validator);
-				elem.blur(evdata, validator);
+				elem.click(evdata, this._ev_validate);
+				elem.blur(evdata, this._ev_validate);
 			}
 			else
 			{
-				elem.keyup(evdata, validator);
-				elem.blur(evdata, validator);
+				elem.keyup(evdata, this._ev_validate);
+				elem.blur(evdata, this._ev_validate);
 			}
 
-			elem.attr('cbi-validate', true).on('validate', evdata, validator);
+			elem.attr('cbi-validate', true).on('validate', evdata, this._ev_validate);
 
 			return elem;
 		},
@@ -3737,7 +3853,9 @@ function LuCI2()
 				.attr('type', 'checkbox')
 				.prop('checked', this.ucivalue(sid));
 
-			return this.validator(sid, i);
+			return $('<div />')
+				.addClass('checkbox')
+				.append(this.validator(sid, i));
 		},
 
 		ucivalue: function(sid)
@@ -3791,6 +3909,7 @@ function LuCI2()
 		widget: function(sid)
 		{
 			var i = $('<input />')
+				.addClass('form-control')
 				.attr('id', this.id(sid))
 				.attr('type', 'text')
 				.attr('placeholder', this.options.placeholder)
@@ -3804,26 +3923,28 @@ function LuCI2()
 		widget: function(sid)
 		{
 			var i = $('<input />')
+				.addClass('form-control')
 				.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;
-				});
+			var t = $('<span />')
+				.addClass('input-group-btn')
+				.append(_luci2.ui.button(_luci2.tr('Reveal'), 'default')
+					.click(function(ev) {
+						var b = $(this);
+						var i = b.parent().prev();
+						var t = i.attr('type');
+						b.text(t == 'password' ? _luci2.tr('Hide') : _luci2.tr('Reveal'));
+						i.attr('type', (t == 'password') ? 'text' : 'password');
+						b = i = t = null;
+					}));
 
 			this.validator(sid, i);
 
 			return $('<div />')
-				.addClass('cbi-input-password')
+				.addClass('input-group')
 				.append(i)
 				.append(t);
 		}
@@ -3832,7 +3953,8 @@ function LuCI2()
 	this.cbi.ListValue = this.cbi.AbstractValue.extend({
 		widget: function(sid)
 		{
-			var s = $('<select />');
+			var s = $('<select />')
+				.addClass('form-control');
 
 			if (this.options.optional)
 				$('<option />')
@@ -3879,16 +4001,13 @@ function LuCI2()
 				for (var i = 0; i < this.choices.length; i++)
 				{
 					$('<label />')
+						.addClass('checkbox')
 						.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;
@@ -4051,7 +4170,7 @@ function LuCI2()
 			var v = s.values || [ ];
 			delete s.values;
 
-			$(s.parent).children('input').each(function(i) {
+			$(s.parent).children('div.input-group').children('input').each(function(i) {
 				if (i != del)
 					v.push(this.value || '');
 			});
@@ -4075,17 +4194,33 @@ function LuCI2()
 					sid: s.sid,
 					self: s.self,
 					parent: s.parent,
-					index: i
+					index: i,
+					remove: ((i+1) < v.length)
 				};
 
+				var btn;
+				if (evdata.remove)
+					btn = _luci2.ui.button('–', 'danger').click(evdata, this._btnclick);
+				else
+					btn = _luci2.ui.button('+', 'success').click(evdata, this._btnclick);
+
 				if (this.choices)
 				{
 					var txt = $('<input />')
+						.addClass('form-control')
 						.attr('type', 'text')
-						.hide()
-						.appendTo(s.parent);
+						.hide();
 
 					var sel = $('<select />')
+						.addClass('form-control');
+
+					$('<div />')
+						.addClass('input-group')
+						.append(txt)
+						.append(sel)
+						.append($('<span />')
+							.addClass('input-group-btn')
+							.append(btn))
 						.appendTo(s.parent);
 
 					evdata.input = this.validator(s.sid, txt, true);
@@ -4109,12 +4244,18 @@ function LuCI2()
 						.attr('type', 'text')
 						.attr('index', i)
 						.attr('placeholder', (i == 0) ? this.options.placeholder : '')
-						.addClass('cbi-input-text')
+						.addClass('form-control')
 						.keydown(evdata, this._keydown)
 						.keypress(evdata, this._keypress)
 						.val(v[i]);
 
-					f.appendTo(s.parent);
+					$('<div />')
+						.addClass('input-group')
+						.append(f)
+						.append($('<span />')
+							.addClass('input-group-btn')
+							.append(btn))
+						.appendTo(s.parent);
 
 					if (i == focus)
 					{
@@ -4135,16 +4276,6 @@ function LuCI2()
 					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;
 			}
 
@@ -4209,7 +4340,7 @@ function LuCI2()
 
 				/* arrow up */
 				case 38:
-					var prev = input.prevAll('input:first');
+					var prev = input.parent().prevAll('div.input-group:first').children('input');
 					if (prev.is(':visible'))
 						prev.focus();
 					else
@@ -4218,7 +4349,7 @@ function LuCI2()
 
 				/* arrow down */
 				case 40:
-					var next = input.nextAll('input:first');
+					var next = input.parent().nextAll('div.input-group:first').children('input');
 					if (next.is(':visible'))
 						next.focus();
 					else
@@ -4233,7 +4364,7 @@ function LuCI2()
 		{
 			if (!this.getAttribute('disabled'))
 			{
-				if (ev.target.src.indexOf('remove') > -1)
+				if (ev.data.remove)
 				{
 					var index = ev.data.index;
 					ev.data.self._redraw(-index, -1, index, ev.data);
@@ -4297,7 +4428,7 @@ function LuCI2()
 		widget: function(sid)
 		{
 			return $('<div />')
-				.addClass('cbi-value-dummy')
+				.addClass('form-control-static')
 				.attr('id', this.id(sid))
 				.html(this.ucivalue(sid));
 		},
@@ -4361,7 +4492,7 @@ function LuCI2()
 			var id = this.id(sid);
 			var ul = $('<ul />')
 				.attr('id', id)
-				.addClass('cbi-input-networks');
+				.addClass('list-unstyled');
 
 			var itype = this.options.multiple ? 'checkbox' : 'radio';
 			var value = this.ucivalue(sid);
@@ -4379,7 +4510,7 @@ function LuCI2()
 				{
 					var iface = this.interfaces[i];
 					var badge = $('<span />')
-						.addClass('ifacebadge')
+						.addClass('badge')
 						.text('%s: '.format(iface['interface']));
 
 					if (iface.device && iface.device.subdevices)
@@ -4392,12 +4523,12 @@ function LuCI2()
 
 					$('<li />')
 						.append($('<label />')
+							.addClass(itype + ' inline')
 							.append($('<input />')
 								.attr('name', itype + id)
 								.attr('type', itype)
 								.attr('value', iface['interface'])
-								.prop('checked', !!check[iface['interface']])
-								.addClass('cbi-input-' + itype))
+								.prop('checked', !!check[iface['interface']]))
 							.append(badge))
 						.appendTo(ul);
 				}
@@ -4407,12 +4538,12 @@ function LuCI2()
 			{
 				$('<li />')
 					.append($('<label />')
+						.addClass(itype + ' inline text-muted')
 						.append($('<input />')
 							.attr('name', itype + id)
 							.attr('type', itype)
 							.attr('value', '')
-							.prop('checked', !value)
-							.addClass('cbi-input-' + itype))
+							.prop('checked', !value))
 						.append(_luci2.tr('unspecified')))
 					.appendTo(ul);
 			}
@@ -4471,7 +4602,7 @@ function LuCI2()
 	});
 
 
-	this.cbi.AbstractSection = AbstractWidget.extend({
+	this.cbi.AbstractSection = this.ui.AbstractWidget.extend({
 		id: function()
 		{
 			var s = [ arguments[0], this.map.uci_package, this.uci_type ];
@@ -4560,60 +4691,66 @@ function LuCI2()
 			return rv;
 		},
 
-		validate: function(sid)
+		validate_section: 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();
+			var badge = $('#' + this.id('teaser', sid)).children('span:first');
 
 			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();
+				var stbadge = $('#' + this.id('nodetab', sid, this.tabs[i].id)).children('span:first');
 
 				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)))
+					stbadge.show()
 						.text(inval)
-						.appendTo(tab);
+						.attr('title', _luci2.trp('1 Error', '%d Errors', inval).format(inval));
+				else
+					stbadge.hide();
 
-					invals += inval;
-					tab = null;
-					rv = false;
-				}
+				invals += inval;
 			}
 
 			if (invals > 0)
-				$('<span />')
-					.addClass('badge')
-					.attr('title', _luci2.tr('%d Errors'.format(invals)))
+				badge.show()
 					.text(invals)
-					.appendTo(legend);
+					.attr('title', _luci2.trp('1 Error', '%d Errors', invals).format(invals));
+			else
+				badge.hide();
 
-			return rv;
+			return invals;
+		},
+
+		validate: function()
+		{
+			this.error_count = 0;
+
+			var as = this.sections();
+
+			for (var i = 0; i < as.length; i++)
+			{
+				var invals = this.validate_section(as[i]['.name']);
+
+				if (invals > 0)
+					this.error_count += invals;
+			}
+
+			var badge = $('#' + this.id('sectiontab')).children('span:first');
+
+			if (this.error_count > 0)
+				badge.show()
+					.text(this.error_count)
+					.attr('title', _luci2.trp('1 Error', '%d Errors', this.error_count).format(this.error_count));
+			else
+				badge.hide();
+
+			return (this.error_count == 0);
 		}
 	});
 
@@ -4624,6 +4761,7 @@ function LuCI2()
 			this.options  = options;
 			this.tabs     = [ ];
 			this.fields   = { };
+			this.error_count  = 0;
 			this.active_panel = 0;
 			this.active_tab   = { };
 		},
@@ -4660,7 +4798,7 @@ function LuCI2()
 			this.map.remove(this.map.uci_package, sid);
 		},
 
-		_add: function(ev)
+		_ev_add: function(ev)
 		{
 			var addb = $(this);
 			var name = undefined;
@@ -4682,14 +4820,11 @@ function LuCI2()
 			_luci2.ui.restoreScrollTop();
 		},
 
-		_remove: function(ev)
+		_ev_remove: function(ev)
 		{
 			var self = ev.data.self;
 			var sid  = ev.data.sid;
 
-			if (ev.data.index == (self.sections().length - 1))
-				self.active_panel = -1;
-
 			_luci2.ui.saveScrollTop();
 
 			self.map.save();
@@ -4701,7 +4836,7 @@ function LuCI2()
 			ev.stopPropagation();
 		},
 
-		_sid: function(ev)
+		_ev_sid: function(ev)
 		{
 			var self = ev.data.self;
 			var text = $(this);
@@ -4746,6 +4881,80 @@ function LuCI2()
 			return true;
 		},
 
+		_ev_tab: function(ev)
+		{
+			var self = ev.data.self;
+			var sid  = ev.data.sid;
+
+			self.validate();
+			self.active_tab[sid] = parseInt(ev.target.getAttribute('data-luci2-tab-index'));
+		},
+
+		_ev_panel_collapse: function(ev)
+		{
+			var self = ev.data.self;
+
+			var this_panel = $(ev.target);
+			var this_toggle = this_panel.prevAll('[data-toggle="collapse"]:first');
+
+			var prev_toggle = $($(ev.delegateTarget).find('[data-toggle="collapse"]:eq(%d)'.format(self.active_panel)));
+			var prev_panel = $(prev_toggle.attr('data-target'));
+
+			prev_panel
+				.removeClass('in')
+				.addClass('collapse');
+
+			prev_toggle.find('.luci2-section-teaser')
+				.show()
+				.children('span:last')
+				.empty()
+				.append(self.teaser(prev_panel.attr('data-luci2-sid')));
+
+			this_toggle.find('.luci2-section-teaser')
+				.hide();
+
+			self.active_panel = parseInt(this_panel.attr('data-luci2-panel-index'));
+			self.validate();
+		},
+
+		_ev_panel_open: function(ev)
+		{
+			var self  = ev.data.self;
+			var panel = $($(this).attr('data-target'));
+			var index = parseInt(panel.attr('data-luci2-panel-index'));
+
+			if (index == self.active_panel)
+				ev.stopPropagation();
+		},
+
+		_ev_sort: function(ev)
+		{
+			var self    = ev.data.self;
+			var cur_idx = ev.data.index;
+			var new_idx = cur_idx + (ev.data.up ? -1 : 1);
+			var s       = self.sections();
+
+			if (new_idx >= 0 && new_idx < s.length)
+			{
+				var tmp = s[cur_idx]['.index'];
+
+				s[cur_idx]['.index'] = s[new_idx]['.index'];
+				s[new_idx]['.index'] = tmp;
+
+				if (self.active_panel == cur_idx)
+					self.active_panel = new_idx;
+				else if (self.active_panel == new_idx)
+					self.active_panel = cur_idx;
+
+				self.map.uci.reorder = true;
+
+				self.map.save();
+				self.map.redraw();
+			}
+
+			ev.stopPropagation();
+		},
+
 		teaser: function(sid)
 		{
 			var tf = this.teaser_fields;
@@ -4794,6 +5003,9 @@ function LuCI2()
 
 		_render_add: function()
 		{
+			if (!this.options.addremove)
+				return null;
+
 			var text = _luci2.tr('Add section');
 			var ttip = _luci2.tr('Create new section...');
 
@@ -4802,7 +5014,7 @@ function LuCI2()
 			else if (typeof(this.options.add_caption) == 'string')
 				text = this.options.add_caption, ttip = '';
 
-			var add = $('<div />').addClass('cbi-section-add');
+			var add = $('<div />');
 
 			if (this.options.anonymous === false)
 			{
@@ -4810,15 +5022,15 @@ function LuCI2()
 					.addClass('cbi-input-text')
 					.attr('type', 'text')
 					.attr('placeholder', ttip)
-					.blur({ self: this }, this._sid)
-					.keyup({ self: this }, this._sid)
+					.blur({ self: this }, this._ev_sid)
+					.keyup({ self: this }, this._ev_sid)
 					.appendTo(add);
 
 				$('<img />')
 					.attr('src', _luci2.globals.resource + '/icons/cbi/add.gif')
 					.attr('title', text)
 					.addClass('cbi-button')
-					.click({ self: this }, this._add)
+					.click({ self: this }, this._ev_add)
 					.appendTo(add);
 
 				$('<div />')
@@ -4828,13 +5040,9 @@ function LuCI2()
 			}
 			else
 			{
-				$('<input />')
-					.attr('type', 'button')
-					.addClass('cbi-button')
-					.addClass('cbi-button-add')
-					.val(text).attr('title', ttip)
-					.click({ self: this }, this._add)
-					.appendTo(add)
+				_luci2.ui.button(text, 'success', ttip)
+					.click({ self: this }, this._ev_add)
+					.appendTo(add);
 			}
 
 			return add;
@@ -4842,6 +5050,9 @@ function LuCI2()
 
 		_render_remove: function(sid, index)
 		{
+			if (!this.options.addremove)
+				return null;
+
 			var text = _luci2.tr('Remove');
 			var ttip = _luci2.tr('Remove this section');
 
@@ -4850,228 +5061,236 @@ function LuCI2()
 			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, index: index }, this._remove);
+			return _luci2.ui.button(text, 'danger', ttip)
+				.click({ self: this, sid: sid, index: index }, this._ev_remove);
 		},
 
-		_render_caption: function(sid)
+		_render_sort: function(sid, index)
 		{
-			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));
-			}
+			if (!this.options.sortable)
+				return null;
 
-			return '';
+			var b1 = _luci2.ui.button('↑', 'info', _luci2.tr('Move up'))
+				.click({ self: this, index: index, up: true }, this._ev_sort);
+
+			var b2 = _luci2.ui.button('↓', 'info', _luci2.tr('Move down'))
+				.click({ self: this, index: index, up: false }, this._ev_sort);
+
+			return b1.add(b2);
 		},
 
-		render: function()
+		_render_caption: function()
 		{
-			var allsections = $();
-			var panel_index = 0;
+			return $('<h3 />')
+				.addClass('panel-title')
+				.append(this.label('caption') || this.uci_type);
+		},
 
-			this.instance = { };
+		_render_description: function()
+		{
+			var text = this.label('description');
 
-			var s = this.sections();
+			if (text)
+				return $('<div />')
+					.addClass('luci2-section-description')
+					.text(text);
 
-			if (s.length == 0)
+			return null;
+		},
+
+		_render_teaser: function(sid, index)
+		{
+			if (this.options.collabsible || this.map.options.collabsible)
 			{
-				var fieldset = $('<fieldset />')
-					.addClass('cbi-section');
+				return $('<div />')
+					.attr('id', this.id('teaser', sid))
+					.addClass('luci2-section-teaser well well-sm')
+					.append($('<span />')
+						.addClass('badge'))
+					.append($('<span />'));
+			}
 
-				var head = $('<div />')
-					.addClass('cbi-section-head')
-					.appendTo(fieldset);
+			return null;
+		},
 
-				head.append(this._render_caption(undefined));
+		_render_head: function(condensed)
+		{
+			if (condensed)
+				return null;
 
-				if (typeof(this.options.description) == 'string')
-				{
-					$('<div />')
-						.addClass('cbi-section-descr')
-						.text(this.options.description)
-						.appendTo(head);
-				}
+			return $('<div />')
+				.addClass('panel-heading')
+				.append(this._render_caption())
+				.append(this._render_description());
+		},
 
-				allsections = allsections.add(fieldset);
-			}
+		_render_tab_description: function(sid, index, tab_index)
+		{
+			var tab = this.tabs[tab_index];
 
-			for (var i = 0; i < s.length; i++)
+			if (typeof(tab.description) == 'string')
 			{
-				var sid = s[i]['.name'];
-				var inst = this.instance[sid] = { tabs: [ ] };
-
-				var fieldset = $('<fieldset />')
-					.attr('id', this.id('sort', sid))
-					.addClass('cbi-section');
+				return $('<div />')
+					.addClass('cbi-tab-descr')
+					.text(tab.description);
+			}
 
-				var head = $('<div />')
-					.addClass('cbi-section-head')
-					.attr('cbi-section-num', this.index)
-					.attr('cbi-section-id', sid);
+			return null;
+		},
 
-				head.append(this._render_caption(sid));
+		_render_tab_head: function(sid, index, tab_index)
+		{
+			var tab = this.tabs[tab_index];
+			var cur = this.active_tab[sid] || 0;
 
-				if (typeof(this.options.description) == 'string')
-				{
-					$('<div />')
-						.addClass('cbi-section-descr')
-						.text(this.options.description)
-						.appendTo(head);
-				}
+			var tabh = $('<li />')
+				.append($('<a />')
+					.attr('id', this.id('nodetab', sid, tab.id))
+					.attr('href', '#' + this.id('node', sid, tab.id))
+					.attr('data-toggle', 'tab')
+					.attr('data-luci2-tab-index', tab_index)
+					.text((tab.caption ? tab.caption.format(tab.id) : tab.id) + ' ')
+					.append($('<span />')
+						.addClass('badge'))
+					.on('shown.bs.tab', { self: this, sid: sid }, this._ev_tab));
 
-				var teaser;
-				if ((s.length > 1 && this.options.collabsible) || this.map.options.collabsible)
-					teaser = $('<div />')
-						.addClass('cbi-section-teaser')
-						.appendTo(head);
+			if (cur == tab_index)
+				tabh.addClass('active');
 
-				if (this.options.addremove)
-					$('<div />')
-						.addClass('cbi-section-remove')
-						.addClass('right')
-						.append(this._render_remove(sid, panel_index))
-						.appendTo(head);
+			return tabh;
+		},
 
-				var body = $('<div />')
-					.attr('index', panel_index++);
+		_render_tab_body: function(sid, index, tab_index)
+		{
+			var tab = this.tabs[tab_index];
+			var cur = this.active_tab[sid] || 0;
 
-				var fields = $('<fieldset />')
-					.addClass('cbi-section-node');
+			var tabb = $('<div />')
+				.addClass('tab-pane')
+				.attr('id', this.id('node', sid, tab.id))
+				.attr('data-luci2-tab-index', tab_index)
+				.append(this._render_tab_description(sid, index, tab_index));
 
-				if (this.tabs.length > 1)
-				{
-					var menu = $('<ul />')
-						.addClass('cbi-tabmenu');
+			if (cur == tab_index)
+				tabb.addClass('active');
 
-					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);
+			for (var i = 0; i < tab.fields.length; i++)
+				tabb.append(tab.fields[i].render(sid));
 
-						var tabc = $('<div />')
-							.addClass('cbi-tabcontainer')
-							.attr('id', tabid)
-							.attr('index', j);
+			return tabb;
+		},
 
-						if (typeof(this.tabs[j].description) == 'string')
-						{
-							$('<div />')
-								.addClass('cbi-tab-descr')
-								.text(this.tabs[j].description)
-								.appendTo(tabc);
-						}
+		_render_section_head: function(sid, index)
+		{
+			var head = $('<div />')
+				.addClass('luci2-section-header')
+				.append(this._render_teaser(sid, index))
+				.append($('<div />')
+					.addClass('btn-group')
+					.append(this._render_sort(sid, index))
+					.append(this._render_remove(sid, index)));
 
-						for (var k = 0; k < this.tabs[j].fields.length; k++)
-							this.tabs[j].fields[k].render(sid).appendTo(tabc);
+			if (this.options.collabsible)
+			{
+				head.attr('data-toggle', 'collapse')
+					.attr('data-parent', this.id('sectiongroup'))
+					.attr('data-target', '#' + this.id('panel', sid))
+					.on('click', { self: this }, this._ev_panel_open);
+			}
 
-						tabc.appendTo(fields);
-						tabc = null;
+			return head;
+		},
 
-						$('<li />').attr('id', theadid).append(
-							$('<a />')
-								.text(this.tabs[j].caption.format(this.tabs[j].id))
-								.attr('href', '#' + tabid)
-						).appendTo(menu);
-					}
+		_render_section_body: function(sid, index)
+		{
+			var body = $('<div />')
+				.attr('id', this.id('panel', sid))
+				.attr('data-luci2-panel-index', index)
+				.attr('data-luci2-sid', sid);
 
-					menu.appendTo(body);
-					menu = null;
+			if (this.options.collabsible || this.map.options.collabsible)
+			{
+				body.addClass('panel-collapse collapse');
 
-					fields.appendTo(body);
-					fields = null;
+				if (index == this.active_panel)
+					body.addClass('in');
+			}
 
-					var t = body.tabs({ active: this.active_tab[sid] });
+			var tab_heads = $('<ul />')
+				.addClass('nav nav-tabs');
 
-					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);
+			var tab_bodies = $('<div />')
+				.addClass('form-horizontal tab-content')
+				.append(tab_heads);
 
-					fields.appendTo(body);
-					fields = null;
-				}
+			for (var j = 0; j < this.tabs.length; j++)
+			{
+				tab_heads.append(this._render_tab_head(sid, index, j));
+				tab_bodies.append(this._render_tab_body(sid, index, j));
+			}
 
-				head.appendTo(fieldset);
-				head = null;
+			body.append(tab_bodies);
 
-				body.appendTo(fieldset);
-				body = null;
+			if (this.tabs.length <= 1)
+				tab_heads.hide();
 
-				allsections = allsections.add(fieldset);
-				fieldset = null;
+			return body;
+		},
 
-				//this.validate(sid);
-				//
-				//if (teaser)
-				//	teaser.append(this.teaser(sid));
-			}
+		_render_body: function(condensed)
+		{
+			var s = this.sections();
 
-			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
-				});
+			if (this.active_panel < 0)
+				this.active_panel += s.length;
+			else if (this.active_panel >= s.length)
+				this.active_panel = s.length - 1;
 
-				a.on('accordionbeforeactivate', { self: this }, function(ev, ui) {
-					var h = ui.oldHeader;
-					var s = ev.data.self;
-					var i = h.attr('cbi-section-id');
+			var body = $('<ul />')
+				.addClass('list-group');
 
-					h.children('.cbi-section-teaser').empty().append(s.teaser(i));
-					s.validate();
-				});
+			if (this.options.collabsible)
+			{
+				body.attr('id', this.id('sectiongroup'))
+					.on('show.bs.collapse', { self: this }, this._ev_panel_collapse);
+			}
 
-				a.on('accordionactivate', { self: this }, function(ev, ui) {
-					ev.data.self.active_panel = parseInt(ui.newPanel.attr('index'));
-				});
+			if (s.length == 0)
+			{
+				body.append($('<li />')
+					.addClass('list-group-item text-muted')
+					.text(this.label('placeholder') || _luci2.tr('There are no entries defined yet.')))
+			}
 
-				if (this.options.sortable)
-				{
-					var s = a.sortable({
-						axis: 'y',
-						handle: 'div.cbi-section-head'
-					});
+			for (var i = 0; i < s.length; i++)
+			{
+				var sid = s[i]['.name'];
+				var inst = this.instance[sid] = { tabs: [ ] };
 
-					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);
-					});
+				body.append($('<li />')
+					.addClass('list-group-item')
+					.append(this._render_section_head(sid, i))
+					.append(this._render_section_body(sid, i)));
+			}
 
-					s.on('sortstop', function(ev, ui) {
-						ui.item.children('div.cbi-section-head').triggerHandler('focusout');
-					});
-				}
+			return body;
+		},
 
-				if (this.options.addremove)
-					this._render_add().appendTo(a);
+		render: function(condensed)
+		{
+			this.instance = { };
 
-				return a;
-			}
+			var panel = $('<div />')
+				.addClass('panel panel-default')
+				.append(this._render_head(condensed))
+				.append(this._render_body(condensed));
 
 			if (this.options.addremove)
-				allsections = allsections.add(this._render_add());
+				panel.append($('<div />')
+					.addClass('panel-footer')
+					.append(this._render_add()));
 
-			return allsections;
+			return panel;
 		},
 
 		finish: function()
@@ -5082,146 +5301,101 @@ function LuCI2()
 			{
 				var sid = s[i]['.name'];
 
-				this.validate(sid);
+				this.validate_section(sid);
 
-				$('#' + this.id('sort', sid))
-					.children('.cbi-section-head')
-					.children('.cbi-section-teaser')
-					.append(this.teaser(sid));
+				if (i != this.active_panel)
+					$('#' + this.id('teaser', sid)).children('span:last')
+						.append(this.teaser(sid));
+				else
+					$('#' + this.id('teaser', sid))
+						.hide();
 			}
 		}
 	});
 
 	this.cbi.TableSection = this.cbi.TypedSection.extend({
-		render: function()
+		_render_table_head: 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);
+				.append($('<tr />')
+					.addClass('cbi-section-table-titles'));
 
 			for (var j = 0; j < this.tabs[0].fields.length; j++)
-				$('<th />')
+				thead.children().append($('<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());
+					.append(this.tabs[0].fields[j].label('caption')));
 
-			if (this.options.sortable)
-				$('<th />').addClass('cbi-section-table-cell').text(' ').appendTo(thead.children());
+			if (this.options.addremove !== false || this.options.sortable)
+				thead.children().append($('<th />')
+					.addClass('cbi-section-table-cell')
+					.text(' '));
 
-			if (this.options.addremove !== false)
-				$('<th />').addClass('cbi-section-table-cell').text(' ').appendTo(thead.children());
+			return thead;
+		},
 
-			var tbody = $('<tbody />')
-				.appendTo(table);
+		_render_table_row: function(sid, index)
+		{
+			var row = $('<tr />')
+				.attr('data-luci2-sid', sid);
 
-			if (s.length == 0)
+			for (var j = 0; j < this.tabs[0].fields.length; j++)
 			{
-				$('<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);
+				row.append($('<td />')
+					.css('width', this.tabs[0].fields[j].options.width || '')
+					.append(this.tabs[0].fields[j].render(sid, true)));
 			}
 
-			for (var i = 0; i < s.length; i++)
+			if (this.options.addremove !== false || this.options.sortable)
 			{
-				var sid = s[i]['.name'];
-				var inst = this.instance[sid] = { tabs: [ ] };
+				row.append($('<td />')
+					.addClass('text-right')
+					.append($('<div />')
+						.addClass('btn-group')
+						.append(this._render_sort(sid, index))
+						.append(this._render_remove(sid, index))));
+			}
 
-				var row = $('<tr />')
-					.addClass('cbi-section-table-row')
-					.appendTo(tbody);
+			return row;
+		},
 
-				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);
-				}
+		_render_table_body: function()
+		{
+			var s = this.sections();
 
-				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);
-				}
+			var tbody = $('<tbody />');
 
-				if (this.options.addremove !== false)
-				{
-					$('<td />')
-						.addClass('cbi-section-table-cell')
-						.append(this._render_remove(sid))
-						.appendTo(row);
-				}
+			if (s.length == 0)
+			{
+				var cols = this.tabs[0].fields.length;
 
-				this.validate(sid);
+				if (this.options.addremove !== false || this.options.sortable)
+					cols++;
 
-				row = null;
+				tbody.append($('<tr />')
+					.append($('<td />')
+						.addClass('text-muted')
+						.attr('colspan', cols)
+						.text(this.label('placeholder') || _luci2.tr('There are no entries defined yet.'))));
 			}
 
-			if (this.options.sortable)
+			for (var i = 0; i < s.length; i++)
 			{
-				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);
-				});
+				var sid = s[i]['.name'];
+				var inst = this.instance[sid] = { tabs: [ ] };
 
-				s.on('sortstop', function(ev, ui) {
-					ui.item.children('div.cbi-section-head').triggerHandler('focusout');
-				});
+				tbody.append(this._render_table_row(sid, i));
 			}
 
-			if (this.options.addremove)
-				this._render_add().appendTo(fieldset);
-
-			fields = table = thead = tbody = null;
+			return tbody;
+		},
 
-			return fieldset;
+		_render_body: function(condensed)
+		{
+			return $('<table />')
+				.addClass('table table-condensed table-hover')
+				.append(this._render_table_head())
+				.append(this._render_table_body());
 		}
 	});
 
@@ -5255,7 +5429,7 @@ function LuCI2()
 		}
 	});
 
-	this.cbi.Map = AbstractWidget.extend({
+	this.cbi.Map = this.ui.AbstractWidget.extend({
 		init: function(uci_package, options)
 		{
 			var self = this;
@@ -5272,19 +5446,49 @@ function LuCI2()
 			});
 		},
 
+		_load_cb: 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);
+		},
+
 		load: function()
 		{
+			var self = this;
+
 			this.uci = {
 				newid:   0,
 				values:  { },
 				creates: { },
 				changes: { },
-				deletes: { }
+				deletes: { },
+				reorder: false
 			};
 
-			if (typeof(this.active_panel) == 'undefined')
-				this.active_panel = 0;
-
 			var packages = { };
 
 			for (var i = 0; i < this.sections.length; i++)
@@ -5292,126 +5496,125 @@ function LuCI2()
 
 			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);
+			return _luci2.rpc.flush().then(function(packages) {
+				return self._load_cb(packages);
+			});
 		},
 
-		render: function()
+		_ev_tab: function(ev)
 		{
-			var map = $('<div />').addClass('cbi-map');
+			var self = ev.data.self;
 
-			if (typeof(this.options.caption) == 'string')
-				$('<h2 />').text(this.options.caption).appendTo(map);
+			self.validate();
+			self.active_tab = parseInt(ev.target.getAttribute('data-luci2-tab-index'));
+		},
 
-			if (typeof(this.options.description) == 'string')
-				$('<div />').addClass('cbi-map-descr').text(this.options.description).appendTo(map);
+		_render_tab_head: function(tab_index)
+		{
+			var section = this.sections[tab_index];
+			var cur = this.active_tab || 0;
 
-			var sections = $('<div />').appendTo(map);
+			var tabh = $('<li />')
+				.append($('<a />')
+					.attr('id', section.id('sectiontab'))
+					.attr('href', '#' + section.id('section'))
+					.attr('data-toggle', 'tab')
+					.attr('data-luci2-tab-index', tab_index)
+					.text(section.label('caption') + ' ')
+					.append($('<span />')
+						.addClass('badge'))
+					.on('shown.bs.tab', { self: this }, this._ev_tab));
 
-			for (var i = 0; i < this.sections.length; i++)
-			{
-				var s = this.sections[i].render();
+			if (cur == tab_index)
+				tabh.addClass('active');
 
-				if (this.options.readonly || this.sections[i].options.readonly)
-					s.find('input, select, button, img.cbi-button').attr('disabled', true);
+			return tabh;
+		},
 
-				s.appendTo(sections);
+		_render_tab_body: function(tab_index)
+		{
+			var section = this.sections[tab_index];
+			var desc = section.label('description');
+			var cur = this.active_tab || 0;
 
-				if (this.sections[i].options.active)
-					this.active_panel = i;
-			}
+			var tabb = $('<div />')
+				.addClass('tab-pane')
+				.attr('id', section.id('section'))
+				.attr('data-luci2-tab-index', tab_index);
 
-			if (this.options.collabsible)
-			{
-				var a = sections.accordion({
-					header: '> fieldset > div.cbi-section-head',
-					heightStyle: 'content',
-					active: this.active_panel
-				});
+			if (cur == tab_index)
+				tabb.addClass('active');
 
-				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');
+			if (desc)
+				tabb.append($('<p />')
+					.text(desc));
 
-					h.children('.cbi-section-teaser').empty().append(s.teaser(i));
+			var s = section.render(this.options.tabbed);
 
-					for (var i = 0; i < ev.data.self.sections.length; i++)
-						ev.data.self.sections[i].validate();
-				});
+			if (this.options.readonly || section.options.readonly)
+				s.find('input, select, button, img.cbi-button').attr('disabled', true);
 
-				a.on('accordionactivate', { self: this }, function(ev, ui) {
-					ev.data.self.active_panel = parseInt(ui.newPanel.attr('index'));
-				});
-			}
+			tabb.append(s);
 
-			if (this.options.pageaction !== false)
+			return tabb;
+		},
+
+		_render_body: function()
+		{
+			var tabs = $('<ul />')
+				.addClass('nav nav-tabs');
+
+			var body = $('<div />')
+				.append(tabs);
+
+			for (var i = 0; i < this.sections.length; i++)
 			{
-				var a = $('<div />')
-					.addClass('cbi-page-actions')
-					.appendTo(map);
+				tabs.append(this._render_tab_head(i));
+				body.append(this._render_tab_body(i));
+			}
 
-				$('<input />')
-					.addClass('cbi-button').addClass('cbi-button-apply')
-					.attr('type', 'button')
-					.val(_luci2.tr('Save & Apply'))
-					.appendTo(a);
+			if (this.options.tabbed)
+				body.addClass('tab-content');
+			else
+				tabs.hide();
 
-				$('<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);
+			return body;
+		},
 
-				$('<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);
+		render: function()
+		{
+			var map = $('<form />');
 
-				a = null;
-			}
+			if (typeof(this.options.caption) == 'string')
+				map.append($('<h2 />')
+					.text(this.options.caption));
+
+			if (typeof(this.options.description) == 'string')
+				map.append($('<p />')
+					.text(this.options.description));
 
-			var top = $('<form />').append(map);
+			map.append(this._render_body());
 
-			map = null;
+			if (this.options.pageaction !== false)
+			{
+				map.append($('<div />')
+					.addClass('panel panel-default panel-body text-right')
+					.append($('<div />')
+						.addClass('btn-group')
+						.append(_luci2.ui.button(_luci2.tr('Save & Apply'), 'primary')
+							.click({ self: this }, function(ev) {  }))
+						.append(_luci2.ui.button(_luci2.tr('Save'), 'default')
+							.click({ self: this }, function(ev) { ev.data.self.send(); }))
+						.append(_luci2.ui.button(_luci2.tr('Reset'), 'default')
+							.click({ self: this }, function(ev) { ev.data.self.insertInto(ev.data.self.target); }))));
+			}
 
-			return top;
+			return map;
 		},
 
 		finish: function()
@@ -5472,7 +5675,8 @@ function LuCI2()
 				'.type':      type,
 				'.name':      s,
 				'.create':    name,
-				'.anonymous': !name
+				'.anonymous': !name,
+				'.index':     1000 + this.uci.newid
 			};
 
 			return s;
@@ -5516,12 +5720,17 @@ function LuCI2()
 				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]);
 
+			sa.sort(function(a, b) {
+				return a['.index'] - b['.index'];
+			});
+
+			for (var i = 0; i < sa.length; i++)
+				sa[i]['.index'] = i;
+
 			if (typeof(cb) == 'function')
 				for (var i = 0; i < sa.length; i++)
 					cb.apply(this, [ sa[i] ]);
@@ -5623,8 +5832,10 @@ function LuCI2()
 			var rv = true;
 
 			for (var i = 0; i < this.sections.length; i++)
+			{
 				if (!this.sections[i].validate())
 					rv = false;
+			}
 
 			return rv;
 		},
@@ -5659,60 +5870,117 @@ function LuCI2()
 			return $.when.apply($, deferreds);
 		},
 
-		send: function()
+		_send_uci_reorder: function()
 		{
-			if (!this.validate())
+			if (!this.uci.reorder)
 				return _luci2.deferrable();
 
-			var send_cb = this._send_cb || (this._send_cb = $.proxy(function() {
-				_luci2.rpc.batch();
+			_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: { }
-							};
+			/*
+			 gather all created and existing sections, sort them according
+			 to their index value and issue an uci order call
+			*/
+			for (var c in this.uci.values)
+			{
+				var o = [ ];
 
-							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];
-							}
+				if (this.uci.creates && this.uci.creates[c])
+					for (var s in this.uci.creates[c])
+						o.push(this.uci.creates[c][s]);
 
-							_luci2.uci.add(r.config, r.type, r.name, r.values);
-						}
+				for (var s in this.uci.values[c])
+					o.push(this.uci.values[c][s]);
+
+				if (o.length > 0)
+				{
+					o.sort(function(a, b) {
+						return (a['.index'] - b['.index']);
+					});
+
+					var sids = [ ];
 
-				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]);
+					for (var i = 0; i < o.length; i++)
+						sids.push(o[i]['.name']);
 
-				if (this.uci.deletes)
-					for (var c in this.uci.deletes)
-						for (var s in this.uci.deletes[c])
+					_luci2.uci.order(c, sids);
+				}
+			}
+
+			return _luci2.rpc.flush();
+		},
+
+		_send_uci: function()
+		{
+			_luci2.rpc.batch();
+
+			var self = this;
+			var snew = [ ];
+
+			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])
 						{
-							var o = this.uci.deletes[c][s];
-							_luci2.uci['delete'](c, s, (o === true) ? undefined : o);
+							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];
 						}
 
-				return _luci2.rpc.flush().then(function() {
-					return _luci2.ui.updateChanges();
-				});
-			}, this));
+						snew.push(this.uci.creates[c][s]);
+
+						_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().then(function(responses) {
+				/*
+				 array "snew" holds references to the created uci sections,
+				 use it to assign the returned names of the new sections
+				*/
+				for (var i = 0; i < snew.length; i++)
+					snew[i]['.name'] = responses[i];
+
+				return self._send_uci_reorder();
+			});
+		},
+
+		send: function()
+		{
+			if (!this.validate())
+				return _luci2.deferrable();
 
 			var self = this;
 
 			_luci2.ui.saveScrollTop();
 			_luci2.ui.loading(true);
 
-			return this.save().then(send_cb).then(function() {
+			return this.save().then(function() {
+				return self._send_uci();
+			}).then(function() {
+				return _luci2.ui.updateChanges();
+			}).then(function() {
 				return self.load();
 			}).then(function() {
 				self.redraw();