diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentDAO.java index 24bf382fd..7398dfb1a 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentDAO.java @@ -9,6 +9,8 @@ public interface TournamentDAO { public void addTournament(String tournamentId, String draftType, String tournamentName, String format, CollectionType collectionType, Tournament.Stage stage, String pairingMechanism, String prizeScheme, Date start); +// public List getFutureScheduledTournaments(); + public List getUnfinishedTournaments(); public List getFinishedTournamentsSince(long time); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/hall.css b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/hall.css index 38bb1b09f..6c42685eb 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/hall.css +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/hall.css @@ -9,6 +9,10 @@ body { background-color: #666666; } +.serverTime { + border: 1px solid #ffffff; +} + .leagueName, #stats .period, .tournamentName, .playerStatHeader { font-size: 200%; font-weight: bolder; diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html index 9cf028b63..1611c07cf 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html @@ -20,6 +20,7 @@ response.setDateHeader ("Expires", -1); $(document).ready( function () { + $("#latestNews").append("
"); $("#latestNews").append("All sets are available to play. " + "If you find any problems with specific card or rules in general, please report it at the TLHH forums."); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/hallUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/hallUi.js index eea3aea98..1fcc143ef 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/hallUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/hallUi.js @@ -342,6 +342,10 @@ var GempLotrHallUI = Class.extend({ if (motd != null) $("#motd").html("MOTD: " + motd); + var serverTime = root.getAttribute("serverTime"); + if (serverTime != null) + $(".serverTime").text("Server time: "+serverTime); + var busy = root.getAttribute("busy") == "true"; var queues = root.getElementsByTagName("queue");