diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html deleted file mode 100644 index 1bf0f49f2..000000000 --- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - Gemp-LotR - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
-
-
-
-
- - diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/game.html b/gemp-lotr/gemp-lotr-async/src/main/web/game.html index fd68dd212..6222a5e19 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/game.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/game.html @@ -49,36 +49,12 @@ - - - - + + + -
-
+
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html index 93a63dbd3..2ecfff1a3 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html @@ -55,7 +55,7 @@ - + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html index 96f83d5f4..50b878d32 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html @@ -48,40 +48,13 @@ - - $(document).ready( - function () { - var ui = new GempLotrMerchantUI($("#cardList"), $("#cardFilter")); - - $(window).resize(function () { - layoutUi(ui); - }); - - layoutUi(ui); - }); - - function layoutUi(ui) { - var width = $(window).width(); - var height = $(window).height(); - if (width < 800) - width = 800; - if (height < 400) - height = 400; - - var padding = 5; - var filterHeight = 160; - - $("#cardFilter").css({position:"absolute", left:padding, top:padding, width:width - padding * 2, height:filterHeight}); - $("#cardList").css({position:"absolute", left:padding, top:2 * padding + filterHeight, width:width - padding * 2, height:height - filterHeight - padding * 3}); - ui.layoutUI(); - } - -
+
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html index f40b674b4..09f094194 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html @@ -1,9 +1,10 @@ - + + GEMP: LotR-TCG - Draft - + @@ -49,39 +50,19 @@ - - + + + -
-
-
-
-
-
-
+
+
+
+
+
+
+
- + + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/src/Game/game.js b/gemp-lotr/gemp-lotr-async/src/main/web/src/Game/game.js new file mode 100644 index 000000000..99f03cbeb --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/src/Game/game.js @@ -0,0 +1,20 @@ +var ui; +var communication; + +$(document).ready( + function () { + var replay = getUrlParam("replayId"); + + ui = new GempLotrGameUI("/gemp-lotr-server", replay != null); + + $(window).resize(function () { + ui.windowResized(); + }); + + ui.layoutUI(true); + + if (replay == null) + ui.startGameSession(); + else + ui.startReplaySession(replay); + }); \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/src/Game/index.css b/gemp-lotr/gemp-lotr-async/src/main/web/src/Game/index.css new file mode 100644 index 000000000..524c9da7f --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/src/Game/index.css @@ -0,0 +1,9 @@ +#main { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: #000000; + overflow: hidden; +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/src/Merchant/index.css b/gemp-lotr/gemp-lotr-async/src/main/web/src/Merchant/index.css new file mode 100644 index 000000000..6e4cc831f --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/src/Merchant/index.css @@ -0,0 +1,9 @@ +#main { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: #000000; + overflow: hidden +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/src/Merchant/merchant.js b/gemp-lotr/gemp-lotr-async/src/main/web/src/Merchant/merchant.js new file mode 100644 index 000000000..ca9a1502b --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/src/Merchant/merchant.js @@ -0,0 +1,26 @@ +$(document).ready( + function () { + var ui = new GempLotrMerchantUI($("#cardList"), $("#cardFilter")); + + $(window).resize(function () { + layoutUi(ui); + }); + + layoutUi(ui); + }); + +function layoutUi(ui) { +var width = $(window).width(); +var height = $(window).height(); +if (width < 800) + width = 800; +if (height < 400) + height = 400; + +var padding = 5; +var filterHeight = 160; + +$("#cardFilter").css({position:"absolute", left:padding, top:padding, width:width - padding * 2, height:filterHeight}); +$("#cardList").css({position:"absolute", left:padding, top:2 * padding + filterHeight, width:width - padding * 2, height:height - filterHeight - padding * 3}); +ui.layoutUI(); +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/index.css b/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/index.css new file mode 100644 index 000000000..e69de29bb diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/soloDraft.js b/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/soloDraft.js new file mode 100644 index 000000000..e9ce4a68a --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/src/SoloDraft/soloDraft.js @@ -0,0 +1,20 @@ +$(document).ready( + function () { + var ui = new GempLotrSoloDraftUI(); + + $('body').layout({ + applyDefaultStyles:true, + onresize:function () { + ui.layoutUI(true); + }, + north__minSize:"30%" + }); + + $(".ui-layout-pane").css({"background-color":"#000000"}); + + $(window).resize(function () { + ui.layoutUI(true); + }); + + ui.layoutUI(true); + }); \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/awaiting_decision.mp3 b/gemp-lotr/gemp-lotr-async/src/main/web/src/assets/awaiting_decision.mp3 similarity index 100% rename from gemp-lotr/gemp-lotr-async/src/main/web/awaiting_decision.mp3 rename to gemp-lotr/gemp-lotr-async/src/main/web/src/assets/awaiting_decision.mp3 diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/fanfare_x.mp3 b/gemp-lotr/gemp-lotr-async/src/main/web/src/assets/fanfare_x.mp3 similarity index 100% rename from gemp-lotr/gemp-lotr-async/src/main/web/fanfare_x.mp3 rename to gemp-lotr/gemp-lotr-async/src/main/web/src/assets/fanfare_x.mp3 diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/fanfare_x.wav b/gemp-lotr/gemp-lotr-async/src/main/web/src/assets/fanfare_x.wav similarity index 100% rename from gemp-lotr/gemp-lotr-async/src/main/web/fanfare_x.wav rename to gemp-lotr/gemp-lotr-async/src/main/web/src/assets/fanfare_x.wav