diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js
index 75a4ff1f1..c7039aae0 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js
@@ -146,6 +146,9 @@ var GempLotrHallUI = Class.extend({
var waiting = root.getAttribute("waiting") == "true";
var tables = root.getElementsByTagName("table");
+ var tablesTable = $("
");
+ tablesTable.append("| Format | Tournament | Status | Players | Actions |
");
+
for (var i = 0; i < tables.length; i++) {
var table = tables[i];
var id = table.getAttribute("id");
@@ -159,8 +162,9 @@ var GempLotrHallUI = Class.extend({
players = playersAttr.split(",");
var winner = table.getAttribute("winner");
- var tableDiv = this.appendTable(this.tablesDiv, id, gameId, status, formatName, tournamentName, players, waiting, winner);
+ var tableDiv = this.appendTable(tablesTable, id, gameId, status, formatName, tournamentName, players, waiting, winner);
}
+ this.tablesDiv.append(tablesTable);
var games = root.getElementsByTagName("game");
if (games.length > 0) {
@@ -203,20 +207,24 @@ var GempLotrHallUI = Class.extend({
},
appendTable: function(container, id, gameId, status, formatName, tournamentName, players, waiting, winner) {
- var tableDiv = $("");
- tableDiv.css({ display: "inline-table", width: "120px", height: "120px", margin: "5px", "background-color": "#333300", color: "#ffffff"});
- tableDiv.append("" + formatName + "
");
- tableDiv.append("" + status + "
");
- tableDiv.append("
");
- for (var i = 0; i < players.length; i++) {
- if (winner == players[i])
- tableDiv.append("" + players[i] + "
");
- else if (winner != null)
- tableDiv.append("" + players[i] + "
");
- else
- tableDiv.append("" + players[i] + "
");
- }
+ var row = $("
");
+ row.append("" + formatName + " | ");
+ row.append("" + tournamentName + " | ");
+ row.append("" + status + " | ");
+
+ var playersStr = "";
+ for (var i = 0; i < players.length; i++) {
+ if (i > 0)
+ playersStr += ", ";
+ if (winner == players[i])
+ playersStr += "" + players[i] + "";
+ else
+ playersStr += players[i];
+ }
+ row.append("" + playersStr + " | ");
+
+ var actionsField = $(" | ");
if (players.length < 2) {
var that = this;
@@ -230,7 +238,7 @@ var GempLotrHallUI = Class.extend({
that.processResponse(xml);
});
});
- tableDiv.append(but);
+ actionsField.append(but);
}
}
@@ -244,9 +252,11 @@ var GempLotrHallUI = Class.extend({
participantIdAppend = "&participantId=" + participantId;
location.href = "/gemp-lotr/game.html?gameId=" + gameId + participantIdAppend;
});
- tableDiv.append(but);
+ actionsField.append(but);
}
- this.container.append(tableDiv);
+ row.append(actionsField);
+
+ this.container.append(row);
}
});
\ No newline at end of file