From ff80f68cb246369dc020787f7850a69a0e34e4cd Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 18 Sep 2011 21:47:37 +0000 Subject: [PATCH] Spotting and pipes. --- .../main/java/com/gempukku/lotro/server/ServerResource.java | 2 +- gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html | 5 +++++ gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java index fe3f22188..c3e2f76bf 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java +++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java @@ -37,7 +37,7 @@ import java.util.Set; @Path("/") public class ServerResource { private static final Logger _logger = Logger.getLogger(ServerResource.class); - private boolean _test = false; + private boolean _test = true; private HallServer _hallServer; private LotroServer _lotroServer; diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html index 2e60d7967..b57da7b1d 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html @@ -32,6 +32,11 @@ color: #ffffff; } + .ui-button-text-only .ui-button-text { + font-size: 70%; + padding: .1em .1em; + } + diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js index 1e05f9ba7..aeb056e21 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js @@ -769,6 +769,7 @@ var GempLotrGameUI = Class.extend({ integerDecision: function(decision) { var id = decision.getAttribute("id"); var text = decision.getAttribute("text"); + var val = 0; var min = this.getDecisionParameter(decision, "min"); if (min == null) @@ -777,6 +778,10 @@ var GempLotrGameUI = Class.extend({ if (max == null) max = 1000; + var defaultValue = this.getDecisionParameter(decision, "defaultValue"); + if (defaultValue != null) + val = parseInt(defaultValue); + var that = this; this.smallDialog .html(text + "
") @@ -796,6 +801,7 @@ var GempLotrGameUI = Class.extend({ interval: 1, decimalplaces: 0 }, + defaultVal: val, width: '50px', backColor: "#000000" });