From: p4u <p4u@dabax.net>
Date: Thu, 18 Jul 2013 23:09:17 +0000 (+0200)
Subject: Adapt tunnels web view to new bmx6 syntax and options
X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=b493828d75c23d2733fafd317c9d5859959d8c3f

Adapt tunnels web view to new bmx6 syntax and options
---

diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm b/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm
index 1b7ce42..d4cc38b 100644
--- a/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm
+++ b/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/tunnels_j.htm
@@ -71,7 +71,8 @@
 			<th class="cbi-section-table-cell"><%:IP metric%></th>
 			<th class="cbi-section-table-cell"><%:Tun metric%></th>
 			<th class="cbi-section-table-cell"><%:Bonus%></th>
-			<th class="cbi-section-table-cell"><%:search id%></th>
+			<th class="cbi-section-table-cell"><%:Src%></th>
+			<th class="cbi-section-table-cell"><%:Search id%></th>
 		</tr>
 		<tr class="cbi-section-table-row">
 			<td colspan="10"><em><br /><%:Collecting data...%></em></td>
@@ -89,15 +90,15 @@
 		  var res = Array();
                   for ( var k in st.tunnels ){
                         var tunnel = st.tunnels[k];
-                        var nodename = tunnel.remoteId.replace(/\..+$/,'');
+                        var nodename = tunnel.remoteName.replace(/\..+$/,'');
 			var advnet = tunnel.advNet;
 			var status = '<img src="'+tunicon_dis+'"/>';
 			
 			if ( tunnel.tunName != "---" ) status = '<img src="'+tunicon+'"/>';
 			if ( advnet == "0.0.0.0/0" ) advnet = "<b>Internet</b>";
 
-			res.push([status, tunnel.name, nodename, advnet, tunnel.advBw, tunnel.searchNet, tunnel.advType,
-				tunnel.pathMtc, tunnel.ipMtc, tunnel.tunMtc, tunnel.bonus, tunnel.searchId]);
+			res.push([status, tunnel.name, nodename, advnet, tunnel.advBw, tunnel.net, tunnel.advType,
+				tunnel.pathMtc, tunnel.ipMtc, tunnel.tunMtc, tunnel.bonus, tunnel.srcIngress, tunnel.id]);
 		  }
 		  return res;
 		});