From e56f4aba0a7b93b4b9060d25103d01f4fa2657f1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 26 Jun 2014 15:40:10 -0700 Subject: [PATCH] use underscorejs for nodes table template --- domain-server/resources/web/index.shtml | 16 +++++++++++++++- domain-server/resources/web/js/tables.js | 24 ++++-------------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/domain-server/resources/web/index.shtml b/domain-server/resources/web/index.shtml index b6ba8f67db..9d5ee93857 100644 --- a/domain-server/resources/web/index.shtml +++ b/domain-server/resources/web/index.shtml @@ -18,7 +18,20 @@ - +

Queued Assignments

@@ -35,4 +48,5 @@ + \ No newline at end of file diff --git a/domain-server/resources/web/js/tables.js b/domain-server/resources/web/js/tables.js index b564d9392f..28e54b3773 100644 --- a/domain-server/resources/web/js/tables.js +++ b/domain-server/resources/web/js/tables.js @@ -1,4 +1,7 @@ $(document).ready(function(){ + // setup the underscore templates + var nodeTemplate = _.template($('#nodes-template').html()); + // setup a function to grab the assignments function getNodesAndAssignments() { $.getJSON("nodes.json", function(json){ @@ -29,26 +32,7 @@ $(document).ready(function(){ } }); - nodesTableBody = ""; - - $.each(json.nodes, function(index, data) { - nodesTableBody += ""; - nodesTableBody += "" + data.type + ""; - nodesTableBody += "" + data.uuid + ""; - nodesTableBody += "" + (data.pool ? data.pool : "") + ""; - nodesTableBody += "" + data.public.ip + ":" + data.public.port + ""; - nodesTableBody += "" + data.local.ip + ":" + data.local.port + ""; - - var uptimeSeconds = (Date.now() - data.wake_timestamp) / 1000; - nodesTableBody += "" + uptimeSeconds.toLocaleString() + ""; - - nodesTableBody += "" + (typeof data.pending_credits == 'number' ? data.pending_credits.toLocaleString() : 'N/A') + ""; - - nodesTableBody += ""; - nodesTableBody += ""; - }); - - $('#nodes-table tbody').html(nodesTableBody); + $('#nodes-table tbody').html(nodeTemplate(json)); }); $.getJSON("assignments.json", function(json){