From e78c51781e211b18ecf57e08fc3eedad6c09ad37 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 1 Jan 2013 20:57:57 +0000 Subject: [PATCH] Added extra prizes information. --- .../main/java/com/gempukku/lotro/hall/HallServer.java | 3 +++ .../tournament/SingleEliminationOnDemandPrizes.java | 2 +- .../src/main/webapp/css/gemp-001/hall.css | 6 ++++++ gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html | 11 +++++++++++ .../main/webapp/js/gemp-014/CardInformationDialog.js | 2 +- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index a37c01feb..d4eca4317 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -72,6 +72,9 @@ public class HallServer extends AbstractServer { _tournamentQueues.put("movie_queue", new SingleEliminationRecurringQueue(635, "movie", CollectionType.MY_CARDS, "movieQueue-", "Movie Block 8-man single-elimination", 8, true, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes("onDemand"))); + _tournamentQueues.put("expanded_queue", new SingleEliminationRecurringQueue(635, "expanded", + CollectionType.MY_CARDS, "expandedQueue-", "Expanded 8-man single-elimination", 8, + true, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes("onDemand"))); } @Override diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java index 0c38118ad..5c90c955b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java @@ -53,6 +53,6 @@ public class SingleEliminationOnDemandPrizes implements TournamentPrizes{ @Override public String getPrizeDescription() { - return "3 wins - 2 boosters, 2 wins - 1 booster and a random promo, 1 win - 1 booster"; + return "
3-(2+promo)-1-1
"; } } 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 c90639e43..38bb1b09f 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 @@ -33,6 +33,12 @@ body { cursor: pointer; } +.prizeHint { + display: inline; + color: #6f6fff; + cursor: pointer; +} + .clickableFormat { cursor: pointer; color: #6f6fff; 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 0f1db7649..9cf028b63 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html @@ -65,6 +65,7 @@ response.setDateHeader ("Expires", -1); var horSpace = 30; var vertSpace = 45; + infoDialog.dialog({title:"Card information"}); if (card.horizontal) { // 500x360 infoDialog.dialog({width:Math.min(500 + horSpace, windowWidth), height:Math.min(360 + vertSpace, windowHeight)}); @@ -74,6 +75,16 @@ response.setDateHeader ("Expires", -1); } infoDialog.dialog("open"); + event.stopPropagation(); + return false; + } else if (tar.hasClass("prizeHint")) { + var prizeDescription = tar.attr("value"); + + infoDialog.text(prizeDescription); + + infoDialog.dialog({title:"Prizes details", width:300, height: 150}); + infoDialog.dialog("open"); + event.stopPropagation(); return false; } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/CardInformationDialog.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/CardInformationDialog.js index 91c79bb3d..d033df624 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/CardInformationDialog.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-014/CardInformationDialog.js @@ -36,7 +36,7 @@ var CardInformationDialog = Class.extend({ }, isOpened: function() { - return this.infoDialog.dialog("isOpen") + return this.infoDialog.dialog("isOpen"); }, close: function() {