X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci2%2Fui.git;a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Fluci2.js;h=f094b0099bb593ff1723c34695c808d6369b388e;hp=f41a8193ee3f6d8038b1456f96630d63a9a69a8b;hb=ba6f9903982c5ed30a380b80cf7bd74c8843afa6;hpb=203c7e1dc5b4968efaf97d13523c1c8ee6ff4364

diff --git a/luci2/htdocs/luci2/luci2.js b/luci2/htdocs/luci2/luci2.js
index f41a819..f094b00 100644
--- a/luci2/htdocs/luci2/luci2.js
+++ b/luci2/htdocs/luci2/luci2.js
@@ -3216,6 +3216,7 @@ function LuCI2()
 
 			var state = _luci2.ui._loading || (_luci2.ui._loading = {
 				modal: $('<div />')
+					.css('z-index', 2000)
 					.addClass('modal fade')
 					.append($('<div />')
 						.addClass('modal-dialog')
@@ -5914,52 +5915,32 @@ function LuCI2()
 		}
 	});
 
-	this.cbi.NetworkList = this.cbi.AbstractValue.extend({
-		load: function(sid)
+	this.cbi.ButtonValue = this.cbi.AbstractValue.extend({
+		widget: function(sid)
 		{
-			var self = this;
+			this.options.optional = true;
 
-			if (!self.interfaces)
-			{
-				self.interfaces = [ ];
-				return _luci2.network.getNetworkStatus().then(function(ifaces) {
-					self.interfaces = ifaces;
-					self = null;
-				});
-			}
+			var btn = $('<button />')
+				.addClass('btn btn-default')
+				.attr('id', this.id(sid))
+				.attr('type', 'button')
+				.text(this.label('text'));
 
-			return undefined;
+			return this.validator(sid, btn);
+		}
+	});
+
+	this.cbi.NetworkList = this.cbi.AbstractValue.extend({
+		load: function(sid)
+		{
+			return _luci2.NetworkModel.init();
 		},
 
 		_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));
+				.attr('src', dev.icon())
+				.attr('title', '%s (%s)'.format(dev.description(), dev.name() || '?'));
 		},
 
 		widget: function(sid)
@@ -5979,34 +5960,36 @@ function LuCI2()
 				for (var i = 0; i < value.length; i++)
 					check[value[i]] = true;
 
-			if (this.interfaces)
+			var interfaces = _luci2.NetworkModel.getInterfaces();
+
+			for (var i = 0; i < interfaces.length; i++)
 			{
-				for (var i = 0; i < this.interfaces.length; i++)
-				{
-					var iface = this.interfaces[i];
-					var badge = $('<span />')
-						.addClass('badge')
-						.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)')));
+				var iface = interfaces[i];
+				var badge = $('<span />')
+					.addClass('badge')
+					.text('%s: '.format(iface.name()));
 
-					$('<li />')
-						.append($('<label />')
-							.addClass(itype + ' inline')
-							.append($('<input />')
-								.attr('name', itype + id)
-								.attr('type', itype)
-								.attr('value', iface['interface'])
-								.prop('checked', !!check[iface['interface']]))
-							.append(badge))
-						.appendTo(ul);
-				}
+				var dev = iface.getDevice();
+				var subdevs = iface.getSubdevices();
+
+				if (subdevs.length)
+					for (var j = 0; j < subdevs.length; j++)
+						badge.append(this._device_icon(subdevs[j]));
+				else if (dev)
+					badge.append(this._device_icon(dev));
+				else
+					badge.append($('<em />').text(_luci2.tr('(No devices attached)')));
+
+				$('<li />')
+					.append($('<label />')
+						.addClass(itype + ' inline')
+						.append($('<input />')
+							.attr('name', itype + id)
+							.attr('type', itype)
+							.attr('value', iface.name())
+							.prop('checked', !!check[iface.name()]))
+						.append(badge))
+					.appendTo(ul);
 			}
 
 			if (!this.options.multiple)
@@ -6018,7 +6001,7 @@ function LuCI2()
 							.attr('name', itype + id)
 							.attr('type', itype)
 							.attr('value', '')
-							.prop('checked', !value))
+							.prop('checked', $.isEmptyObject(check)))
 						.append(_luci2.tr('unspecified')))
 					.appendTo(ul);
 			}