From 405c68f6236fdf6db63fc6687c127b016d239f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 23 Apr 2013 19:40:46 +0200 Subject: [PATCH] Feature #1826: Show IPv& addresses in vnet tab --- src/sunstone/public/js/plugins/vnets-tab.js | 121 +++++++++++++------- 1 file changed, 78 insertions(+), 43 deletions(-) diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 6211631a50..4054f4e5cd 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -103,7 +103,7 @@ var create_vn_tmpl =
\
\
\ - \ + \
\
\ \ @@ -113,7 +113,7 @@ var create_vn_tmpl =
\
\
\ - \ + \
\
\ \ @@ -146,7 +146,7 @@ var create_vn_tmpl =
\
\
\ - \ + \
\
\ \ @@ -903,54 +903,87 @@ function updateVNetworkInfo(request,vn){ // It adds the "add lease", "hold lease" fields, and each lease comes with // hold, release buttons etc. Listeners in setupLeasesOps() function printLeases(vn_info){ - var html ='
\ - \ - \ - \ - '; + var html ='
'; + html +=''; + + html += '
'+tr("Leases information")+'
\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +
'+tr("Network information")+'
'+tr("Network mask")+''+( vn_info.TEMPLATE.NETWORK_MASK ? vn_info.TEMPLATE.NETWORK_MASK : "--" )+'
'+tr("IPv6 Global prefix")+''+ (typeof(vn_info.GLOBAL_PREFIX) == "object" ? "--": vn_info.GLOBAL_PREFIX) +'
'+tr("IPv6 Site prefix")+''+ (typeof(vn_info.SITE_PREFIX) == "object" ? "--": vn_info.SITE_PREFIX) +'
'; + + html += '\ + \ + \ + \ + '; if (vn_info.TYPE == "0"){ html += '\ - \ - \ - \ - \ + \ + \ \ \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ + \ + \ '; - if (Config.isTabActionEnabled("vnets-tab", "Network.hold_lease")) { - html += '\ - \ - \ - \ - '; + + if (Config.isTabActionEnabled("vnets-tab", "Network.hold_lease")) { + html += + '\ + \ + \ + '; } } else { if (Config.isTabActionEnabled("vnets-tab", "Network.addleases")) { - html += '\ - \ - \ - \ - \ - '; + html += + '\ + \ + \ + '; } }; + html +='\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + '; + var leases = vn_info.LEASES.LEASE; if (!leases) //empty { - html+=''; html += '
'+tr("Leases information")+'
'+tr("IP Start")+''+vn_info.RANGE.IP_START+''+tr("IP Start")+''+vn_info.RANGE.IP_START+'
'+tr("IP End")+''+vn_info.RANGE.IP_END+'
'+tr("Network mask")+''+( vn_info.TEMPLATE.NETWORK_MASK ? vn_info.TEMPLATE.NETWORK_MASK : "--" )+''+tr("IP End")+''+vn_info.RANGE.IP_END+'
'+tr("IP")+''+tr("MAC")+''+tr("IPv6 Link")+''+tr("IPv6 Site")+''+tr("IPv6 Global")+'
\ + html+='
\ '+tr("No leases to show")+'\
'; @@ -973,9 +1006,6 @@ function printLeases(vn_info){ state = parseInt(lease.USED,10); }; - - html+='' - html += ''; switch (state){ case 0: //free @@ -990,11 +1020,6 @@ function printLeases(vn_info){ }; html += '' - html += ''+ lease.IP + ''; - - html += '\ - '+lease.MAC+''; - switch (state){ case 0: html += ''; @@ -1020,6 +1045,16 @@ function printLeases(vn_info){ break; }; html += '' + + html += ''+ lease.IP + ''; + + html += '\ + '+lease.MAC+''; + + html += ''+ (lease.IP6_LINK ? lease.IP6_LINK : "--") +''; + html += ''+ (lease.IP6_SITE ? lease.IP6_SITE : "--") +''; + html += ''+ (lease.IP6_GLOBAL ? lease.IP6_GLOBAL : "--") +''; + html += ''; };