diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/LoggingThreadLocal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/LoggingThreadLocal.java index b66668258..02502bf4a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/LoggingThreadLocal.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/LoggingThreadLocal.java @@ -18,7 +18,7 @@ public class LoggingThreadLocal { private static synchronized void initializeOutputStream() { if (_fos == null) { try { - _fos = new FileOutputStream(new File("I:\\dev\\toilLog.txt")); + _fos = new FileOutputStream(new File("I:\\dev\\longActions.txt")); } catch (IOException exp) { throw new RuntimeException(exp); } 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 364c6b2c9..073aa7d4c 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html @@ -47,6 +47,12 @@ #manageDecks { color: #ffffff; + font-size: 180%; + } + + #editingDeck { + vertical-align: top; + padding-left: 3px; } #deckStats { diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js index 095c015c2..33eacf504 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js @@ -45,30 +45,30 @@ var GempLotrDeckBuildingUI = Class.extend({ this.deckDiv = $("#deckDiv"); this.manageDecksDiv = $("
"); - this.manageDecksDiv.append("Opened deck: "); - this.manageDecksDiv.append("New deck "); - var newDeckBut = $(""); + var newDeckBut = $("").button(); this.manageDecksDiv.append(newDeckBut); - var saveDeckBut = $(""); + var saveDeckBut = $("").button(); this.manageDecksDiv.append(saveDeckBut); - var renameDeckBut = $(""); + var renameDeckBut = $("").button(); this.manageDecksDiv.append(renameDeckBut); - this.decksSelect = $(""); + this.decksSelect = $(""); this.manageDecksDiv.append(this.decksSelect); - var loadDeckBut = $(""); + var loadDeckBut = $("").button(); this.manageDecksDiv.append(loadDeckBut); + this.manageDecksDiv.append("Editing deck: New deck"); + this.deckDiv.append(this.manageDecksDiv); newDeckBut.click( function() { that.deckName = null; - $("#openedDeck").html("New deck"); + $("#editingDeck").html("Editing deck: New deck"); that.clearDeck(); }); @@ -82,7 +82,7 @@ var GempLotrDeckBuildingUI = Class.extend({ alert("Deck name has to have at least 3 characters and at most 40 characters."); else { that.deckName = newDeckName; - $("#openedDeck").html(newDeckName); + $("#editingDeck").text("Editing deck: " + newDeckName); that.saveDeck(true); } } else { @@ -92,6 +92,10 @@ var GempLotrDeckBuildingUI = Class.extend({ renameDeckBut.click( function() { + if (that.deckName == null) { + alert("You can't rename this deck, since it's not named (saved) yet."); + return; + } var newDeckName = prompt("Enter new name for the deck", ""); if (newDeckName == null) return; @@ -100,7 +104,7 @@ var GempLotrDeckBuildingUI = Class.extend({ else { var oldDeckName = that.deckName; that.deckName = newDeckName; - $("#openedDeck").html(newDeckName); + $("#editingDeck").text("Editing deck: " + newDeckName); that.comm.renameDeck(oldDeckName, newDeckName, function() { that.loadDecks(); @@ -387,11 +391,11 @@ var GempLotrDeckBuildingUI = Class.extend({ this.infoDialog = $("") .dialog({ - autoOpen: false, - closeOnEscape: true, - resizable: false, - title: "Card information" - }); + autoOpen: false, + closeOnEscape: true, + resizable: false, + title: "Card information" + }); var swipeOptions = { threshold: 20, @@ -798,7 +802,7 @@ var GempLotrDeckBuildingUI = Class.extend({ if (ringBearer.length == 1) { this.clearDeck(); this.deckName = deckName; - $("#openedDeck").html(deckName); + $("#editingDeck").text("Editing deck: " + deckName); this.addCardToContainer(ringBearer[0].getAttribute("blueprintId"), "deck", this.ringBearerDiv, false).addClass("cardInDeck"); this.addCardToContainer(root.getElementsByTagName("ring")[0].getAttribute("blueprintId"), "deck", this.ringDiv, false).addClass("cardInDeck"); @@ -876,7 +880,7 @@ var GempLotrDeckBuildingUI = Class.extend({ layoutUI: function(layoutDivs) { if (layoutDivs) { - var manageHeight = 30; + var manageHeight = 23; var padding = 5; var collectionWidth = this.collectionDiv.width();