From 9481afc79bb1cddd522fd5ae30c982f34c99ecc3 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Wed, 9 Oct 2013 18:51:01 +0200
Subject: [PATCH] Various updates.

---
 public/index.html | 18 ++++++++++--------
 public/js/xo.js   | 10 +++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/public/index.html b/public/index.html
index ca8a4d47b..2934e5ffe 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1044,11 +1044,10 @@
 				<li class="next finish" style="display:none;"><a href="#">Finish</a></li>
 			</ul>
 		</div>
-
 	</script>
+
 	<!-- Networks list. -->
 	<script type="text/template" id="tpl-networks-list" data-class="container" data-items-container="tbody">
-
 		<table class="table table-hover table-bordered">
 			<thead>
 				<tr>
@@ -1065,12 +1064,15 @@
 		</table>
 	</script>
 	<script type="text/template" id="tpl-networks-list-item" data-tag="tr">
-		<td><i class="icon-sitemap"></i> <%= name %></td>
-		<td><%= '@todo' || speed %></td>
-		<td><%= yesNo(duplex) %></td>
-		<td><%= IP ? IP : '<em>none</em>' %></td>
-		<td class="mac-address"><%= MAC %></td>
-		<td><%= vendor %> <%= device %></td>
+		<%
+		var metrics = get('metrics');
+		%>
+		<td><i class="icon-sitemap"></i> <%= get('network.name_label') %></td>
+		<td><%= get(metrics, 'speed') %></td>
+		<td><%= yesNo(get(metrics, 'duplex')) %></td>
+		<td><%= get('IP', '<em>none</em>') %></td>
+		<td class="mac-address"><%= get('MAC') %></td>
+		<td><%= get(metrics, 'vendor_name') %> <%= get(metrics, 'device_name') %></td>
 		<td><%= linkState() %></td>
 	</script>
 
diff --git a/public/js/xo.js b/public/js/xo.js
index 1926b2729..4fddd0938 100644
--- a/public/js/xo.js
+++ b/public/js/xo.js
@@ -1304,7 +1304,7 @@
 		'itemView': NetworksListItemView,
 
 		'initialize': function () {
-			this.collection = this.model.get('networks');
+			this.collection = this.model.get('PIFs');
 		},
 	});
 
@@ -1675,10 +1675,10 @@
 				pool.set('SRs', SRs);
 
 				// @todo
-				// var networks = app.collections.network.subset(function (network) {
-				// 	return (network.get('pool') === id);
-				// });
-				pool.set('networks', new Collection());
+				var PIFs = app.collections.PIF.subset(function (PIF) {
+					return (PIF.get('pool') === id);
+				});
+				pool.set('PIFs', PIFs);
 			}
 			collections.pool.on('add', link_pools);
 			collections.pool.on('change', link_pools);