diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/merchantUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/merchantUi.js
index bcfabf7e8..45db4e043 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/merchantUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/merchantUi.js
@@ -8,6 +8,7 @@ var GempLotrMerchantUI = Class.extend({
cardFilter: null,
pocketDiv: null,
+ countDiv: null,
infoDialog: null,
questionDialog: null,
@@ -43,24 +44,33 @@ var GempLotrMerchantUI = Class.extend({
this.pocketDiv = $("
");
+ this.countDiv = $("Owned >=
");
+
this.filterDiv.append(this.pocketDiv);
+ this.filterDiv.append(this.countDiv);
+
+ $("#ownedMin").change(
+ function() {
+ that.ownedMin = $("#ownedMin option:selected").prop("value");
+ that.cardFilter.getCollection();
+ });
this.infoDialog = $("")
.dialog({
- autoOpen: false,
- closeOnEscape: true,
- resizable: false,
- title: "Card information"
- });
+ autoOpen: false,
+ closeOnEscape: true,
+ resizable: false,
+ title: "Card information"
+ });
this.questionDialog = $("")
.dialog({
- autoOpen: false,
- closeOnEscape: true,
- resizable: false,
- modal: true,
- title: "Merchant operation"
- });
+ autoOpen: false,
+ closeOnEscape: true,
+ resizable: false,
+ modal: true,
+ title: "Merchant operation"
+ });
var swipeOptions = {
threshold: 20,
@@ -319,6 +329,7 @@ var GempLotrMerchantUI = Class.extend({
this.cardFilter.layoutUi(0, 0, filterWidth, filterHeight);
this.pocketDiv.css({position: "absolute", left: filterWidth - 60, top: 35, width: 60, height: 18});
+ this.countDiv.css({position: "absolute", left: filterWidth - 100, top: filterHeight - 20, width: 100, height: 20});
},
processError: function (xhr, ajaxOptions, thrownError) {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
index bd41fe710..e5539196a 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
@@ -45,6 +45,11 @@
opacity: 1;
}
+ .countDiv {
+ color: #ffffff;
+ text-align: right;
+ }
+
.buyPrice, .sellPrice, .tradeFoil {
opacity: 0.9;
}