From a8a95cc85f0884709fc37915df6080c1a39bbf8c Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 24 Aug 2022 02:46:51 -0500 Subject: [PATCH] Adjusted colors for Playing status, and added an orange highlight to private tables waiting on player --- .../gemp-lotr-async/src/main/web/css/gemp-001/hall.css | 6 +++++- .../gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css index 44ae8eef4..d7b3b61e8 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css +++ b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css @@ -170,7 +170,11 @@ table.tables td, table.tables th { } tr.played { - background-color: #990000; + background-color: #590902; +} + +tr.privateForPlayer { + background-color: #A63F03; } #chat { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js index b8b79bc96..d3c12e365 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js @@ -410,6 +410,7 @@ var GempLotrHallUI = Class.extend({ var tournamentName = table.getAttribute("tournament"); var userDesc = table.getAttribute("userDescription"); var isPrivate = (table.getAttribute("isPrivate") === "true"); + var privateForYou = isPrivate && userDesc === chat.userName; var players = new Array(); if (playersAttr.length > 0) players = playersAttr.split(","); @@ -457,7 +458,7 @@ var GempLotrHallUI = Class.extend({ })(id)); lastField.append(but); } - else if(!isPrivate || userDesc === chat.userName) { + else if(!isPrivate || privateForYou) { var that = this; var but = $(""); @@ -540,6 +541,9 @@ var GempLotrHallUI = Class.extend({ if (playing == "true") row.addClass("played"); + + if(privateForYou) + row.addClass("privateForPlayer"); } else if (action == "remove") { $(".table" + id, this.tablesDiv).remove(); }